Skip to content

Commit

Permalink
Merge pull request #154 from dingpinglv/Iss2082_FixSomeBugs
Browse files Browse the repository at this point in the history 
fixed #2082 preload some resources for PerformanceSpriteTest
  • Loading branch information
SeanLin committed Apr 27, 2013
2 parents d7ea5f9 + 9aebbef commit 6dab3c3
Show file tree
Hide file tree
Showing 3 changed files with 103 additions and 34 deletions.
20 changes: 11 additions & 9 deletions tests/PerformanceTest/PerformanceSpriteTest.js
View file
Expand Up @@ -161,9 +161,11 @@ var SubTest = cc.Class.extend({
// purge textures
var mgr = cc.TextureCache.getInstance();
// [mgr removeAllTextures];
mgr.removeTexture(mgr.addImage("res/Images/grossinis_sister1.png"));
mgr.removeTexture(mgr.addImage("res/Images/grossini_dance_atlas.png"));
mgr.removeTexture(mgr.addImage("res/Images/spritesheet1.png"));
if ( sys.platform != 'browser') {
mgr.removeTexture(mgr.addImage("res/Images/grossinis_sister1.png"));
mgr.removeTexture(mgr.addImage("res/Images/grossini_dance_atlas.png"));
mgr.removeTexture(mgr.addImage("res/Images/spritesheet1.png"));
}

switch (this._subtestNumber) {
case 1:
Expand All @@ -174,41 +176,41 @@ var SubTest = cc.Class.extend({
case 2:
if( "opengl" in sys.capabilities )
cc.Texture2D.setDefaultAlphaPixelFormat(cc.TEXTURE_PIXELFORMAT_RGBA8888);
this._batchNode = cc.SpriteBatchNode.create("res/Images/grossinis_sister1.png", 100);
this._batchNode = cc.SpriteBatchNode.create("res/Images/grossinis_sister1.png", 500);
p.addChild(this._batchNode, 0);
break;
case 3:
if( "opengl" in sys.capabilities )
cc.Texture2D.setDefaultAlphaPixelFormat(cc.TEXTURE_PIXELFORMAT_RGBA4444);
this._batchNode = cc.SpriteBatchNode.create("res/Images/grossinis_sister1.png", 100);
this._batchNode = cc.SpriteBatchNode.create("res/Images/grossinis_sister1.png", 500);
p.addChild(this._batchNode, 0);
break;

///
case 5:
if( "opengl" in sys.capabilities )
cc.Texture2D.setDefaultAlphaPixelFormat(cc.TEXTURE_PIXELFORMAT_RGBA8888);
this._batchNode = cc.SpriteBatchNode.create("res/Images/grossini_dance_atlas.png", 100);
this._batchNode = cc.SpriteBatchNode.create("res/Images/grossini_dance_atlas.png", 500);
p.addChild(this._batchNode, 0);
break;
case 6:
if( "opengl" in sys.capabilities )
cc.Texture2D.setDefaultAlphaPixelFormat(cc.TEXTURE_PIXELFORMAT_RGBA4444);
this._batchNode = cc.SpriteBatchNode.create("res/Images/grossini_dance_atlas.png", 100);
this._batchNode = cc.SpriteBatchNode.create("res/Images/grossini_dance_atlas.png", 500);
p.addChild(this._batchNode, 0);
break;

///
case 8:
if( "opengl" in sys.capabilities )
cc.Texture2D.setDefaultAlphaPixelFormat(cc.TEXTURE_PIXELFORMAT_RGBA8888);
this._batchNode = cc.SpriteBatchNode.create("res/Images/spritesheet1.png", 100);
this._batchNode = cc.SpriteBatchNode.create("res/Images/spritesheet1.png", 500);
p.addChild(this._batchNode, 0);
break;
case 9:
if( "opengl" in sys.capabilities )
cc.Texture2D.setDefaultAlphaPixelFormat(cc.TEXTURE_PIXELFORMAT_RGBA4444);
this._batchNode = cc.SpriteBatchNode.create("res/Images/spritesheet1.png", 100);
this._batchNode = cc.SpriteBatchNode.create("res/Images/spritesheet1.png", 500);
p.addChild(this._batchNode, 0);
break;

Expand Down
2 changes: 1 addition & 1 deletion tests/tests-main.js
View file
Expand Up @@ -366,9 +366,9 @@ var testNames = [
return new NodeTestScene();
}
},
//"MotionStreakTest",
{
title:"OpenGL Test",
resource:g_opengl_resources,
platforms: PLATFORM_JSB_AND_WEBGL,
testScene:function () {
return new OpenGLTestScene();
Expand Down
115 changes: 91 additions & 24 deletions tests/tests_resources-html5.js
View file
Expand Up @@ -168,28 +168,7 @@ var s_image_icon = "res/Images/Icon.png";

var g_ressources = [
//global
//preload shader source
{src:"res/Shaders/example_Blur.fsh"},
{src:"res/Shaders/example_ColorBars.fsh"},
{src:"res/Shaders/example_ColorBars.vsh"},
{src:"res/Shaders/example_Flower.fsh"},
{src:"res/Shaders/example_Flower.vsh"},
{src:"res/Shaders/example_Heart.fsh"},
{src:"res/Shaders/example_Heart.vsh"},
{src:"res/Shaders/example_Julia.fsh"},
{src:"res/Shaders/example_Julia.vsh"},
{src:"res/Shaders/example_Mandelbrot.fsh"},
{src:"res/Shaders/example_Mandelbrot.vsh"},
{src:"res/Shaders/example_Monjori.fsh"},
{src:"res/Shaders/example_Monjori.vsh"},
{src:"res/Shaders/example_Plasma.fsh"},
{src:"res/Shaders/example_Plasma.vsh"},
{src:"res/Shaders/example_Twist.fsh"},
{src:"res/Shaders/example_Twist.vsh"},

{src:"res/fonts/west_england-64.fnt"},
{src:"res/fonts/west_england-64.png"},

{src:s_grossini_dance_atlas},
{src:s_pathFog},
{src:s_circle_plist},
{src:s_circle_png},
Expand Down Expand Up @@ -241,7 +220,6 @@ var g_sprites = [
{src:s_piece},
{src:s_grossini_gray},
{src:s_grossini_blue},
{src:s_grossini_dance_atlas},
{src:s_grossini_aliases},
{src:s_dragon_animation},
{src:s_ghosts},
Expand Down Expand Up @@ -296,6 +274,30 @@ var g_s9s_blocks = [
{src:s_s9s_ui_plist}
];

var g_opengl_resources = [
//preload shader source
{src:"res/Shaders/example_Blur.fsh"},
{src:"res/Shaders/example_ColorBars.fsh"},
{src:"res/Shaders/example_ColorBars.vsh"},
{src:"res/Shaders/example_Flower.fsh"},
{src:"res/Shaders/example_Flower.vsh"},
{src:"res/Shaders/example_Heart.fsh"},
{src:"res/Shaders/example_Heart.vsh"},
{src:"res/Shaders/example_Julia.fsh"},
{src:"res/Shaders/example_Julia.vsh"},
{src:"res/Shaders/example_Mandelbrot.fsh"},
{src:"res/Shaders/example_Mandelbrot.vsh"},
{src:"res/Shaders/example_Monjori.fsh"},
{src:"res/Shaders/example_Monjori.vsh"},
{src:"res/Shaders/example_Plasma.fsh"},
{src:"res/Shaders/example_Plasma.vsh"},
{src:"res/Shaders/example_Twist.fsh"},
{src:"res/Shaders/example_Twist.vsh"},

{src:"res/fonts/west_england-64.fnt"},
{src:"res/fonts/west_england-64.png"},
];

var g_label = [
//{src:s_atlasTest},
{src:s_bitmapFontTest},
Expand Down Expand Up @@ -475,7 +477,72 @@ var g_extensions = [
var g_performace = [
{src:"res/animations/crystals.plist"},
{src:"res/animations/crystals.png"},
{src:"res/Images/fps_images.png"}
{src:"res/Images/fps_images.png"},
{src:"res/Images/spritesheet1.png"},
{src:"res/Images/sprites_test/sprite-0-0.png"},
{src:"res/Images/sprites_test/sprite-0-1.png"},
{src:"res/Images/sprites_test/sprite-0-2.png"},
{src:"res/Images/sprites_test/sprite-0-3.png"},
{src:"res/Images/sprites_test/sprite-0-4.png"},
{src:"res/Images/sprites_test/sprite-0-5.png"},
{src:"res/Images/sprites_test/sprite-0-6.png"},
{src:"res/Images/sprites_test/sprite-0-7.png"},
{src:"res/Images/sprites_test/sprite-1-0.png"},
{src:"res/Images/sprites_test/sprite-1-1.png"},
{src:"res/Images/sprites_test/sprite-1-2.png"},
{src:"res/Images/sprites_test/sprite-1-3.png"},
{src:"res/Images/sprites_test/sprite-1-4.png"},
{src:"res/Images/sprites_test/sprite-1-5.png"},
{src:"res/Images/sprites_test/sprite-1-6.png"},
{src:"res/Images/sprites_test/sprite-1-7.png"},
{src:"res/Images/sprites_test/sprite-2-0.png"},
{src:"res/Images/sprites_test/sprite-2-1.png"},
{src:"res/Images/sprites_test/sprite-2-2.png"},
{src:"res/Images/sprites_test/sprite-2-3.png"},
{src:"res/Images/sprites_test/sprite-2-4.png"},
{src:"res/Images/sprites_test/sprite-2-5.png"},
{src:"res/Images/sprites_test/sprite-2-6.png"},
{src:"res/Images/sprites_test/sprite-2-7.png"},
{src:"res/Images/sprites_test/sprite-3-0.png"},
{src:"res/Images/sprites_test/sprite-3-1.png"},
{src:"res/Images/sprites_test/sprite-3-2.png"},
{src:"res/Images/sprites_test/sprite-3-3.png"},
{src:"res/Images/sprites_test/sprite-3-4.png"},
{src:"res/Images/sprites_test/sprite-3-5.png"},
{src:"res/Images/sprites_test/sprite-3-6.png"},
{src:"res/Images/sprites_test/sprite-3-7.png"},
{src:"res/Images/sprites_test/sprite-4-0.png"},
{src:"res/Images/sprites_test/sprite-4-1.png"},
{src:"res/Images/sprites_test/sprite-4-2.png"},
{src:"res/Images/sprites_test/sprite-4-3.png"},
{src:"res/Images/sprites_test/sprite-4-4.png"},
{src:"res/Images/sprites_test/sprite-4-5.png"},
{src:"res/Images/sprites_test/sprite-4-6.png"},
{src:"res/Images/sprites_test/sprite-4-7.png"},
{src:"res/Images/sprites_test/sprite-5-0.png"},
{src:"res/Images/sprites_test/sprite-5-1.png"},
{src:"res/Images/sprites_test/sprite-5-2.png"},
{src:"res/Images/sprites_test/sprite-5-3.png"},
{src:"res/Images/sprites_test/sprite-5-4.png"},
{src:"res/Images/sprites_test/sprite-5-5.png"},
{src:"res/Images/sprites_test/sprite-5-6.png"},
{src:"res/Images/sprites_test/sprite-5-7.png"},
{src:"res/Images/sprites_test/sprite-6-0.png"},
{src:"res/Images/sprites_test/sprite-6-1.png"},
{src:"res/Images/sprites_test/sprite-6-2.png"},
{src:"res/Images/sprites_test/sprite-6-3.png"},
{src:"res/Images/sprites_test/sprite-6-4.png"},
{src:"res/Images/sprites_test/sprite-6-5.png"},
{src:"res/Images/sprites_test/sprite-6-6.png"},
{src:"res/Images/sprites_test/sprite-6-7.png"},
{src:"res/Images/sprites_test/sprite-7-0.png"},
{src:"res/Images/sprites_test/sprite-7-1.png"},
{src:"res/Images/sprites_test/sprite-7-2.png"},
{src:"res/Images/sprites_test/sprite-7-3.png"},
{src:"res/Images/sprites_test/sprite-7-4.png"},
{src:"res/Images/sprites_test/sprite-7-5.png"},
{src:"res/Images/sprites_test/sprite-7-6.png"},
{src:"res/Images/sprites_test/sprite-7-7.png"}
];

var g_tilemaps = [
Expand Down

0 comments on commit 6dab3c3

Please sign in to comment.