Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New shader enhancements #1102

Merged
merged 31 commits into from
Sep 5, 2013
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
87ddf10
Shader builtin functions/structs/constants broken into individual fil…
gbeatty Aug 27, 2013
0132100
Clean up glsl->JS script
gbeatty Aug 27, 2013
5146e57
extracted automatic uniforms into their own file
gbeatty Aug 27, 2013
4762e8c
Fix shader typo
pjcozzi Aug 26, 2013
8ed6aa4
Shader builtin functions/structs/constants broken into individual fil…
gbeatty Aug 27, 2013
bc5002b
code cleanup
gbeatty Aug 28, 2013
f6b75b7
generate a dependency graph for determining which built-in functions/…
gbeatty Aug 30, 2013
b488ae9
preserve the number of line breaks when stripping glsl comments for d…
gbeatty Aug 30, 2013
a60047b
check for circular dependencies in built-in functions.
gbeatty Aug 30, 2013
9dcb779
added back shader uniforms and constants after merge
gbeatty Aug 30, 2013
c6c75bb
Code cleanup
gbeatty Sep 2, 2013
a99031c
removed czm_ prefix from cesium glsl built-in files
gbeatty Sep 3, 2013
36b32a7
new shader test
gbeatty Sep 3, 2013
8a5597d
fixed jsHint error
gbeatty Sep 3, 2013
d315cf1
added new built-in functions czm_getLambertDiffuse and czm_getSpecula…
gbeatty Sep 3, 2013
81f8cfa
Comment cleanup. Removed automatic uniform comments relating to expli…
gbeatty Sep 3, 2013
57abe4f
tests for ShaderProgram.js
gbeatty Sep 3, 2013
8673e11
Merge branch 'master' into newShaderEnhancements
gbeatty Sep 3, 2013
3f4b22e
Use regex to extract possible cesium built-in functions/structs/const…
gbeatty Sep 4, 2013
94ced25
reverse iterate through dependencies instead of reversing the element…
gbeatty Sep 4, 2013
daf5868
code cleanup and documentation
gbeatty Sep 4, 2013
a3f8c9b
more code cleanup
gbeatty Sep 4, 2013
23ba244
test cleanup
gbeatty Sep 4, 2013
6c10481
more test cleanup
gbeatty Sep 4, 2013
3d2f0f8
added automatic uniforms to the dependency graph
gbeatty Sep 4, 2013
3b41156
Merge branch 'master' into newShaderEnhancements
gbeatty Sep 4, 2013
d4a8a39
updated CHANGES.md
gbeatty Sep 4, 2013
41dca2b
removed unneeded doc comment
gbeatty Sep 4, 2013
bda647c
changed test function injection
gbeatty Sep 4, 2013
e315d0a
fixed whitespace
gbeatty Sep 4, 2013
cbf86fe
updated CHANGES.md
gbeatty Sep 4, 2013
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ Beta Releases

### b21 - 2013-10-01
* Added `CorridorOutlineGeometry`.
* Improved runtime generation of GLSL shaders.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We also added new czm_ functions, right?

* Added new built-in GLSL functions `czm_getLambertDiffuse` and `czm_getSpecular`.

### b20 - 2013-09-03

Expand Down
Loading