diff options
author | Valerio Virgillito | 2012-02-09 11:57:35 -0800 |
---|---|---|
committer | Valerio Virgillito | 2012-02-09 11:57:35 -0800 |
commit | ce81a3f4387d80f9ac406e73b843fb5dbe9cf432 (patch) | |
tree | 292934c613d7d6952cddac618a7db13a04c48bb3 /js/helper-classes/RDGE/src/core/script/renderer.js | |
parent | e78f4312c194d9e8188075cf1fe87e4be22b24e4 (diff) | |
parent | fba39dbb3bd64eddf6162fbf57232089e446fb06 (diff) | |
download | ninja-ce81a3f4387d80f9ac406e73b843fb5dbe9cf432.tar.gz |
Merge pull request #26 from pushkarjoshi/pentool
Pentool
Diffstat (limited to 'js/helper-classes/RDGE/src/core/script/renderer.js')
-rw-r--r-- | js/helper-classes/RDGE/src/core/script/renderer.js | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/js/helper-classes/RDGE/src/core/script/renderer.js b/js/helper-classes/RDGE/src/core/script/renderer.js index 0c51d2cb..517947df 100644 --- a/js/helper-classes/RDGE/src/core/script/renderer.js +++ b/js/helper-classes/RDGE/src/core/script/renderer.js | |||
@@ -335,14 +335,19 @@ _renderer = function(canvas) { | |||
335 | 335 | ||
336 | var tex = this.textureMap[name]; | 336 | var tex = this.textureMap[name]; |
337 | 337 | ||
338 | if (tex === undefined) { | 338 | if (tex === undefined) |
339 | 339 | { | |
340 | |||
341 | // load the texture | 340 | // load the texture |
342 | tex = this.createTexture(name + ext, wrap, mips); | 341 | tex = this.createTexture(name + ext, wrap, mips); |
343 | this.textureMap[name] = tex; | 342 | this.textureMap[name] = tex; |
344 | tex.lookUpName = name; | 343 | tex.lookUpName = name; |
344 | tex.previouslyReferenced = false; | ||
345 | } | 345 | } |
346 | else | ||
347 | { | ||
348 | //console.log( "texture already loaded: " + name ); | ||
349 | tex.previouslyReferenced = true; | ||
350 | } | ||
346 | 351 | ||
347 | return tex; | 352 | return tex; |
348 | 353 | ||
@@ -364,6 +369,7 @@ _renderer = function(canvas) { | |||
364 | mips = true; | 369 | mips = true; |
365 | 370 | ||
366 | if (texture) { | 371 | if (texture) { |
372 | //console.log( "createTexture: " + url ); | ||
367 | texture.image = new Image(); | 373 | texture.image = new Image(); |
368 | texture.image.src = url; | 374 | texture.image.src = url; |
369 | texture.image.context = g_Engine.getContext(); | 375 | texture.image.context = g_Engine.getContext(); |
@@ -371,6 +377,8 @@ _renderer = function(canvas) { | |||
371 | texture.image.onload = function() { | 377 | texture.image.onload = function() { |
372 | var stateMan = this.context.ctxStateManager; | 378 | var stateMan = this.context.ctxStateManager; |
373 | stateMan.RDGEInitState.loadTexture(texture); | 379 | stateMan.RDGEInitState.loadTexture(texture); |
380 | //console.log( "loaded texture: " + texture.lookUpName ); | ||
381 | if (texture.callback) texture.callback( texture ); | ||
374 | }; | 382 | }; |
375 | } | 383 | } |
376 | return texture; | 384 | return texture; |