Skip to content

Improve lighting #1680

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
May 7, 2014
Merged

Improve lighting #1680

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1e7079c
Ambient light workaround
pjcozzi May 6, 2014
6600d69
Update CHANGES.md
pjcozzi May 7, 2014
9228be1
Merge remote-tracking branch 'origin/master' into lighting
kring May 7, 2014
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
3 changes: 2 additions & 1 deletion CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@ Beta Releases

### b29 - 2014-06-02

* Breaking changes
* Breaking changes ([why so many?](https://groups.google.com/forum/#!topic/cesium-dev/CQ0wCHjJ9x4))
* Removed `CesiumWidget.onRenderLoopError` and `Viewer.renderLoopError`. They have been replaced by `Scene.renderError`.
* Improved terrain and imagery rendering performance when very close to the surface.
* Added `preRender` and `postRender` events to `Scene`.
* Fixed dark lighting in 3D and Columbus View when viewing a primitive edge on. ([#592](https://github.com/AnalyticalGraphicsInc/cesium/issues/592))
* Added `Viewer.targetFrameRate` and `CesiumWidget.targetFrameRate` to allow for throttling of the requestAnimationFrame rate.

### b28 - 2014-05-01
Expand Down
7 changes: 5 additions & 2 deletions Source/Shaders/Builtin/Functions/phong.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,12 @@ vec4 czm_phong(vec3 toEye, czm_material material)
// Specular from sun and pseudo-moon
float specular = czm_private_getSpecularOfMaterial(czm_sunDirectionEC, toEye, material) + czm_private_getSpecularOfMaterial(czm_moonDirectionEC, toEye, material);

vec3 ambient = vec3(0.0);
// Temporary workaround for adding ambient.
vec3 materialDiffuse = material.diffuse * 0.5;

vec3 ambient = materialDiffuse;
vec3 color = ambient + material.emission;
color += material.diffuse * diffuse;
color += materialDiffuse * diffuse;
color += material.specular * specular;

return vec4(color, material.alpha);
Expand Down
7 changes: 5 additions & 2 deletions Source/Shaders/Builtin/Functions/translucentPhong.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,12 @@ vec4 czm_translucentPhong(vec3 toEye, czm_material material)
float specular = czm_getSpecular(czm_sunDirectionEC, toEye, material.normal, material.shininess);
specular += czm_getSpecular(czm_moonDirectionEC, toEye, material.normal, material.shininess);

vec3 ambient = vec3(0.0);
// Temporary workaround for adding ambient.
vec3 materialDiffuse = material.diffuse * 0.5;

vec3 ambient = materialDiffuse;
vec3 color = ambient + material.emission;
color += material.diffuse * diffuse;
color += materialDiffuse * diffuse;
color += material.specular * specular;

return vec4(color, material.alpha);
Expand Down