From 8e43a46e3d79323fe06dc7771bc611a2c3c85c5c Mon Sep 17 00:00:00 2001 From: hwc487 Date: Mon, 30 Jan 2012 16:15:12 -0800 Subject: Renderer startup handling of non-animated materials. Changed zoom from the document bar to keep the location center of the viewable portion of the document fixed. --- js/helper-classes/RDGE/GLWorld.js | 10 +++++++++- js/helper-classes/RDGE/Materials/FlatMaterial.js | 2 +- js/helper-classes/RDGE/Materials/LinearGradientMaterial.js | 2 +- js/helper-classes/RDGE/Materials/RadialGradientMaterial.js | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) (limited to 'js/helper-classes') diff --git a/js/helper-classes/RDGE/GLWorld.js b/js/helper-classes/RDGE/GLWorld.js index dd9b6977..b84bb585 100644 --- a/js/helper-classes/RDGE/GLWorld.js +++ b/js/helper-classes/RDGE/GLWorld.js @@ -248,9 +248,17 @@ function GLWorld( canvas, use3D ) if (!this.hasAnimatedMaterials()) { this.myScene.render(); - this._canvas.task.stop(); + //this._canvas.task.stop(); + this._renderCount = 3; } } + else if (this._renderCount >= 0) + { + this._renderCount--; + if (this._renderCount == 0) + this._canvas.task.stop(); + } + } } else diff --git a/js/helper-classes/RDGE/Materials/FlatMaterial.js b/js/helper-classes/RDGE/Materials/FlatMaterial.js index db66ca42..f342eef8 100644 --- a/js/helper-classes/RDGE/Materials/FlatMaterial.js +++ b/js/helper-classes/RDGE/Materials/FlatMaterial.js @@ -29,7 +29,7 @@ function FlatMaterial() this.getColor = function() { return this._color; } this.getShaderName = function() { return this._shaderName; } - this.isAnimated = function() { return true; } + this.isAnimated = function() { return false; } //////////////////////////////////s///////////////////////////////////// // Methods diff --git a/js/helper-classes/RDGE/Materials/LinearGradientMaterial.js b/js/helper-classes/RDGE/Materials/LinearGradientMaterial.js index f026cd15..ce965296 100644 --- a/js/helper-classes/RDGE/Materials/LinearGradientMaterial.js +++ b/js/helper-classes/RDGE/Materials/LinearGradientMaterial.js @@ -98,7 +98,7 @@ function LinearGradientMaterial() this._shader.default.u_cos_sin_angle.set([Math.cos(a), Math.sin(a)]); } - this.isAnimated = function() { return true; } + this.isAnimated = function() { return false; } /////////////////////////////////////////////////////////////////////// // Material Property Accessors diff --git a/js/helper-classes/RDGE/Materials/RadialGradientMaterial.js b/js/helper-classes/RDGE/Materials/RadialGradientMaterial.js index 5f912dec..cf91f1aa 100644 --- a/js/helper-classes/RDGE/Materials/RadialGradientMaterial.js +++ b/js/helper-classes/RDGE/Materials/RadialGradientMaterial.js @@ -92,7 +92,7 @@ function RadialGradientMaterial() this._shader.default.u_colorCount.set([c]); } - this.isAnimated = function() { return true; } + this.isAnimated = function() { return false; } /////////////////////////////////////////////////////////////////////// -- cgit v1.2.3