Merge pull request #4248 from lasalvavida/gltf-1.0.1-remove-scissor-test

glTF 1.0.1 remove scissor test
CesiumGS · Aug 31, 2016 · ad83614 · ad83614
2 parents 34b63c1 + b20e8c4
commit ad83614
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 20 deletions.
diff --git a/Source/Scene/Model.js b/Source/Scene/Model.js
@@ -2261,7 +2261,6 @@ define([
         booleanStates[WebGLConstants.CULL_FACE] = false;
         booleanStates[WebGLConstants.DEPTH_TEST] = false;
         booleanStates[WebGLConstants.POLYGON_OFFSET_FILL] = false;
-        booleanStates[WebGLConstants.SCISSOR_TEST] = false;
 
         var enable = states.enable;
         var length = enable.length;
@@ -2307,7 +2306,6 @@ define([
         var colorMask = defaultValue(statesFunctions.colorMask, [true, true, true, true]);
         var depthRange = defaultValue(statesFunctions.depthRange, [0.0, 1.0]);
         var polygonOffset = defaultValue(statesFunctions.polygonOffset, [0.0, 0.0]);
-        var scissor = defaultValue(statesFunctions.scissor, [0.0, 0.0, 0.0, 0.0]);
 
         rendererRenderStates[id] = RenderState.fromCache({
             frontFace : defined(statesFunctions.frontFace) ? statesFunctions.frontFace[0] : WebGLConstants.CCW,
@@ -2321,15 +2319,6 @@ define([
                 factor : polygonOffset[0],
                 units : polygonOffset[1]
             },
-            scissorTest : {
-                enabled : booleanStates[WebGLConstants.SCISSOR_TEST],
-                rectangle : {
-                    x : scissor[0],
-                    y : scissor[1],
-                    width : scissor[2],
-                    height : scissor[3]
-                }
-            },
             depthRange : {
                 near : depthRange[0],
                 far : depthRange[1]

diff --git a/Specs/Scene/ModelSpec.js b/Specs/Scene/ModelSpec.js
@@ -303,15 +303,6 @@ defineSuite([
                     factor : 0.0,
                     units : 0.0
                 },
-                scissorTest : {
-                    enabled : false,
-                    rectangle : {
-                        x : 0.0,
-                        y : 0.0,
-                        width : 0.0,
-                        height : 0.0
-                    }
-                },
                 depthRange : {
                     near : 0.0,
                     far : 1.0