Merge pull request #1096 from AnalyticalGraphicsInc/asyncGeometryTests

Render Async Geometry
CesiumGS · Aug 30, 2013 · 93d0d70 · 93d0d70
2 parents f3cb080 + e0a56c9
commit 93d0d70
Showing 1 changed file with 93 additions and 0 deletions.
diff --git a/Specs/Scene/GeometryRenderingSpec.js b/Specs/Scene/GeometryRenderingSpec.js
@@ -289,6 +289,39 @@ defineSuite([
         primitive = primitive && primitive.destroy();
     }
 
+    function renderAsync(instance, afterView) {
+        var primitive = new Primitive({
+            geometryInstances : instance,
+            appearance : new PerInstanceColorAppearance({
+                flat : true
+            })
+        });
+
+        var frameState = createFrameState();
+
+        waitsFor(function() {
+            return render(context, frameState, primitive) > 0;
+        });
+
+        runs(function() {
+            viewSphere3D(frameState.camera, primitive._boundingSphere, primitive.modelMatrix);
+
+            if (typeof afterView === 'function') {
+                afterView(frameState, primitive);
+            }
+
+            context.getUniformState().update(frameState);
+
+            ClearCommand.ALL.execute(context);
+            expect(context.readPixels()).toEqual([0, 0, 0, 0]);
+
+            render(context, frameState, primitive);
+            expect(context.readPixels()).not.toEqual([0, 0, 0, 0]);
+
+            primitive = primitive && primitive.destroy();
+        });
+    }
+
     describe('BoxGeometry', function() {
         var instance;
         beforeAll(function() {
@@ -321,6 +354,10 @@ defineSuite([
         it('pick', function() {
             pickGeometry(instance);
         });
+
+        it('async', function() {
+            renderAsync(instance);
+        });
     }, 'WebGL');
 
     describe('CircleGeometry', function() {
@@ -355,6 +392,10 @@ defineSuite([
         it('pick', function() {
             pickGeometry(instance);
         });
+
+        it('async', function() {
+            renderAsync(instance);
+        });
     }, 'WebGL');
 
     describe('CylinderGeometry', function() {
@@ -391,6 +432,10 @@ defineSuite([
         it('pick', function() {
             pickGeometry(instance);
         });
+
+        it('async', function() {
+            renderAsync(instance);
+        });
     }, 'WebGL');
 
     describe('EllipseGeometry', function() {
@@ -427,6 +472,10 @@ defineSuite([
             pickGeometry(instance);
         });
 
+        it('async', function() {
+            renderAsync(instance);
+        });
+
         it('rotated', function() {
             var rotated = new GeometryInstance({
                 geometry : new EllipseGeometry({
@@ -504,6 +553,10 @@ defineSuite([
             pickGeometry(instance);
         });
 
+        it('async', function() {
+            renderAsync(instance);
+        });
+
         it('renders bottom', function() {
             var afterView = function(frameState, primitive) {
                 var height = (extrudedHeight - geometryHeight) * 0.5;
@@ -556,6 +609,10 @@ defineSuite([
         it('pick', function() {
             pickGeometry(instance);
         });
+
+        it('async', function() {
+            renderAsync(instance);
+        });
     }, 'WebGL');
 
     describe('SphereGeometry', function() {
@@ -590,6 +647,10 @@ defineSuite([
         it('pick', function() {
             pickGeometry(instance);
         });
+
+        it('async', function() {
+            renderAsync(instance);
+        });
     }, 'WebGL');
 
     describe('ExtentGeometry', function() {
@@ -626,6 +687,10 @@ defineSuite([
             pickGeometry(instance);
         });
 
+        it('async', function() {
+            renderAsync(instance);
+        });
+
         it('rotated geometry', function() {
             var rotated = new GeometryInstance({
                 geometry : new ExtentGeometry({
@@ -712,6 +777,10 @@ defineSuite([
             pickGeometry(instance);
         });
 
+        it('async', function() {
+            renderAsync(instance);
+        });
+
         it('renders bottom', function() {
             var afterView = function(frameState, primitive) {
                 var transform = Transforms.eastNorthUpToFixedFrame(primitive._boundingSphere.center);
@@ -790,6 +859,10 @@ defineSuite([
             pickGeometry(instance);
         });
 
+        it('async', function() {
+            renderAsync(instance);
+        });
+
         it('at height', function() {
             var atHeight = new GeometryInstance({
                 geometry : PolygonGeometry.fromPositions({
@@ -895,6 +968,10 @@ defineSuite([
             pickGeometry(instance);
         });
 
+        it('async', function() {
+            renderAsync(instance);
+        });
+
         it('renders bottom', function() {
             var afterView = function(frameState, primitive) {
                 var height = (extrudedHeight - geometryHeight) * 0.5;
@@ -990,6 +1067,10 @@ defineSuite([
         it('pick', function() {
             pickGeometry(instance, afterView3D);
         });
+
+        it('async', function() {
+            renderAsync(instance, afterView3D);
+        });
     }, 'WebGL');
 
     describe('CorridorGeometry', function() {
@@ -1033,6 +1114,10 @@ defineSuite([
             pickGeometry(instance);
         });
 
+        it('async', function() {
+            renderAsync(instance);
+        });
+
         it('at height', function() {
             var atHeight = new GeometryInstance({
                 geometry : new CorridorGeometry({
@@ -1097,6 +1182,10 @@ defineSuite([
             pickGeometry(instance);
         });
 
+        it('async', function() {
+            renderAsync(instance);
+        });
+
         it('renders bottom', function() {
             var afterView = function(frameState, primitive) {
                 var height = (extrudedHeight - geometryHeight) * 0.5;
@@ -1174,6 +1263,10 @@ defineSuite([
         it('pick', function() {
             pickGeometry(instance);
         });
+
+        it('async', function() {
+            renderAsync(instance);
+        });
     });
 
     describe('Custom geometry', function() {