diff options
author | hwc487 | 2012-02-22 04:44:07 -0800 |
---|---|---|
committer | hwc487 | 2012-02-22 04:44:07 -0800 |
commit | 9d3589feb0174c09d1c1bac405660f8900259c7d (patch) | |
tree | e016fac42e16871b4f2a8d3896cde0bfb786f29f /js/helper-classes/RDGE/src/core/script | |
parent | f06f44ab3fcca109f126eae4f6fb915c5dd28791 (diff) | |
download | ninja-9d3589feb0174c09d1c1bac405660f8900259c7d.tar.gz |
Adding bug fixes.
Diffstat (limited to 'js/helper-classes/RDGE/src/core/script')
-rwxr-xr-x | js/helper-classes/RDGE/src/core/script/precompiled.js | 10 | ||||
-rwxr-xr-x | js/helper-classes/RDGE/src/core/script/runtime.js | 14 | ||||
-rwxr-xr-x | js/helper-classes/RDGE/src/core/script/scenegraphNodes.js | 8 |
3 files changed, 18 insertions, 14 deletions
diff --git a/js/helper-classes/RDGE/src/core/script/precompiled.js b/js/helper-classes/RDGE/src/core/script/precompiled.js index 7fd1a425..bed94e4e 100755 --- a/js/helper-classes/RDGE/src/core/script/precompiled.js +++ b/js/helper-classes/RDGE/src/core/script/precompiled.js | |||
@@ -48,11 +48,11 @@ rdgeGlobalParameters = | |||
48 | "u_light3Amb": {'type': 'vec4', 'data': [0.5, 0.5, 0.5, 1.0]}, | 48 | "u_light3Amb": {'type': 'vec4', 'data': [0.5, 0.5, 0.5, 1.0]}, |
49 | "u_light3Spec": {'type': 'vec4', 'data': [1.0, 1.0, 1.0, 1.0]}}, | 49 | "u_light3Spec": {'type': 'vec4', 'data': [1.0, 1.0, 1.0, 1.0]}}, |
50 | "colMap": {'type': 'tex2d', 'data': "assets/images/white.png"}, | 50 | "colMap": {'type': 'tex2d', 'data': "assets/images/white.png"}, |
51 | "envMap": {'type': 'tex2d', 'data': null}, | 51 | //"envMap": {'type': 'tex2d', 'data': null}, |
52 | "normalMap": {'type': 'tex2d', 'data': null}, | 52 | //"normalMap": {'type': 'tex2d', 'data': null}, |
53 | "glowMap": {'type': 'tex2d', 'data': "assets/images/black.png"}, | 53 | //"glowMap": {'type': 'tex2d', 'data': "assets/images/black.png"}, |
54 | "u_shadowDepthMap": {'type': 'tex2d', 'data': null}, | 54 | //"u_shadowDepthMap": {'type': 'tex2d', 'data': null}, |
55 | "u_depthMap": {'type': 'tex2d', 'data': null}, | 55 | //"u_depthMap": {'type': 'tex2d', 'data': null}, |
56 | "u_matAmbient": {'type': 'vec4', 'data': [1.00,1.00,1.00, 1]}, | 56 | "u_matAmbient": {'type': 'vec4', 'data': [1.00,1.00,1.00, 1]}, |
57 | "u_matDiffuse": {'type': 'vec4', 'data': [1.0, 1.0, 1.0, 1.0]}, | 57 | "u_matDiffuse": {'type': 'vec4', 'data': [1.0, 1.0, 1.0, 1.0]}, |
58 | "u_matSpecular": {'type': 'vec4', 'data': [1.0, 1.0, 1.0, 1.0]}, | 58 | "u_matSpecular": {'type': 'vec4', 'data': [1.0, 1.0, 1.0, 1.0]}, |
diff --git a/js/helper-classes/RDGE/src/core/script/runtime.js b/js/helper-classes/RDGE/src/core/script/runtime.js index 18b9b223..3d824faf 100755 --- a/js/helper-classes/RDGE/src/core/script/runtime.js +++ b/js/helper-classes/RDGE/src/core/script/runtime.js | |||
@@ -206,11 +206,15 @@ RDGETask = (function() { | |||
206 | self.lastTime = self.currTime; | 206 | self.lastTime = self.currTime; |
207 | } | 207 | } |
208 | 208 | ||
209 | this.start = function() { | 209 | this.start = function() |
210 | this.running = true; | 210 | { |
211 | this.currTime = new Date().getTime(); | 211 | if (!this.running) |
212 | this.lastTime = this.currTime; | 212 | { |
213 | tasks[this.id](); | 213 | this.running = true; |
214 | this.currTime = new Date().getTime(); | ||
215 | this.lastTime = this.currTime; | ||
216 | tasks[this.id](); | ||
217 | } | ||
214 | } | 218 | } |
215 | 219 | ||
216 | this.stop = function() { | 220 | this.stop = function() { |
diff --git a/js/helper-classes/RDGE/src/core/script/scenegraphNodes.js b/js/helper-classes/RDGE/src/core/script/scenegraphNodes.js index 48f0aab9..e80a14fb 100755 --- a/js/helper-classes/RDGE/src/core/script/scenegraphNodes.js +++ b/js/helper-classes/RDGE/src/core/script/scenegraphNodes.js | |||
@@ -321,10 +321,10 @@ materialNodeTemplate = function(matNode) | |||
321 | var renderer = g_Engine.getContext().renderer; | 321 | var renderer = g_Engine.getContext().renderer; |
322 | matNode.textureList = | 322 | matNode.textureList = |
323 | [ | 323 | [ |
324 | {'name':"colMap", 'handle':renderer.getTextureByName("assets/images/white"), 'unit': TEX_DIF, "type":UNIFORMTYPE.TEXTURE2D}, | 324 | // {'name':"colMap", 'handle':renderer.getTextureByName("assets/images/white"), 'unit': TEX_DIF, "type":UNIFORMTYPE.TEXTURE2D}, |
325 | {'name':"envMap", 'handle':renderer.getTextureByName("assets/images/material_paint"),'unit': TEX_SPEC, "type":UNIFORMTYPE.TEXTURE2D}, | 325 | // {'name':"envMap", 'handle':renderer.getTextureByName("assets/images/material_paint"),'unit': TEX_SPEC, "type":UNIFORMTYPE.TEXTURE2D}, |
326 | {'name':"normalMap",'handle':renderer.getTextureByName("assets/images/blue"), 'unit': TEX_NORM, "type":UNIFORMTYPE.TEXTURE2D}, | 326 | // {'name':"normalMap",'handle':renderer.getTextureByName("assets/images/blue"), 'unit': TEX_NORM, "type":UNIFORMTYPE.TEXTURE2D}, |
327 | {'name':"glowMap", 'handle':renderer.getTextureByName("assets/images/black"), 'unit': TEX_GLOW, "type":UNIFORMTYPE.TEXTURE2D} | 327 | // {'name':"glowMap", 'handle':renderer.getTextureByName("assets/images/black"), 'unit': TEX_GLOW, "type":UNIFORMTYPE.TEXTURE2D} |
328 | ]; | 328 | ]; |
329 | } | 329 | } |
330 | 330 | ||