Merge pull request #2441 from AnalyticalGraphicsInc/fix-oit

Fix OIT on machines where it was broken.
CesiumGS · Feb 2, 2015 · 8c46dd8 · 8c46dd8
2 parents dd034a6 + b81ea0b
commit 8c46dd8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -23,6 +23,7 @@ Change Log
   * `DataSourceDisplay` methods `getScene` and `getDataSources` have been deprecated and replaced with `scene` and `dataSources` properties. They will be removed in Cesium 1.9.
   * The `Entity` constructor taking a single string value for the id has been deprecated. The constructor now takes an options object which allows you to provide any and all `Entity` related properties at construction time. Support for the deprecated behavior will be removed in Cesium 1.9.
   * The `EntityCollection.entities` and `CompositeEntityCollect.entities` properties have both been renamed to `values`.  Support for the deprecated behavior will be removed in Cesium 1.9.
+* Fixed an issue which caused order independent translucency to be broken on many video cards. Disabling order independent translucency should no longer be necessary. 
 * Improved performance of asynchronous geometry creation (as much as 20% faster in some use cases). [#2342](https://github.com/AnalyticalGraphicsInc/cesium/issues/2342)
 * Added `Color.fromAlpha` and `Color.withAlpha` to make it easy to create translucent colors from constants, i.e. `var translucentRed = Color.RED.withAlpha(0.95)`.
 * Added `PolylineVolumeGraphics` and `Entity.polylineVolume`

diff --git a/Source/Shaders/Builtin/Functions/alphaWeight.glsl b/Source/Shaders/Builtin/Functions/alphaWeight.glsl
@@ -8,8 +8,8 @@ float czm_alphaWeight(float a)
     {
         float x = 2.0 * (gl_FragCoord.x - czm_viewport.x) / czm_viewport.z - 1.0;
 	    float y = 2.0 * (gl_FragCoord.y - czm_viewport.y) / czm_viewport.w - 1.0;
-	    float z = (gl_FragCoord.z - czm_viewportTransformation[3][2]) / czm_viewportTransformation[2][2];
-	    vec4 q = vec4(x, y, z, 1.0);
+	    z = (gl_FragCoord.z - czm_viewportTransformation[3][2]) / czm_viewportTransformation[2][2];
+	    vec4 q = vec4(x, y, z, 0.0);
 	    q /= gl_FragCoord.w;
 	    z = (czm_inverseProjectionOIT * q).z;
     }