diff options
Diffstat (limited to 'js/helper-classes/RDGE/src/core')
39 files changed, 36 insertions, 18 deletions
diff --git a/js/helper-classes/RDGE/src/core/script/MeshManager.js b/js/helper-classes/RDGE/src/core/script/MeshManager.js index 43813078..43813078 100644..100755 --- a/js/helper-classes/RDGE/src/core/script/MeshManager.js +++ b/js/helper-classes/RDGE/src/core/script/MeshManager.js | |||
diff --git a/js/helper-classes/RDGE/src/core/script/RenderInitProcs.js b/js/helper-classes/RDGE/src/core/script/RenderInitProcs.js index 9d4e0d63..9d4e0d63 100644..100755 --- a/js/helper-classes/RDGE/src/core/script/RenderInitProcs.js +++ b/js/helper-classes/RDGE/src/core/script/RenderInitProcs.js | |||
diff --git a/js/helper-classes/RDGE/src/core/script/RenderProcs.js b/js/helper-classes/RDGE/src/core/script/RenderProcs.js index 6d3b02df..6d3b02df 100644..100755 --- a/js/helper-classes/RDGE/src/core/script/RenderProcs.js +++ b/js/helper-classes/RDGE/src/core/script/RenderProcs.js | |||
diff --git a/js/helper-classes/RDGE/src/core/script/ScreenQuad.js b/js/helper-classes/RDGE/src/core/script/ScreenQuad.js index 2368d97a..2368d97a 100644..100755 --- a/js/helper-classes/RDGE/src/core/script/ScreenQuad.js +++ b/js/helper-classes/RDGE/src/core/script/ScreenQuad.js | |||
diff --git a/js/helper-classes/RDGE/src/core/script/ShaderManager.js b/js/helper-classes/RDGE/src/core/script/ShaderManager.js index f253d3c7..f253d3c7 100644..100755 --- a/js/helper-classes/RDGE/src/core/script/ShaderManager.js +++ b/js/helper-classes/RDGE/src/core/script/ShaderManager.js | |||
diff --git a/js/helper-classes/RDGE/src/core/script/TextureManager.js b/js/helper-classes/RDGE/src/core/script/TextureManager.js index cb674ddf..cb674ddf 100644..100755 --- a/js/helper-classes/RDGE/src/core/script/TextureManager.js +++ b/js/helper-classes/RDGE/src/core/script/TextureManager.js | |||
diff --git a/js/helper-classes/RDGE/src/core/script/animation.js b/js/helper-classes/RDGE/src/core/script/animation.js index 63eca0a2..63eca0a2 100644..100755 --- a/js/helper-classes/RDGE/src/core/script/animation.js +++ b/js/helper-classes/RDGE/src/core/script/animation.js | |||
diff --git a/js/helper-classes/RDGE/src/core/script/box.js b/js/helper-classes/RDGE/src/core/script/box.js index 8272d952..8272d952 100644..100755 --- a/js/helper-classes/RDGE/src/core/script/box.js +++ b/js/helper-classes/RDGE/src/core/script/box.js | |||
diff --git a/js/helper-classes/RDGE/src/core/script/camera.js b/js/helper-classes/RDGE/src/core/script/camera.js index caff232b..caff232b 100644..100755 --- a/js/helper-classes/RDGE/src/core/script/camera.js +++ b/js/helper-classes/RDGE/src/core/script/camera.js | |||
diff --git a/js/helper-classes/RDGE/src/core/script/engine.js b/js/helper-classes/RDGE/src/core/script/engine.js index 5bc9305c..5bc9305c 100644..100755 --- a/js/helper-classes/RDGE/src/core/script/engine.js +++ b/js/helper-classes/RDGE/src/core/script/engine.js | |||
diff --git a/js/helper-classes/RDGE/src/core/script/fx/blur.js b/js/helper-classes/RDGE/src/core/script/fx/blur.js index 7fa24712..7fa24712 100644..100755 --- a/js/helper-classes/RDGE/src/core/script/fx/blur.js +++ b/js/helper-classes/RDGE/src/core/script/fx/blur.js | |||
diff --git a/js/helper-classes/RDGE/src/core/script/fx/ssao.js b/js/helper-classes/RDGE/src/core/script/fx/ssao.js index 05793594..05793594 100644..100755 --- a/js/helper-classes/RDGE/src/core/script/fx/ssao.js +++ b/js/helper-classes/RDGE/src/core/script/fx/ssao.js | |||
diff --git a/js/helper-classes/RDGE/src/core/script/init_state.js b/js/helper-classes/RDGE/src/core/script/init_state.js index 4b97a4f4..4b97a4f4 100644..100755 --- a/js/helper-classes/RDGE/src/core/script/init_state.js +++ b/js/helper-classes/RDGE/src/core/script/init_state.js | |||
diff --git a/js/helper-classes/RDGE/src/core/script/input.js b/js/helper-classes/RDGE/src/core/script/input.js index 7622c5ab..7622c5ab 100644..100755 --- a/js/helper-classes/RDGE/src/core/script/input.js +++ b/js/helper-classes/RDGE/src/core/script/input.js | |||
diff --git a/js/helper-classes/RDGE/src/core/script/jpass.js b/js/helper-classes/RDGE/src/core/script/jpass.js index 326394dc..326394dc 100644..100755 --- a/js/helper-classes/RDGE/src/core/script/jpass.js +++ b/js/helper-classes/RDGE/src/core/script/jpass.js | |||
diff --git a/js/helper-classes/RDGE/src/core/script/jshader.js b/js/helper-classes/RDGE/src/core/script/jshader.js index 36c5939e..36c5939e 100644..100755 --- a/js/helper-classes/RDGE/src/core/script/jshader.js +++ b/js/helper-classes/RDGE/src/core/script/jshader.js | |||
diff --git a/js/helper-classes/RDGE/src/core/script/lightmanager.js b/js/helper-classes/RDGE/src/core/script/lightmanager.js index 7d76ef90..7d76ef90 100644..100755 --- a/js/helper-classes/RDGE/src/core/script/lightmanager.js +++ b/js/helper-classes/RDGE/src/core/script/lightmanager.js | |||
diff --git a/js/helper-classes/RDGE/src/core/script/math/mat4.js b/js/helper-classes/RDGE/src/core/script/math/mat4.js index fab57732..fab57732 100644..100755 --- a/js/helper-classes/RDGE/src/core/script/math/mat4.js +++ b/js/helper-classes/RDGE/src/core/script/math/mat4.js | |||
diff --git a/js/helper-classes/RDGE/src/core/script/math/quat.js b/js/helper-classes/RDGE/src/core/script/math/quat.js index 5c2c8bb6..5c2c8bb6 100644..100755 --- a/js/helper-classes/RDGE/src/core/script/math/quat.js +++ b/js/helper-classes/RDGE/src/core/script/math/quat.js | |||
diff --git a/js/helper-classes/RDGE/src/core/script/math/vec2.js b/js/helper-classes/RDGE/src/core/script/math/vec2.js index 5f1b07e3..5f1b07e3 100644..100755 --- a/js/helper-classes/RDGE/src/core/script/math/vec2.js +++ b/js/helper-classes/RDGE/src/core/script/math/vec2.js | |||
diff --git a/js/helper-classes/RDGE/src/core/script/math/vec3.js b/js/helper-classes/RDGE/src/core/script/math/vec3.js index 143fc352..143fc352 100644..100755 --- a/js/helper-classes/RDGE/src/core/script/math/vec3.js +++ b/js/helper-classes/RDGE/src/core/script/math/vec3.js | |||
diff --git a/js/helper-classes/RDGE/src/core/script/math/vec4.js b/js/helper-classes/RDGE/src/core/script/math/vec4.js index 3a0de375..3a0de375 100644..100755 --- a/js/helper-classes/RDGE/src/core/script/math/vec4.js +++ b/js/helper-classes/RDGE/src/core/script/math/vec4.js | |||
diff --git a/js/helper-classes/RDGE/src/core/script/objectManager.js b/js/helper-classes/RDGE/src/core/script/objectManager.js index 0bb8b91b..0bb8b91b 100644..100755 --- a/js/helper-classes/RDGE/src/core/script/objectManager.js +++ b/js/helper-classes/RDGE/src/core/script/objectManager.js | |||
diff --git a/js/helper-classes/RDGE/src/core/script/particle.js b/js/helper-classes/RDGE/src/core/script/particle.js index dd83433e..dd83433e 100644..100755 --- a/js/helper-classes/RDGE/src/core/script/particle.js +++ b/js/helper-classes/RDGE/src/core/script/particle.js | |||
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 100644..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/renderUtils.js b/js/helper-classes/RDGE/src/core/script/renderUtils.js index baa38560..baa38560 100644..100755 --- a/js/helper-classes/RDGE/src/core/script/renderUtils.js +++ b/js/helper-classes/RDGE/src/core/script/renderUtils.js | |||
diff --git a/js/helper-classes/RDGE/src/core/script/rendercontext.js b/js/helper-classes/RDGE/src/core/script/rendercontext.js index 6bc8665b..6bc8665b 100644..100755 --- a/js/helper-classes/RDGE/src/core/script/rendercontext.js +++ b/js/helper-classes/RDGE/src/core/script/rendercontext.js | |||
diff --git a/js/helper-classes/RDGE/src/core/script/renderer.js b/js/helper-classes/RDGE/src/core/script/renderer.js index 517947df..a50b8a68 100644..100755 --- a/js/helper-classes/RDGE/src/core/script/renderer.js +++ b/js/helper-classes/RDGE/src/core/script/renderer.js | |||
@@ -359,9 +359,11 @@ _renderer = function(canvas) { | |||
359 | * @param wrap - optional "CLAMP or "REPEAT", default is clamp | 359 | * @param wrap - optional "CLAMP or "REPEAT", default is clamp |
360 | * @param mips - optional true/false value to create mipmaps, the default is true | 360 | * @param mips - optional true/false value to create mipmaps, the default is true |
361 | */ | 361 | */ |
362 | this.unloadedTextureCount = 0; | ||
362 | _texparams = function(wrap, mips) { this.wrap = wrap, this.mips = mips }; | 363 | _texparams = function(wrap, mips) { this.wrap = wrap, this.mips = mips }; |
363 | this.createTexture = function(url, wrap, mips) { | 364 | this.createTexture = function(url, wrap, mips) { |
364 | var texture = this.ctx.createTexture(); | 365 | var texture = this.ctx.createTexture(); |
366 | this.unloadedTextureCount++; | ||
365 | 367 | ||
366 | if (wrap === undefined) | 368 | if (wrap === undefined) |
367 | wrap = "CLAMP"; | 369 | wrap = "CLAMP"; |
@@ -369,7 +371,6 @@ _renderer = function(canvas) { | |||
369 | mips = true; | 371 | mips = true; |
370 | 372 | ||
371 | if (texture) { | 373 | if (texture) { |
372 | //console.log( "createTexture: " + url ); | ||
373 | texture.image = new Image(); | 374 | texture.image = new Image(); |
374 | texture.image.src = url; | 375 | texture.image.src = url; |
375 | texture.image.context = g_Engine.getContext(); | 376 | texture.image.context = g_Engine.getContext(); |
@@ -377,9 +378,20 @@ _renderer = function(canvas) { | |||
377 | texture.image.onload = function() { | 378 | texture.image.onload = function() { |
378 | var stateMan = this.context.ctxStateManager; | 379 | var stateMan = this.context.ctxStateManager; |
379 | stateMan.RDGEInitState.loadTexture(texture); | 380 | stateMan.RDGEInitState.loadTexture(texture); |
380 | //console.log( "loaded texture: " + texture.lookUpName ); | 381 | this.context.renderer.unloadedTextureCount--; |
382 | //console.log( "loaded texture: " + texture.lookUpName + ",to: " + this.context.renderer._world._worldCount + ", textures remaining to load: " + this.context.renderer.unloadedTextureCount ); | ||
381 | if (texture.callback) texture.callback( texture ); | 383 | if (texture.callback) texture.callback( texture ); |
384 | if (this.context.renderer.unloadedTextureCount < 0) | ||
385 | console.log( "more textures loaded then created..." ); | ||
382 | }; | 386 | }; |
387 | texture.image.onerror = function() { | ||
388 | this.context.renderer.unloadedTextureCount--; | ||
389 | if (texture.callback) texture.callback( texture ); | ||
390 | //console.log( "Error loading texture: " + texture.image.src ); | ||
391 | if (this.context.renderer.unloadedTextureCount < 0) | ||