From 321e95c1a81cdda60bf64a02a77115e93600637b Mon Sep 17 00:00:00 2001 From: pandamicro Date: Mon, 22 Feb 2016 17:52:57 +0800 Subject: [PATCH] Fix issues in visual tests and confirm functionality of cc.loader --- test/visual-tests/main.js | 5 - .../src/ActionsTest/ActionsTest.js | 14 +- .../CocosDenshionTest/CocosDenshionTest.js | 4 +- .../src/EaseActionsTest/EaseActionsTest.js | 2 +- .../S9SpriteTest/S9SpriteTest.js | 2 +- test/visual-tests/src/LabelTest/LabelTest.js | 92 +- .../visual-tests/src/LoaderTest/LoaderTest.js | 221 ---- .../NewEventManagerTest.js | 42 +- .../visual-tests/src/OpenGLTest/OpenGLTest.js | 24 +- .../src/ParallaxTest/ParallaxTest.js | 4 +- .../src/ParticleTest/ParticleTest.js | 14 +- test/visual-tests/src/SpineTest/SpineTest.js | 8 +- .../visual-tests/src/SpriteTest/SpriteTest.js | 2 +- .../src/TextureCacheTest/TextureCacheTest.js | 72 +- .../src/TileMapTest/TileMapTest.js | 58 +- test/visual-tests/src/tests-main.js | 8 - test/visual-tests/src/tests_resources.js | 1123 +++++------------ 17 files changed, 516 insertions(+), 1179 deletions(-) delete mode 100644 test/visual-tests/src/LoaderTest/LoaderTest.js diff --git a/test/visual-tests/main.js b/test/visual-tests/main.js index 789dc19e82..ffb7e4f6ff 100644 --- a/test/visual-tests/main.js +++ b/test/visual-tests/main.js @@ -116,7 +116,6 @@ cc.game.run({ "src/tests-main.js", "src/PathTest/PathTest.js", - "src/LoaderTest/LoaderTest.js", "src/BakeLayerTest/BakeLayerTest.js", @@ -189,10 +188,6 @@ cc.game.run({ } jsb.fileUtils.setSearchPaths(searchPaths); } - else - { - cc.loader.resPath = 'res'; - } cc.LoaderScene.preload(g_resources, function () { if(window.sideIndexBar && typeof sideIndexBar.start === 'function'){ diff --git a/test/visual-tests/src/ActionsTest/ActionsTest.js b/test/visual-tests/src/ActionsTest/ActionsTest.js index 5bcab05269..a10a409ede 100644 --- a/test/visual-tests/src/ActionsTest/ActionsTest.js +++ b/test/visual-tests/src/ActionsTest/ActionsTest.js @@ -73,20 +73,20 @@ var ActionsDemo = BaseTestLayer.extend({ this._tamara.visible = false; this._kathia.visible = false; this._grossini.visible = false; - } else if (numberOfSprites == 1) { + } else if (numberOfSprites === 1) { this._tamara.visible = false; this._kathia.visible = false; this._grossini.x = winSize.width / 2; this._grossini.y = winSize.height / 2; } - else if (numberOfSprites == 2) { + else if (numberOfSprites === 2) { this._kathia.x = winSize.width / 3; this._kathia.y = winSize.height / 2; this._tamara.x = 2 * winSize.width / 3; this._tamara.y = winSize.height / 2; this._grossini.visible = false; } - else if (numberOfSprites == 3) { + else if (numberOfSprites === 3) { this._grossini.x = winSize.width / 2; this._grossini.y = winSize.height / 2; this._tamara.x = winSize.width / 4; @@ -974,7 +974,7 @@ var ActionAnimate = ActionsDemo.extend({ // var animation = new cc.SpriteFrameAnimation(); for (var i = 1; i < 15; i++) { - var frameName = "Images/grossini_dance_" + ((i < 10) ? ("0" + i) : i) + ".png"; + var frameName = "res/Images/grossini_dance_" + ((i < 10) ? ("0" + i) : i) + ".png"; animation.addSpriteFrameWithFile(frameName); } animation.setDelayPerUnit(2.8 / 14); @@ -1668,7 +1668,7 @@ var ActionFollow = ActionsDemo.extend({ this._grossini.runAction(rep); - this.runAction(cc.follow(this._grossini, cc.rect(0, 0, s.width * 2 - 100, s.height))); + this.runAction(cc.follow(this._grossini)); //----end30---- }, subtitle:function () { @@ -2515,7 +2515,7 @@ var Issue1438 = ActionsDemo.extend({ // Add 60 frames for (var j = 0; j < 4; j++) { for (var i = 1; i < 15; i++) { - var frameName = "Images/grossini_dance_" + ((i < 10) ? ("0" + i) : i) + ".png"; + var frameName = "res/Images/grossini_dance_" + ((i < 10) ? ("0" + i) : i) + ".png"; animation.addSpriteFrameWithFile(frameName); } } @@ -2837,7 +2837,7 @@ var ActionCustomTest = ActionsDemo.extend({ spriteTemp = this.addandCreateSpriteTemp("cc.Animate"); var animation = new cc.SpriteFrameAnimation(); for (var i = 1; i < 15; i++) { - var frameName = "Images/grossini_dance_" + ((i < 10) ? ("0" + i) : i) + ".png"; + var frameName = "res/Images/grossini_dance_" + ((i < 10) ? ("0" + i) : i) + ".png"; animation.addSpriteFrameWithFile(frameName); } animation.setDelayPerUnit(5 / 14); diff --git a/test/visual-tests/src/CocosDenshionTest/CocosDenshionTest.js b/test/visual-tests/src/CocosDenshionTest/CocosDenshionTest.js index 1a2373ac1c..dbd45cec78 100644 --- a/test/visual-tests/src/CocosDenshionTest/CocosDenshionTest.js +++ b/test/visual-tests/src/CocosDenshionTest/CocosDenshionTest.js @@ -26,8 +26,8 @@ var audioEngine = cc.audioEngine; -var MUSIC_FILE = cc.sys.os == cc.sys.OS_WINRT ? "background.wav" : "background.mp3"; -var EFFECT_FILE = cc.sys.os == cc.sys.OS_WINRT ? "effect1.wav" : "effect2.mp3"; +var MUSIC_FILE = "res/background.mp3"; +var EFFECT_FILE = "res/effect2.mp3"; var _DenshionTests = [ 'Music Test' diff --git a/test/visual-tests/src/EaseActionsTest/EaseActionsTest.js b/test/visual-tests/src/EaseActionsTest/EaseActionsTest.js index 78f70d93a4..ddf6000972 100644 --- a/test/visual-tests/src/EaseActionsTest/EaseActionsTest.js +++ b/test/visual-tests/src/EaseActionsTest/EaseActionsTest.js @@ -738,7 +738,7 @@ var SchedulerTest = EaseSpriteDemo.extend({ var emitter = new cc.ParticleFireworks(); emitter.setTotalParticles(250); - emitter.texture = cc.textureCache.addImage("Images/fire.png"); + emitter.texture = cc.textureCache.addImage("res/Images/fire.png"); this.addChild(emitter); //----end13---- }, diff --git a/test/visual-tests/src/ExtensionsTest/S9SpriteTest/S9SpriteTest.js b/test/visual-tests/src/ExtensionsTest/S9SpriteTest/S9SpriteTest.js index d6f267b308..29b589c714 100644 --- a/test/visual-tests/src/ExtensionsTest/S9SpriteTest/S9SpriteTest.js +++ b/test/visual-tests/src/ExtensionsTest/S9SpriteTest/S9SpriteTest.js @@ -111,7 +111,7 @@ var S9CreationTest = S9SpriteTestDemo.extend({ var x = winSize.width; var y = 0 + (winSize.height/2); - var s9sprite1 = new cc.Scale9Sprite("Images/blocks.png"); + var s9sprite1 = new cc.Scale9Sprite("res/Images/blocks.png"); var s9sprite2 = new cc.Scale9Sprite("blocks9.png"); diff --git a/test/visual-tests/src/LabelTest/LabelTest.js b/test/visual-tests/src/LabelTest/LabelTest.js index 66dff62e48..02fb0fe84f 100644 --- a/test/visual-tests/src/LabelTest/LabelTest.js +++ b/test/visual-tests/src/LabelTest/LabelTest.js @@ -98,13 +98,13 @@ var LabelAtlasOpacityTest = AtlasDemo.extend({ this._super(); this.time = 0; - var label1 = new cc.LabelAtlas("123 Test", s_resprefix + "fonts/tuffy_bold_italic-charmap.plist"); + var label1 = new cc.LabelAtlas("123 Test", "res/fonts/tuffy_bold_italic-charmap.plist"); this.addChild(label1, 0, TAG_LABEL_SPRITE1); label1.x = 10; label1.y = 100; label1.opacity = 200; - var label2 = new cc.LabelAtlas("0123456789", s_resprefix + "fonts/tuffy_bold_italic-charmap.plist"); + var label2 = new cc.LabelAtlas("0123456789", "res/fonts/tuffy_bold_italic-charmap.plist"); this.addChild(label2, 0, TAG_LABEL_SPRITE12); label2.x = 10; label2.y = 200; @@ -164,13 +164,13 @@ var LabelAtlasOpacityColorTest = AtlasDemo.extend({ ctor:function () { //----start1----ctor this._super(); - var label1 = new cc.LabelAtlas("123 Test", s_resprefix + "fonts/tuffy_bold_italic-charmap.png", 48, 64, ' '); + var label1 = new cc.LabelAtlas("123 Test", "res/fonts/tuffy_bold_italic-charmap.png", 48, 64, ' '); this.addChild(label1, 0, TAG_LABEL_SPRITE1); label1.x = 10; label1.y = 100; label1.opacity = 200; - var label2 = new cc.LabelAtlas("0123456789", s_resprefix + "fonts/tuffy_bold_italic-charmap.png", 48, 64, ' '); + var label2 = new cc.LabelAtlas("0123456789", "res/fonts/tuffy_bold_italic-charmap.png", 48, 64, ' '); this.addChild(label2, 0, TAG_LABEL_SPRITE12); label2.x = 10; label2.y = 200; @@ -242,7 +242,7 @@ var LabelAtlasHD = AtlasDemo.extend({ var s = director.getWinSize(); // cc.LabelBMFont - var label1 = new cc.LabelAtlas("TESTING RETINA DISPLAY", s_resprefix + "fonts/larabie-16.plist"); + var label1 = new cc.LabelAtlas("TESTING RETINA DISPLAY", "res/fonts/larabie-16.plist"); label1.anchorX = 0.5; label1.anchorY = 0.5; @@ -298,7 +298,7 @@ var BMFontOpacityColorAlignmentTest = AtlasDemo.extend({ var col = new cc.LayerColor(cc.color(128, 128, 128, 255)); this.addChild(col, -10); - var label1 = new cc.LabelBMFont("Test", s_resprefix + "fonts/bitmapFontTest2.fnt"); + var label1 = new cc.LabelBMFont("Test", "res/fonts/bitmapFontTest2.fnt"); // testing anchors label1.anchorX = 0; @@ -314,7 +314,7 @@ var BMFontOpacityColorAlignmentTest = AtlasDemo.extend({ // color and opacity work OK because bitmapFontAltas2 loads a BMP image (not a PNG image) // If you want to use both opacity and color, it is recommended to use NON premultiplied images like BMP images // Of course, you can also tell XCode not to compress PNG images, but I think it doesn't work as expected - var label2 = new cc.LabelBMFont("Test", s_resprefix + "fonts/bitmapFontTest2.fnt"); + var label2 = new cc.LabelBMFont("Test", "res/fonts/bitmapFontTest2.fnt"); // testing anchors label2.anchorX = 0.5; label2.anchorY = 0.5; @@ -322,7 +322,7 @@ var BMFontOpacityColorAlignmentTest = AtlasDemo.extend({ this.addChild(label2, 0, TAG_BITMAP_ATLAS2); label2.runAction(repeat.clone()); - var label3 = new cc.LabelBMFont("Test", s_resprefix + "fonts/bitmapFontTest2.fnt"); + var label3 = new cc.LabelBMFont("Test", "res/fonts/bitmapFontTest2.fnt"); // testing anchors label3.anchorX = 1; label3.anchorY = 1; @@ -408,7 +408,7 @@ var BMFontSubSpriteTest = AtlasDemo.extend({ drawNode.drawSegment(cc.p(s.width / 2, 0), cc.p(s.width / 2, s.height), 2); // Upper Label - var label = new cc.LabelBMFont("Bitmap Font Atlas", s_resprefix + "fonts/bitmapFontTest.fnt"); + var label = new cc.LabelBMFont("Bitmap Font Atlas", "res/fonts/bitmapFontTest.fnt"); this.labelObj = label; this.addChild(label); @@ -453,7 +453,7 @@ var BMFontSubSpriteTest = AtlasDemo.extend({ AChar.runAction(fade_4ever); // Bottom Label - var label2 = new cc.LabelBMFont("00.0", s_resprefix + "fonts/bitmapFontTest.fnt"); + var label2 = new cc.LabelBMFont("00.0", "res/fonts/bitmapFontTest.fnt"); this.addChild(label2, 0, TAG_BITMAP_ATLAS2); label2.x = s.width / 2.0; label2.y = 80; @@ -510,7 +510,7 @@ var BMFontPaddingTest = AtlasDemo.extend({ ctor:function () { //----start5---- this._super(); - var label = new cc.LabelBMFont("abcdefg", s_resprefix + "fonts/bitmapFontTest4.fnt"); + var label = new cc.LabelBMFont("abcdefg", "res/fonts/bitmapFontTest4.fnt"); this.addChild(label); var s = director.getWinSize(); @@ -563,21 +563,21 @@ var BMFontOffsetTest = AtlasDemo.extend({ var s = director.getWinSize(); var label = null; - label = new cc.LabelBMFont("FaFeFiFoFu", s_resprefix + "fonts/bitmapFontTest5.fnt"); + label = new cc.LabelBMFont("FaFeFiFoFu", "res/fonts/bitmapFontTest5.fnt"); this.addChild(label); label.x = s.width / 2; label.y = s.height / 2 + 50; label.anchorX = 0.5; label.anchorY = 0.5; - label = new cc.LabelBMFont("fafefifofu", s_resprefix + "fonts/bitmapFontTest5.fnt"); + label = new cc.LabelBMFont("fafefifofu", "res/fonts/bitmapFontTest5.fnt"); this.addChild(label); label.x = s.width / 2; label.y = s.height / 2; label.anchorX = 0.5; label.anchorY = 0.5; - label = new cc.LabelBMFont("aeiou", s_resprefix + "fonts/bitmapFontTest5.fnt"); + label = new cc.LabelBMFont("aeiou", "res/fonts/bitmapFontTest5.fnt"); this.addChild(label); label.x = s.width / 2; label.y = s.height / 2 - 50; @@ -628,7 +628,7 @@ var BMFontTintTest = AtlasDemo.extend({ var s = director.getWinSize(); var label = null; - label = new cc.LabelBMFont("Blue", s_resprefix + "fonts/bitmapFontTest5.fnt"); + label = new cc.LabelBMFont("Blue", "res/fonts/bitmapFontTest5.fnt"); label.color = cc.color(0, 0, 255); this.addChild(label); label.x = s.width / 2; @@ -636,7 +636,7 @@ var BMFontTintTest = AtlasDemo.extend({ label.anchorX = 0.5; label.anchorY = 0.5; - label = new cc.LabelBMFont("Red", s_resprefix + "fonts/bitmapFontTest5.fnt"); + label = new cc.LabelBMFont("Red", "res/fonts/bitmapFontTest5.fnt"); this.addChild(label); label.x = s.width / 2; label.y = 2 * s.height / 4; @@ -644,7 +644,7 @@ var BMFontTintTest = AtlasDemo.extend({ label.anchorY = 0.5; label.color = cc.color(255, 0, 0); - label = new cc.LabelBMFont("G", s_resprefix + "fonts/bitmapFontTest5.fnt"); + label = new cc.LabelBMFont("G", "res/fonts/bitmapFontTest5.fnt"); this.addChild(label); label.x = s.width / 2; label.y = 3 * s.height / 4; @@ -698,7 +698,7 @@ var BMFontSpeedTest = AtlasDemo.extend({ // Upper Label for (var i = 0; i < 100; i++) { var str = "-" + i + "-"; - var label = new cc.LabelBMFont(str, s_resprefix + "fonts/bitmapFontTest.fnt"); + var label = new cc.LabelBMFont(str, "res/fonts/bitmapFontTest.fnt"); this.addChild(label); var s = director.getWinSize(); @@ -729,7 +729,7 @@ var BMFontMultiLineTest = AtlasDemo.extend({ this._super(); // Left - var label1 = new cc.LabelBMFont("Multi line\nLeft", s_resprefix + "fonts/bitmapFontTest3.fnt"); + var label1 = new cc.LabelBMFont("Multi line\nLeft", "res/fonts/bitmapFontTest3.fnt"); label1.anchorX = 0; label1.anchorY = 0; this.addChild(label1, 0, TAG_BITMAP_ATLAS1); @@ -737,14 +737,14 @@ var BMFontMultiLineTest = AtlasDemo.extend({ // Center - var label2 = new cc.LabelBMFont("Multi line\nCenter", s_resprefix + "fonts/bitmapFontTest3.fnt"); + var label2 = new cc.LabelBMFont("Multi line\nCenter", "res/fonts/bitmapFontTest3.fnt"); label2.anchorX = 0.5; label2.anchorY = 0.5; this.addChild(label2, 0, TAG_BITMAP_ATLAS2); cc.log("content size:" + label2.width + "," + label2.height); // right - var label3 = new cc.LabelBMFont("Multi line\nRight\nThree lines Three", s_resprefix + "fonts/bitmapFontTest3.fnt"); + var label3 = new cc.LabelBMFont("Multi line\nRight\nThree lines Three", "res/fonts/bitmapFontTest3.fnt"); label3.anchorX = 1; label3.anchorY = 1; this.addChild(label3, 0, TAG_BITMAP_ATLAS3); @@ -804,7 +804,7 @@ var BMFontMultiLine2Test = AtlasDemo.extend({ this._super(); // Left - var label1 = new cc.LabelBMFont("Multi line\n\nAligned to the left", s_resprefix + "fonts/bitmapFontTest3.fnt"); + var label1 = new cc.LabelBMFont("Multi line\n\nAligned to the left", "res/fonts/bitmapFontTest3.fnt"); label1.anchorX = 0; label1.anchorY = 0; label1.textAlign = cc.TextAlignment.LEFT; @@ -814,7 +814,7 @@ var BMFontMultiLine2Test = AtlasDemo.extend({ // Center - var label2 = new cc.LabelBMFont("Error\n\nSome error message", s_resprefix + "fonts/bitmapFontTest3.fnt"); + var label2 = new cc.LabelBMFont("Error\n\nSome error message", "res/fonts/bitmapFontTest3.fnt"); label2.anchorX = 0.5; label2.anchorY = 0.5; label2.textAlign = cc.TextAlignment.CENTER; @@ -823,7 +823,7 @@ var BMFontMultiLine2Test = AtlasDemo.extend({ cc.log("content size:" + label2.width + "," + label2.height); // right - var label3 = new cc.LabelBMFont("Multi line\n\nAligned to the right", s_resprefix + "fonts/bitmapFontTest3.fnt"); + var label3 = new cc.LabelBMFont("Multi line\n\nAligned to the right", "res/fonts/bitmapFontTest3.fnt"); label3.anchorX = 1; label3.anchorY = 1; label3.textAlign = cc.TextAlignment.RIGHT; @@ -884,7 +884,7 @@ var LabelsEmpty = AtlasDemo.extend({ // cc.LabelBMFont - var label1 = new cc.LabelBMFont("", s_resprefix + "fonts/bitmapFontTest3.fnt"); + var label1 = new cc.LabelBMFont("", "res/fonts/bitmapFontTest3.fnt"); this.addChild(label1, 0, TAG_BITMAP_ATLAS1); label1.x = winSize.width / 2; label1.y = winSize.height - 100; @@ -896,7 +896,7 @@ var LabelsEmpty = AtlasDemo.extend({ label2.y = winSize.height / 2; // cc.LabelAtlas - var label3 = new cc.LabelAtlas("", s_resprefix + "fonts/tuffy_bold_italic-charmap.png", 48, 64, ' '); + var label3 = new cc.LabelAtlas("", "res/fonts/tuffy_bold_italic-charmap.png", 48, 64, ' '); this.addChild(label3, 0, TAG_BITMAP_ATLAS3); label3.x = winSize.width / 2; label3.y = 0 + 100; @@ -948,7 +948,7 @@ var BMFontHDTest = AtlasDemo.extend({ var s = director.getWinSize(); // cc.LabelBMFont - var label1 = new cc.LabelBMFont("TESTING RETINA DISPLAY", s_resprefix + "fonts/konqa32.fnt"); + var label1 = new cc.LabelBMFont("TESTING RETINA DISPLAY", "res/fonts/konqa32.fnt"); this.addChild(label1); label1.x = s.width / 2; label1.y = s.height / 2; @@ -1001,7 +1001,7 @@ var BMFontGlyphDesignerTest = AtlasDemo.extend({ this.addChild(layer, -10); // cc.LabelBMFont - var label1 = new cc.LabelBMFont("Testing Glyph Designer", s_resprefix + "fonts/futura-48.fnt"); + var label1 = new cc.LabelBMFont("Testing Glyph Designer", "res/fonts/futura-48.fnt"); this.addChild(label1); label1.x = s.width / 2; label1.y = s.height / 2; @@ -1354,7 +1354,7 @@ var BMFontChineseTest = AtlasDemo.extend({ //----start18----ctor this._super(); var size = director.getWinSize(); - var label = new cc.LabelBMFont("中国", s_resprefix + "fonts/bitmapFontChinese.fnt"); + var label = new cc.LabelBMFont("中国", "res/fonts/bitmapFontChinese.fnt"); label.x = size.width / 2; label.y = size.height / 2; this.addChild(label); @@ -1449,9 +1449,9 @@ var BMFontMultiLineAlignmentTest = AtlasDemo.extend({ var size = director.getWinSize(); // create and initialize a Label - this.labelShouldRetain = new cc.LabelBMFont(LongSentencesExample, s_resprefix + "fonts/markerFelt.fnt", size.width / 2, cc.TextAlignment.CENTER, cc.p(0, 0)); - this.arrowsBarShouldRetain = new _ccsg.Sprite(s_resprefix + "Images/arrowsBar.png"); - this.arrowsShouldRetain = new _ccsg.Sprite(s_resprefix + "Images/arrows.png"); + this.labelShouldRetain = new cc.LabelBMFont(LongSentencesExample, "res/fonts/markerFelt.fnt", size.width / 2, cc.TextAlignment.CENTER, cc.p(0, 0)); + this.arrowsBarShouldRetain = new _ccsg.Sprite("res/Images/arrowsBar.png"); + this.arrowsShouldRetain = new _ccsg.Sprite("res/Images/arrows.png"); cc.MenuItemFont.setFontSize(20); var longSentences = new cc.MenuItemFont("Long Flowing Sentences", this.onStringChanged, this); @@ -1558,26 +1558,26 @@ var BMFontMultiLineAlignmentTest = AtlasDemo.extend({ switch (sender.tag) { case LongSentences: this.labelShouldRetain.setString(LongSentencesExample); - this.labelShouldRetain.setFntFile(s_resprefix + "fonts/markerFelt.fnt"); + this.labelShouldRetain.setFntFile("res/fonts/markerFelt.fnt"); break; case LineBreaks: this.labelShouldRetain.setString(LineBreaksExample); - this.labelShouldRetain.setFntFile(s_resprefix + "fonts/markerFelt.fnt"); + this.labelShouldRetain.setFntFile("res/fonts/markerFelt.fnt"); break; case Mixed: this.labelShouldRetain.setString(MixedExample); - this.labelShouldRetain.setFntFile(s_resprefix + "fonts/markerFelt.fnt"); + this.labelShouldRetain.setFntFile("res/fonts/markerFelt.fnt"); break; case chineseText: - this.labelShouldRetain.setFntFile(s_resprefix + "fonts/arial-unicode-26.fnt"); + this.labelShouldRetain.setFntFile("res/fonts/arial-unicode-26.fnt"); this.labelShouldRetain.setString(chineseExampleText); break; case chineseMixEnglish: - this.labelShouldRetain.setFntFile(s_resprefix + "fonts/arial-unicode-26.fnt"); + this.labelShouldRetain.setFntFile("res/fonts/arial-unicode-26.fnt"); this.labelShouldRetain.setString(chineseMixEnglishText); break; case mixAllLanguage: - this.labelShouldRetain.setFntFile(s_resprefix + "fonts/arial-unicode-26.fnt"); + this.labelShouldRetain.setFntFile("res/fonts/arial-unicode-26.fnt"); this.labelShouldRetain.setString(mixAllLanguageText); break; default: @@ -1698,12 +1698,12 @@ var BMFontOneAtlas = AtlasDemo.extend({ this._super(); var s = director.getWinSize(); - var label1 = new cc.LabelBMFont("This is Helvetica", s_resprefix + "fonts/helvetica-32.fnt", cc.LabelAutomaticWidth, cc.TextAlignment.LEFT, cc.p(0, 0)); + var label1 = new cc.LabelBMFont("This is Helvetica", "res/fonts/helvetica-32.fnt", cc.LabelAutomaticWidth, cc.TextAlignment.LEFT, cc.p(0, 0)); this.addChild(label1); label1.x = s.width / 2; label1.y = s.height * 2 / 3; - var label2 = new cc.LabelBMFont("And this is Geneva", s_resprefix + "fonts/geneva-32.fnt", cc.LabelAutomaticWidth, cc.TextAlignment.LEFT, cc.p(0, 128)); + var label2 = new cc.LabelBMFont("And this is Geneva", "res/fonts/geneva-32.fnt", cc.LabelAutomaticWidth, cc.TextAlignment.LEFT, cc.p(0, 128)); this.addChild(label2); label2.x = s.width / 2; label2.y = s.height / 3; @@ -1728,17 +1728,17 @@ var BMFontUnicode = AtlasDemo.extend({ var japanese = "良い一日を"; var spanish = "Buen día"; - var label1 = new cc.LabelBMFont(spanish, s_resprefix + "fonts/arial-unicode-26.fnt", 200, cc.TextAlignment.LEFT); + var label1 = new cc.LabelBMFont(spanish, "res/fonts/arial-unicode-26.fnt", 200, cc.TextAlignment.LEFT); this.addChild(label1); label1.x = winSize.width / 2; label1.y = winSize.height / 4; - var label2 = new cc.LabelBMFont(chinese, s_resprefix + "fonts/arial-unicode-26.fnt"); + var label2 = new cc.LabelBMFont(chinese, "res/fonts/arial-unicode-26.fnt"); this.addChild(label2); label2.x = winSize.width / 2; label2.y = winSize.height / 2.2; - var label3 = new cc.LabelBMFont(japanese, s_resprefix + "fonts/arial-unicode-26.fnt"); + var label3 = new cc.LabelBMFont(japanese, "res/fonts/arial-unicode-26.fnt"); this.addChild(label3); label3.x = winSize.width / 2; label3.y = winSize.height / 1.5; @@ -1759,7 +1759,7 @@ var BMFontInit = AtlasDemo.extend({ this._super(); var bmFont = new cc.LabelBMFont(); - bmFont.setFntFile(s_resprefix + "fonts/helvetica-32.fnt"); + bmFont.setFntFile("res/fonts/helvetica-32.fnt"); bmFont.setString("It is working!"); this.addChild(bmFont); bmFont.x = winSize.width / 2; @@ -1857,7 +1857,7 @@ var BMFontColorParentChild = AtlasDemo.extend({ //----start15----ctor this._super(); - this.label = new cc.LabelBMFont("YRGB", s_resprefix + "fonts/konqa32.fnt"); + this.label = new cc.LabelBMFont("YRGB", "res/fonts/konqa32.fnt"); this.addChild(this.label); this.label.x = winSize.width / 2; this.label.y = winSize.height / 2; @@ -2324,7 +2324,7 @@ var LabelLayoutBaseTest = AtlasDemo.extend({ _initTestLabel: function(winSize){ var center = cc.visibleRect.center; - this._label = new _ccsg.Label("Hello World. This is a very long sentence Hehe.", s_resprefix + "fonts/bitmapFontTest2.fnt", _ccsg.Label.Type.BMFont); + this._label = new _ccsg.Label("Hello World. This is a very long sentence Hehe.", "res/fonts/bitmapFontTest2.fnt", _ccsg.Label.Type.BMFont); this._label.setDimensions(winSize.width/2, winSize.height/2); this._label.setLineBreakWithoutSpace(true); this._label.setPosition(center); diff --git a/test/visual-tests/src/LoaderTest/LoaderTest.js b/test/visual-tests/src/LoaderTest/LoaderTest.js deleted file mode 100644 index 517a298fb7..0000000000 --- a/test/visual-tests/src/LoaderTest/LoaderTest.js +++ /dev/null @@ -1,221 +0,0 @@ -/**************************************************************************** - Copyright (c) 2008-2010 Ricardo Quesada - Copyright (c) 2011-2012 cocos2d-x.org - Copyright (c) 2013-2014 Chukong Technologies Inc. - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. - ****************************************************************************/ - -//------------------------------------------------------------------ -// -// LoaderTestLayer -// -//------------------------------------------------------------------ -var LoaderTestLayer = BaseTestLayer.extend({ - _title:"Loader Test", - _subtitle:"", - - ctor:function() { - var self = this; - self._super(cc.color(0,0,0,255), cc.color(98,99,117,255)); - - var winSize = cc.winSize; - cc.loader.load(s_helloWorld, function(err, results){ - if(err){ - cc.log("Failed to load %s.", s_helloWorld); - return; - } - cc.log(s_helloWorld + "--->"); - cc.log(results[0]); - var bg = new _ccsg.Sprite(s_helloWorld); - self.addChild(bg); - bg.x = winSize.width/2; - bg.y = winSize.height/2; - }); - - // cc.loader.load([s_Cowboy_plist, s_Cowboy_png], function(err, results){ - // if(err){ - // cc.log("Failed to load %s, %s .", s_Cowboy_plist, s_Cowboy_png); - // return; - // } - - // cc.log(s_Cowboy_plist + "--->"); - // cc.log(results[0]); - // cc.log(s_Cowboy_png + "--->"); - // cc.log(results[1]); - // cc.spriteFrameCache.addSpriteFrames(s_Cowboy_plist); - // var frame = new _ccsg.Sprite("#testAnimationResource/1.png"); - // self.addChild(frame); - // frame.x = winSize.width/4; - // frame.y = winSize.height/4; - // }); - - var str; - if(cc.sys.isNative) { - str = s_lookup_desktop_plist; - } else if(cc.sys.isMobile) { - str = s_lookup_mobile_plist; - } else { - str = s_lookup_html5_plist; - } - - cc.loader.loadAliases(str, function(){ - var sprite = new _ccsg.Sprite("grossini.bmp"); - self.addChild( sprite ); - sprite.x = winSize.width/2; - sprite.y = winSize.height/2; - }); - - }, - - onNextCallback: function(){ - var parent = this.getParent(); - parent.removeChild(this); - parent.addChild(new LoaderCycleLayer()); - } -}); - -var LoaderCycleLayer = BaseTestLayer.extend({ - _title:"Failed to load Test", - _subtitle:"", - - ctor: function(){ - BaseTestLayer.prototype.ctor.call(this); - var index = 0; - - var winSize = cc.director.getWinSize(); - var t = this, - cb = function(num){ - var labelTTF = new cc.LabelTTF(num + " file failed"); - labelTTF.x = index++*100 + winSize.width - 150; - labelTTF.y = winSize.height / 2 - 20; - if(num === 1) - labelTTF.setColor(cc.Color.GREEN); - else - labelTTF.setColor(cc.Color.RED); - t.addChild(labelTTF); - if(index < 4) - t.test(cb); - }; - this.createInfo(); - this.regLoad(); - this.test(cb); - }, - - regLoad: function(){ - cc.loader.register(["_test1"], { - load: function(realUrl, url, res, cb){ - cc.loader.cache[url] = {}; - setTimeout(function(){ - cb && cb(null, cc.loader.cache[url]); - return cc.loader.cache[url]; - }, Math.random()*1000); - - } - }); - cc.loader.register(["_test2"], { - load: function(realUrl, url, res, cb){ - cb && cb({}); - return null; - } - }); - }, - - list: [ - "1._test2", - "1._test1", - "2._test1", - "3._test1", - "4._test1" - ], - - createInfo: function(){ - var winSize = cc.director.getWinSize(); - var info1 = new cc.LabelTTF("Load 5 files"); - info1.x = winSize.width / 2; - info1.y = winSize.height / 2 + 80; - var info2 = new cc.LabelTTF("1 file does not exist"); - info2.x = winSize.width / 2; - info2.y = winSize.height / 2 + 60; - var info3 = new cc.LabelTTF("The other 4 files should be loaded."); - info3.x = winSize.width / 2; - info3.y = winSize.height / 2 + 40; - - this.addChild(info1); - this.addChild(info2); - this.addChild(info3); - - var info4 = new cc.LabelTTF("test 1"); - info4.x = winSize.width / 2 - 50; - info4.y = winSize.height / 2; - var info5 = new cc.LabelTTF("test 2"); - info5.x = winSize.width / 2 - 150; - info5.y = winSize.height / 2; - var info6 = new cc.LabelTTF("test 3"); - info6.x = winSize.width / 2 + 50; - info6.y = winSize.height / 2; - var info7 = new cc.LabelTTF("test 4"); - info7.x = winSize.width / 2 + 150; - info7.y = winSize.height / 2; - - this.addChild(info4); - this.addChild(info5); - this.addChild(info6); - this.addChild(info7); - }, - - test: function(cb){ - this.clearRes(); - var layer = this; - cc.loader.load(layer.list, function(){ - var num = 0; - layer.list.forEach(function(item){ - if(!cc.loader.getRes(item)){ - num++; - } - }); - cb(num); - }); - }, - - clearRes: function(){ - this.list.forEach(function(item){ - cc.loader.release(item); - }); - }, - - onRestartCallback: function(){ - var parent = this._parent; - parent.removeChild(this); - parent.addChild(new LoaderCycleLayer()); - }, - - onBackCallback: function(){ - var parent = this._parent; - parent.removeChild(this); - parent.addChild(new LoaderTestLayer()); - } -}); - -var LoaderTestScene = TestScene.extend({ - runThisTest:function () { - this.addChild(new LoaderTestLayer()); - director.runScene(this); - } -}); \ No newline at end of file diff --git a/test/visual-tests/src/NewEventManagerTest/NewEventManagerTest.js b/test/visual-tests/src/NewEventManagerTest/NewEventManagerTest.js index d9b532bd76..8edf31fcfb 100644 --- a/test/visual-tests/src/NewEventManagerTest/NewEventManagerTest.js +++ b/test/visual-tests/src/NewEventManagerTest/NewEventManagerTest.js @@ -75,16 +75,16 @@ var TouchableSpriteTest = EventDispatcherTestDemo.extend({ var size = director.getVisibleSize(); var containerForSprite1 = new _ccsg.Node(); - var sprite1 = new _ccsg.Sprite("Images/CyanSquare.png"); + var sprite1 = new _ccsg.Sprite("res/Images/CyanSquare.png"); sprite1.setPosition(origin.x + size.width/2 - 80, origin.y + size.height/2 + 80); containerForSprite1.addChild(sprite1); this.addChild(containerForSprite1, 10); - var sprite2 = new _ccsg.Sprite("Images/MagentaSquare.png"); + var sprite2 = new _ccsg.Sprite("res/Images/MagentaSquare.png"); sprite2.setPosition(origin.x + size.width/2, origin.y + size.height/2); this.addChild(sprite2, 20); - var sprite3 = new _ccsg.Sprite("Images/YellowSquare.png"); + var sprite3 = new _ccsg.Sprite("res/Images/YellowSquare.png"); sprite3.setPosition(0,0); sprite2.addChild(sprite3, 1); @@ -254,19 +254,19 @@ var FixedPriorityTest = EventDispatcherTestDemo.extend({ var size = director.getVisibleSize(); var sprite1 = TouchableSprite.create(30); - sprite1.setTexture("Images/CyanSquare.png"); + sprite1.setTexture("res/Images/CyanSquare.png"); sprite1.x = origin.x + size.width / 2 - 80; sprite1.y = origin.y + size.height / 2 + 40; this.addChild(sprite1, 10); var sprite2 = TouchableSprite.create(20); - sprite2.setTexture("Images/MagentaSquare.png"); + sprite2.setTexture("res/Images/MagentaSquare.png"); sprite2.x = origin.x + size.width / 2; sprite2.y = origin.y + size.height / 2; this.addChild(sprite2, 20); var sprite3 = TouchableSprite.create(10); - sprite3.setTexture("Images/YellowSquare.png"); + sprite3.setTexture("res/Images/YellowSquare.png"); sprite3.x = 0; sprite3.y = 0; sprite2.addChild(sprite3, 1); @@ -296,7 +296,7 @@ var RemoveListenerWhenDispatching = EventDispatcherTestDemo.extend({ var origin = director.getVisibleOrigin(); var size = director.getVisibleSize(); - var sprite1 = new _ccsg.Sprite("Images/CyanSquare.png"); + var sprite1 = new _ccsg.Sprite("res/Images/CyanSquare.png"); sprite1.setPosition(origin.x + size.width/2, origin.y + size.height/2); this.addChild(sprite1, 10); @@ -516,7 +516,7 @@ var SpriteAccelerationEventTest = EventDispatcherTestDemo.extend({ cc.inputManager.setAccelerometerEnabled(true); - var sprite = new _ccsg.Sprite("Images/ball.png"); + var sprite = new _ccsg.Sprite("res/Images/ball.png"); sprite.setPosition(origin.x + size.width/2, origin.y + size.height/2); this.addChild(sprite); @@ -580,7 +580,7 @@ var RemoveAndRetainNodeTest = EventDispatcherTestDemo.extend({ var origin = director.getVisibleOrigin(); var size = director.getVisibleSize(); - this._sprite = new _ccsg.Sprite("Images/CyanSquare.png"); + this._sprite = new _ccsg.Sprite("res/Images/CyanSquare.png"); this._sprite.setPosition(origin.x + size.width/2, origin.y + size.height/2); this.addChild(this._sprite, 10); @@ -878,11 +878,11 @@ var GlobalZTouchTest = EventDispatcherTestDemo.extend({ var SPRITE_COUNT = 8, sprite; for (var i = 0; i < SPRITE_COUNT; i++) { if(i==4) { - sprite = new _ccsg.Sprite("Images/CyanSquare.png"); + sprite = new _ccsg.Sprite("res/Images/CyanSquare.png"); this._sprite = sprite; this._sprite.setGlobalZOrder(-1); } else - sprite = new _ccsg.Sprite("Images/YellowSquare.png"); + sprite = new _ccsg.Sprite("res/Images/YellowSquare.png"); cc.eventManager.addListener(listener.clone(), sprite); this.addChild(sprite); @@ -998,17 +998,17 @@ var StopPropagationTest = EventDispatcherTestDemo.extend({ for (var i = 0; i < SPRITE_COUNT; i++) { if(i==4) { - sprite1 = new _ccsg.Sprite("Images/CyanSquare.png"); + sprite1 = new _ccsg.Sprite("res/Images/CyanSquare.png"); sprite1.setTag(StopPropagationTest._TAG_BLUE_SPRITE); this.addChild(sprite1, 100); - sprite2 = new _ccsg.Sprite("Images/CyanSquare.png"); + sprite2 = new _ccsg.Sprite("res/Images/CyanSquare.png"); sprite2.setTag(StopPropagationTest._TAG_BLUE_SPRITE2); this.addChild(sprite2, 100); } else { - sprite1 = new _ccsg.Sprite("Images/YellowSquare.png"); + sprite1 = new _ccsg.Sprite("res/Images/YellowSquare.png"); this.addChild(sprite1, 0); - sprite2 = new _ccsg.Sprite("Images/YellowSquare.png"); + sprite2 = new _ccsg.Sprite("res/Images/YellowSquare.png"); this.addChild(sprite2, 0); } @@ -1068,20 +1068,20 @@ var Issue4160 = EventDispatcherTestDemo.extend({ var size = cc.director.getVisibleSize(); var sprite1 = TouchableSprite.create(-30); - sprite1.setTexture("Images/CyanSquare.png"); + sprite1.setTexture("res/Images/CyanSquare.png"); sprite1.x = origin.x + (size.width/2) - 80; sprite1.y = origin.y + (size.height/2) + 40; this.addChild(sprite1, 5); var sprite2 = TouchableSprite.create(-20); - sprite2.setTexture("Images/MagentaSquare.png"); + sprite2.setTexture("res/Images/MagentaSquare.png"); sprite2.removeListenerOnTouchEnded(true); sprite2.x = origin.x + (size.width/2); sprite2.y = origin.y + (size.height/2); this.addChild(sprite2, 10); var sprite3 = TouchableSprite.create(-10); - sprite3.setTexture("Images/YellowSquare.png"); + sprite3.setTexture("res/Images/YellowSquare.png"); sprite3.x = 0; sprite3.y = 0; sprite2.addChild(sprite3, 21); @@ -1112,19 +1112,19 @@ var PauseResumeTargetTest = EventDispatcherTestDemo.extend({ var size = cc.director.getVisibleSize(); var sprite1 = TouchableSprite.create(); - sprite1.setTexture("Images/CyanSquare.png"); + sprite1.setTexture("res/Images/CyanSquare.png"); sprite1.x = origin.x + size.width / 2 - 180; sprite1.y = origin.y + size.height / 2 + 40; this.addChild(sprite1, 10); var sprite2 = TouchableSprite.create(); - sprite2.setTexture("Images/MagentaSquare.png"); + sprite2.setTexture("res/Images/MagentaSquare.png"); sprite2.x = origin.x + size.width / 2 - 100; sprite2.y = origin.y + size.height / 2; this.addChild(sprite2, 1); var sprite3 = TouchableSprite.create(100); // Sprite3 uses fixed priority listener - sprite3.setTexture("Images/YellowSquare.png"); + sprite3.setTexture("res/Images/YellowSquare.png"); sprite3.x = 0; sprite3.y = 0; sprite2.addChild(sprite3, -1); diff --git a/test/visual-tests/src/OpenGLTest/OpenGLTest.js b/test/visual-tests/src/OpenGLTest/OpenGLTest.js index 1531266cf4..a942e8813a 100644 --- a/test/visual-tests/src/OpenGLTest/OpenGLTest.js +++ b/test/visual-tests/src/OpenGLTest/OpenGLTest.js @@ -644,7 +644,7 @@ var ShaderHeartTest = OpenGLTestLayer.extend({ this._super(); if( 'opengl' in cc.sys.capabilities ) { - var shaderNode = new ShaderNode(ccbjs + "Shaders/example_Heart.vsh", ccbjs + "Shaders/example_Heart.fsh"); + var shaderNode = new ShaderNode("res/Shaders/example_Heart.vsh", "res/Shaders/example_Heart.fsh"); this.addChild(shaderNode,10); shaderNode.x = winSize.width/2; shaderNode.y = winSize.height/2; @@ -684,7 +684,7 @@ var ShaderMandelbrotTest = OpenGLTestLayer.extend({ this._super(); if( 'opengl' in cc.sys.capabilities ) { - var shaderNode = new ShaderNode(ccbjs + "Shaders/example_Mandelbrot.vsh", ccbjs + "Shaders/example_Mandelbrot.fsh"); + var shaderNode = new ShaderNode("res/Shaders/example_Mandelbrot.vsh", "res/Shaders/example_Mandelbrot.fsh"); this.addChild(shaderNode,10); shaderNode.x = winSize.width/2; shaderNode.y = winSize.height/2; @@ -719,7 +719,7 @@ var ShaderMonjoriTest = OpenGLTestLayer.extend({ this._super(); if( 'opengl' in cc.sys.capabilities ) { - var shaderNode = new ShaderNode(ccbjs + "Shaders/example_Monjori.vsh", ccbjs + "Shaders/example_Monjori.fsh"); + var shaderNode = new ShaderNode("res/Shaders/example_Monjori.vsh", "res/Shaders/example_Monjori.fsh"); this.addChild(shaderNode,10); shaderNode.x = winSize.width/2; shaderNode.y = winSize.height/2; @@ -754,7 +754,7 @@ var ShaderPlasmaTest = OpenGLTestLayer.extend({ this._super(); if( 'opengl' in cc.sys.capabilities ) { - var shaderNode = new ShaderNode(ccbjs + "Shaders/example_Plasma.vsh", ccbjs + "Shaders/example_Plasma.fsh"); + var shaderNode = new ShaderNode("res/Shaders/example_Plasma.vsh", "res/Shaders/example_Plasma.fsh"); this.addChild(shaderNode,10); shaderNode.x = winSize.width/2; shaderNode.y = winSize.height/2; @@ -793,7 +793,7 @@ var ShaderFlowerTest = OpenGLTestLayer.extend({ if( 'opengl' in cc.sys.capabilities ) { - var shaderNode = new ShaderNode(ccbjs + "Shaders/example_Flower.vsh", ccbjs + "Shaders/example_Flower.fsh"); + var shaderNode = new ShaderNode("res/Shaders/example_Flower.vsh", "res/Shaders/example_Flower.fsh"); this.addChild(shaderNode,10); shaderNode.x = winSize.width/2; shaderNode.y = winSize.height/2; @@ -832,7 +832,7 @@ var ShaderJuliaTest = OpenGLTestLayer.extend({ if( 'opengl' in cc.sys.capabilities ) { - var shaderNode = new ShaderNode(ccbjs + "Shaders/example_Julia.vsh", ccbjs + "Shaders/example_Julia.fsh"); + var shaderNode = new ShaderNode("res/Shaders/example_Julia.vsh", "res/Shaders/example_Julia.fsh"); this.addChild(shaderNode,10); shaderNode.x = winSize.width/2; shaderNode.y = winSize.height/2; @@ -873,12 +873,12 @@ var ShaderOutlineEffect = OpenGLTestLayer.extend({ if( 'opengl' in cc.sys.capabilities ) { if(cc.sys.isNative){ - this.shader = new cc.GLProgram(ccbjs + "Shaders/example_Outline_noMVP.vsh", ccbjs + "Shaders/example_Outline.fsh"); + this.shader = new cc.GLProgram("res/Shaders/example_Outline_noMVP.vsh", "res/Shaders/example_Outline.fsh"); this.shader.link(); this.shader.updateUniforms(); } else{ - this.shader = new cc.GLProgram(ccbjs + "Shaders/example_Outline.vsh", ccbjs + "Shaders/example_Outline.fsh"); + this.shader = new cc.GLProgram("res/Shaders/example_Outline.vsh", "res/Shaders/example_Outline.fsh"); this.shader.addAttribute(cc.ATTRIBUTE_NAME_POSITION, cc.VERTEX_ATTRIB_POSITION); this.shader.addAttribute(cc.ATTRIBUTE_NAME_TEX_COORD, cc.VERTEX_ATTRIB_TEX_COORDS); this.shader.addAttribute(cc.ATTRIBUTE_NAME_COLOR, cc.VERTEX_ATTRIB_COLOR); @@ -890,7 +890,7 @@ var ShaderOutlineEffect = OpenGLTestLayer.extend({ this.shader.setUniformLocationWith3f(this.shader.getUniformLocationForName('u_outlineColor'), 0 / 255, 255 / 255, 0 / 255); } - this.sprite = new _ccsg.Sprite('Images/grossini.png'); + this.sprite = new _ccsg.Sprite('res/Images/grossini.png'); this.sprite.attr({ x: winSize.width / 2, y: winSize.height / 2 @@ -949,13 +949,13 @@ var ShaderRetroEffect = OpenGLTestLayer.extend({ this._super(); if( 'opengl' in cc.sys.capabilities ) { - var program = new cc.GLProgram(ccbjs + "Shaders/example_ColorBars.vsh", ccbjs + "Shaders/example_ColorBars.fsh"); + var program = new cc.GLProgram("res/Shaders/example_ColorBars.vsh", "res/Shaders/example_ColorBars.fsh"); program.addAttribute(cc.ATTRIBUTE_NAME_POSITION, cc.VERTEX_ATTRIB_POSITION); program.addAttribute(cc.ATTRIBUTE_NAME_TEX_COORD, cc.VERTEX_ATTRIB_TEX_COORDS); program.link(); program.updateUniforms(); - var label = new cc.LabelBMFont("RETRO EFFECT","fonts/west_england-64.fnt"); + var label = new cc.LabelBMFont("RETRO EFFECT", "res/fonts/west_england-64.fnt"); if(cc.sys.isNative) label.children[0].shaderProgram = program; @@ -1019,7 +1019,7 @@ var GLGetActiveTest = OpenGLTestLayer.extend({ this._super(); if( 'opengl' in cc.sys.capabilities ) { - var sprite = this.sprite = new _ccsg.Sprite("Images/grossini.png"); + var sprite = this.sprite = new _ccsg.Sprite("res/Images/grossini.png"); sprite.x = winSize.width/2; sprite.y = winSize.height/2; this.addChild( sprite ); diff --git a/test/visual-tests/src/ParallaxTest/ParallaxTest.js b/test/visual-tests/src/ParallaxTest/ParallaxTest.js index 82dcbd7729..c9ac3661f5 100644 --- a/test/visual-tests/src/ParallaxTest/ParallaxTest.js +++ b/test/visual-tests/src/ParallaxTest/ParallaxTest.js @@ -84,7 +84,7 @@ var Parallax1 = ParallaxDemo.extend({ // Middle layer: a Tile map atlas //var tilemap = cc.TileMapAtlas.create(s_tilesPng, s_levelMapTga, 16, 16); - this._tilemap = new cc.TMXTiledMap(s_resprefix + "TileMaps/orthogonal-test2.tmx"); + this._tilemap = new cc.TMXTiledMap("res/TileMaps/orthogonal-test2.tmx"); // change the transform anchor to 0,0 (optional) this._tilemap.anchorX = 0; @@ -197,7 +197,7 @@ var Parallax2 = ParallaxDemo.extend({ // Middle layer: a Tile map atlas //var tilemap = cc.TileMapAtlas.create(s_tilesPng, s_levelMapTga, 16, 16); - var tilemap = new cc.TMXTiledMap(s_resprefix + "TileMaps/orthogonal-test2.tmx"); + var tilemap = new cc.TMXTiledMap("res/TileMaps/orthogonal-test2.tmx"); // change the transform anchor to 0,0 (optional) tilemap.anchorX = 0; diff --git a/test/visual-tests/src/ParticleTest/ParticleTest.js b/test/visual-tests/src/ParticleTest/ParticleTest.js index c3a1b1688a..9ba39a17e4 100644 --- a/test/visual-tests/src/ParticleTest/ParticleTest.js +++ b/test/visual-tests/src/ParticleTest/ParticleTest.js @@ -879,9 +879,9 @@ var DemoParticleFromFile = ParticleDemo.extend({ this.removeChild(this._background, true); this._background = null; - this._emitter = new _ccsg.ParticleSystem(s_resprefix + "Particles/" + this._title + ".plist"); + this._emitter = new _ccsg.ParticleSystem("res/Particles/" + this._title + ".plist"); // test create from a object - // var plistData = jsb.fileUtils.getValueMapFromFile(s_resprefix + "Particles/" + this._title + ".plist"); + // var plistData = jsb.fileUtils.getValueMapFromFile("res/Particles/" + this._title + ".plist"); // this._emitter = new _ccsg.ParticleSystem(plistData); this.addChild(this._emitter, 10); @@ -1134,7 +1134,7 @@ var Issue870 = ParticleDemo.extend({ this.removeChild(this._background, true); this._background = null; - var system = new _ccsg.ParticleSystem(s_resprefix + "Particles/SpinningPeas.plist"); + var system = new _ccsg.ParticleSystem("res/Particles/SpinningPeas.plist"); system.setTextureWithRect(cc.textureCache.addImage(s_particles), cc.rect(0, 0, 32, 32)); this.addChild(system, 10); this._emitter = system; @@ -1162,11 +1162,11 @@ var ParticleBatchTest = ParticleDemo.extend({ onEnter:function () { this._super(); - var emitter1 = new _ccsg.ParticleSystem(s_resprefix + 'Particles/LavaFlow.plist'); + var emitter1 = new _ccsg.ParticleSystem('res/Particles/LavaFlow.plist'); emitter1.startColor = cc.color(255, 0, 0, 255); - var emitter2 = new _ccsg.ParticleSystem(s_resprefix + 'Particles/LavaFlow.plist'); + var emitter2 = new _ccsg.ParticleSystem('res/Particles/LavaFlow.plist'); emitter2.startColor = cc.color(0, 255, 0, 255); - var emitter3 = new _ccsg.ParticleSystem(s_resprefix + 'Particles/LavaFlow.plist'); + var emitter3 = new _ccsg.ParticleSystem('res/Particles/LavaFlow.plist'); emitter3.startColor = cc.color(0, 0, 255, 255); emitter1.x = winSize.width / 1.25; @@ -1203,7 +1203,7 @@ var ParticleResizeTest = ParticleDemo.extend({ onEnter:function () { this._super(); - var emitter1 = new _ccsg.ParticleSystem( s_resprefix + 'Particles/LavaFlow.plist'); + var emitter1 = new _ccsg.ParticleSystem( 'res/Particles/LavaFlow.plist'); emitter1.x = winSize.width/2; emitter1.y = winSize.height/2; this.addChild(emitter1); diff --git a/test/visual-tests/src/SpineTest/SpineTest.js b/test/visual-tests/src/SpineTest/SpineTest.js index 6d9fdb96f2..791ee7836e 100644 --- a/test/visual-tests/src/SpineTest/SpineTest.js +++ b/test/visual-tests/src/SpineTest/SpineTest.js @@ -97,10 +97,10 @@ var SpineTestLayerNormal = SpineTestLayer.extend({ // No JS binding for spine-c in this version. So, only file loading is supported. var spineBoy; if (idx % 2 == 0) { - spineBoy = new customSkeletonAnimation('spine/spineboy.json', 'spine/spineboy.atlas'); + spineBoy = new customSkeletonAnimation('res/spine/spineboy.json', 'res/spine/spineboy.atlas'); } else { - spineBoy = new sp._SGSkeletonAnimation('spine/spineboy.json', 'spine/spineboy.atlas'); + spineBoy = new sp._SGSkeletonAnimation('res/spine/spineboy.json', 'res/spine/spineboy.atlas'); } spineBoy.setPosition(cc.p(size.width / 2, size.height / 2 - 150)); spineBoy.setMix('walk', 'jump', 0.2); @@ -223,7 +223,7 @@ var SpineTestLayerFFD = SpineTestLayer.extend({ ctor: function(){ this._super(cc.color(0,0,0,255), cc.color(98,99,117,255)); - var skeletonNode = new sp._SGSkeletonAnimation("spine/goblins-ffd.json", "spine/goblins-ffd.atlas", 1.5); + var skeletonNode = new sp._SGSkeletonAnimation("res/spine/goblins-ffd.json", "res/spine/goblins-ffd.atlas", 1.5); skeletonNode.setAnimation(0, "walk", true); skeletonNode.setSkin("goblin"); @@ -267,7 +267,7 @@ var SpineTestPerformanceLayer = SpineTestLayer.extend({ event: cc.EventListener.TOUCH_ONE_BY_ONE, onTouchBegan: function(touch, event){ var pos = self.convertToNodeSpace(touch.getLocation()); - var skeletonNode = new sp._SGSkeletonAnimation("spine/goblins-ffd.json", "spine/goblins-ffd.atlas", 1.5); + var skeletonNode = new sp._SGSkeletonAnimation("res/spine/goblins-ffd.json", "res/spine/goblins-ffd.atlas", 1.5); skeletonNode.setAnimation(0, "walk", true); skeletonNode.setSkin("goblin"); diff --git a/test/visual-tests/src/SpriteTest/SpriteTest.js b/test/visual-tests/src/SpriteTest/SpriteTest.js index 7c2109c0b1..d5d765b266 100644 --- a/test/visual-tests/src/SpriteTest/SpriteTest.js +++ b/test/visual-tests/src/SpriteTest/SpriteTest.js @@ -5232,7 +5232,7 @@ var SpriteBlendFuncTest = SpriteTestDemo.extend({ var destTitles = ["ZERO", "ONE", "DST_COLOR", "ONE_MINUS_DST_COLOR", "DST_ALPHA", "ONE_MINUS_DST_ALPHA"], srcTitles = ["ZERO", "ONE", "SRC_COLOR", "ONE_MINUS_SRC_COLOR", "SRC_ALPHA", "ONE_MINUS_SRC_ALPHA"]; - var sourceImg = "Images/dot.png", destImg = "Images/wood.jpg"; + var sourceImg = "res/Images/dot.png", destImg = "res/Images/wood.jpg"; var sourceTexture = cc.textureCache.addImage(sourceImg); sourceTexture.handleLoadedTexture(true); var sourceSprite = new _ccsg.Sprite(sourceImg); diff --git a/test/visual-tests/src/TextureCacheTest/TextureCacheTest.js b/test/visual-tests/src/TextureCacheTest/TextureCacheTest.js index e650912944..ee36b40363 100644 --- a/test/visual-tests/src/TextureCacheTest/TextureCacheTest.js +++ b/test/visual-tests/src/TextureCacheTest/TextureCacheTest.js @@ -147,57 +147,57 @@ var TextureCacheTest = TextureCacheTestBase.extend({ var texCache = cc.textureCache; // load textrues - texCache.addImageAsync("Images/HelloWorld.png", this.loadingCallBack, this); - texCache.addImageAsync("Images/grossini.png", this.loadingCallBack, this); - texCache.addImageAsync("Images/grossini_dance_01.png", this.loadingCallBack, this); - texCache.addImageAsync("Images/grossini_dance_02.png", this.loadingCallBack, this); - texCache.addImageAsync("Images/grossini_dance_03.png", this.loadingCallBack, this); - texCache.addImageAsync("Images/grossini_dance_04.png", this.loadingCallBack, this); - texCache.addImageAsync("Images/grossini_dance_05.png", this.loadingCallBack, this); - texCache.addImageAsync("Images/grossini_dance_06.png", this.loadingCallBack, this); - texCache.addImageAsync("Images/grossini_dance_07.png", this.loadingCallBack, this); - texCache.addImageAsync("Images/grossini_dance_08.png", this.loadingCallBack, this); - texCache.addImageAsync("Images/grossini_dance_09.png", this.loadingCallBack, this); - texCache.addImageAsync("Images/grossini_dance_10.png", this.loadingCallBack, this); - texCache.addImageAsync("Images/grossini_dance_11.png", this.loadingCallBack, this); - texCache.addImageAsync("Images/grossini_dance_12.png", this.loadingCallBack, this); - texCache.addImageAsync("Images/grossini_dance_13.png", this.loadingCallBack, this); - texCache.addImageAsync("Images/grossini_dance_14.png", this.loadingCallBack, this); + texCache.addImageAsync("res/Images/HelloWorld.png", this.loadingCallBack, this); + texCache.addImageAsync("res/Images/grossini.png", this.loadingCallBack, this); + texCache.addImageAsync("res/Images/grossini_dance_01.png", this.loadingCallBack, this); + texCache.addImageAsync("res/Images/grossini_dance_02.png", this.loadingCallBack, this); + texCache.addImageAsync("res/Images/grossini_dance_03.png", this.loadingCallBack, this); + texCache.addImageAsync("res/Images/grossini_dance_04.png", this.loadingCallBack, this); + texCache.addImageAsync("res/Images/grossini_dance_05.png", this.loadingCallBack, this); + texCache.addImageAsync("res/Images/grossini_dance_06.png", this.loadingCallBack, this); + texCache.addImageAsync("res/Images/grossini_dance_07.png", this.loadingCallBack, this); + texCache.addImageAsync("res/Images/grossini_dance_08.png", this.loadingCallBack, this); + texCache.addImageAsync("res/Images/grossini_dance_09.png", this.loadingCallBack, this); + texCache.addImageAsync("res/Images/grossini_dance_10.png", this.loadingCallBack, this); + texCache.addImageAsync("res/Images/grossini_dance_11.png", this.loadingCallBack, this); + texCache.addImageAsync("res/Images/grossini_dance_12.png", this.loadingCallBack, this); + texCache.addImageAsync("res/Images/grossini_dance_13.png", this.loadingCallBack, this); + texCache.addImageAsync("res/Images/grossini_dance_14.png", this.loadingCallBack, this); texCache.addImageAsync("res/Images/background1.png", this.loadingCallBack, this); texCache.addImageAsync("res/Images/background2.png", this.loadingCallBack, this); - texCache.addImageAsync("Images/background3.png", this.loadingCallBack, this); - texCache.addImageAsync("Images/blocks.png", this.loadingCallBack, this); + texCache.addImageAsync("res/Images/background3.png", this.loadingCallBack, this); + texCache.addImageAsync("res/Images/blocks.png", this.loadingCallBack, this); }, addSprite:function () { var size = cc.director.getWinSize(); // create sprites - var bg = new _ccsg.Sprite("Images/HelloWorld.png"); + var bg = new _ccsg.Sprite("res/Images/HelloWorld.png"); bg.x = size.width / 2; bg.y = size.height / 2; //bg.scale = 1.7; - var s1 = new _ccsg.Sprite("Images/grossini.png"); - var s2 = new _ccsg.Sprite("Images/grossini_dance_01.png"); - var s3 = new _ccsg.Sprite("Images/grossini_dance_02.png"); - var s4 = new _ccsg.Sprite("Images/grossini_dance_03.png"); - var s5 = new _ccsg.Sprite("Images/grossini_dance_04.png"); - var s6 = new _ccsg.Sprite("Images/grossini_dance_05.png"); - var s7 = new _ccsg.Sprite("Images/grossini_dance_06.png"); - var s8 = new _ccsg.Sprite("Images/grossini_dance_07.png"); - var s9 = new _ccsg.Sprite("Images/grossini_dance_08.png"); - var s10 = new _ccsg.Sprite("Images/grossini_dance_09.png"); - var s11 = new _ccsg.Sprite("Images/grossini_dance_10.png"); - var s12 = new _ccsg.Sprite("Images/grossini_dance_11.png"); - var s13 = new _ccsg.Sprite("Images/grossini_dance_12.png"); - var s14 = new _ccsg.Sprite("Images/grossini_dance_13.png"); - var s15 = new _ccsg.Sprite("Images/grossini_dance_14.png"); + var s1 = new _ccsg.Sprite("res/Images/grossini.png"); + var s2 = new _ccsg.Sprite("res/Images/grossini_dance_01.png"); + var s3 = new _ccsg.Sprite("res/Images/grossini_dance_02.png"); + var s4 = new _ccsg.Sprite("res/Images/grossini_dance_03.png"); + var s5 = new _ccsg.Sprite("res/Images/grossini_dance_04.png"); + var s6 = new _ccsg.Sprite("res/Images/grossini_dance_05.png"); + var s7 = new _ccsg.Sprite("res/Images/grossini_dance_06.png"); + var s8 = new _ccsg.Sprite("res/Images/grossini_dance_07.png"); + var s9 = new _ccsg.Sprite("res/Images/grossini_dance_08.png"); + var s10 = new _ccsg.Sprite("res/Images/grossini_dance_09.png"); + var s11 = new _ccsg.Sprite("res/Images/grossini_dance_10.png"); + var s12 = new _ccsg.Sprite("res/Images/grossini_dance_11.png"); + var s13 = new _ccsg.Sprite("res/Images/grossini_dance_12.png"); + var s14 = new _ccsg.Sprite("res/Images/grossini_dance_13.png"); + var s15 = new _ccsg.Sprite("res/Images/grossini_dance_14.png"); // just loading textures to slow down var s16 = new _ccsg.Sprite("res/Images/background1.png"); var s17 = new _ccsg.Sprite("res/Images/background2.png"); - var s18 = new _ccsg.Sprite("Images/background3.png"); - var s19 = new _ccsg.Sprite("Images/blocks.png"); + var s18 = new _ccsg.Sprite("res/Images/background3.png"); + var s19 = new _ccsg.Sprite("res/Images/blocks.png"); s1.x = 50; s1.y = 50; diff --git a/test/visual-tests/src/TileMapTest/TileMapTest.js b/test/visual-tests/src/TileMapTest/TileMapTest.js index 274a68837d..11e4e48b71 100644 --- a/test/visual-tests/src/TileMapTest/TileMapTest.js +++ b/test/visual-tests/src/TileMapTest/TileMapTest.js @@ -175,7 +175,7 @@ var TileMapEditTest = TileDemo.extend({ var TMXOrthoTest = TileDemo.extend({ ctor:function () { this._super(); - var map = new cc.TMXTiledMap(s_resprefix + "TileMaps/orthogonal-test1.tmx"); + var map = new cc.TMXTiledMap("res/TileMaps/orthogonal-test1.tmx"); this.addChild(map, 0, TAG_TILE_MAP); map.runAction(new cc.ScaleBy(2, 0.5)); @@ -217,7 +217,7 @@ var TMXOrthoTest2 = TileDemo.extend({ // // it should not flicker. No artifacts should appear // - var map = new cc.TMXTiledMap(s_resprefix + "TileMaps/orthogonal-test2.tmx"); + var map = new cc.TMXTiledMap("res/TileMaps/orthogonal-test2.tmx"); this.addChild(map, 0, TAG_TILE_MAP); }, title:function () { @@ -260,7 +260,7 @@ var TMXOrthoTest2 = TileDemo.extend({ var TMXOrthoTest3 = TileDemo.extend({ ctor:function () { this._super(); - var map = new cc.TMXTiledMap(s_resprefix + "TileMaps/orthogonal-test3.tmx"); + var map = new cc.TMXTiledMap("res/TileMaps/orthogonal-test3.tmx"); this.addChild(map, 0, TAG_TILE_MAP); map.scale = 0.2; @@ -298,7 +298,7 @@ var TMXOrthoTest3 = TileDemo.extend({ var TMXOrthoTest4 = TileDemo.extend({ ctor:function () { this._super(); - var map = new cc.TMXTiledMap(s_resprefix + "TileMaps/orthogonal-test4.tmx"); + var map = new cc.TMXTiledMap("res/TileMaps/orthogonal-test4.tmx"); this.addChild(map, 0, TAG_TILE_MAP); map.anchorX = 0; @@ -368,7 +368,7 @@ var TMXReadWriteTest = TileDemo.extend({ ctor:function () { this._super(); - var map = new cc.TMXTiledMap(s_resprefix + "TileMaps/orthogonal-test2.tmx"); + var map = new cc.TMXTiledMap("res/TileMaps/orthogonal-test2.tmx"); this.addChild(map, 0, TAG_TILE_MAP); var layer = map.getLayer("Layer 0"); @@ -490,7 +490,7 @@ var TMXHexTest = TileDemo.extend({ var color = new cc.LayerColor(cc.color(64, 64, 64, 255)); this.addChild(color, -1); - var map = new cc.TMXTiledMap(s_resprefix + "TileMaps/hexa-test.tmx"); + var map = new cc.TMXTiledMap("res/TileMaps/hexa-test.tmx"); this.addChild(map, 0, TAG_TILE_MAP); }, title:function () { @@ -526,7 +526,7 @@ var TMXIsoTest = TileDemo.extend({ var color = new cc.LayerColor(cc.color(64, 64, 64, 255)); this.addChild(color, -1); - var map = new cc.TMXTiledMap(s_resprefix + "TileMaps/iso-test.tmx"); + var map = new cc.TMXTiledMap("res/TileMaps/iso-test.tmx"); this.addChild(map, 0, TAG_TILE_MAP); // move map to the center of the screen @@ -570,7 +570,7 @@ var TMXIsoTest1 = TileDemo.extend({ var color = new cc.LayerColor(cc.color(64, 64, 64, 255)); this.addChild(color, -1); - var map = new cc.TMXTiledMap(s_resprefix + "TileMaps/iso-test1.tmx"); + var map = new cc.TMXTiledMap("res/TileMaps/iso-test1.tmx"); this.addChild(map, 0, TAG_TILE_MAP); map.anchorX = 0.5; @@ -612,7 +612,7 @@ var TMXIsoTest2 = TileDemo.extend({ var color = new cc.LayerColor(cc.color(64, 64, 64, 255)); this.addChild(color, -1); - var map = new cc.TMXTiledMap(s_resprefix + "TileMaps/iso-test2.tmx"); + var map = new cc.TMXTiledMap("res/TileMaps/iso-test2.tmx"); this.addChild(map, 0, TAG_TILE_MAP); // move map to the center of the screen @@ -657,7 +657,7 @@ var TMXUncompressedTest = TileDemo.extend({ var color = new cc.LayerColor(cc.color(64, 64, 64, 255)); this.addChild(color, -1); - var map = new cc.TMXTiledMap(s_resprefix + "TileMaps/iso-test2-uncompressed.tmx"); + var map = new cc.TMXTiledMap("res/TileMaps/iso-test2-uncompressed.tmx"); this.addChild(map, 0, TAG_TILE_MAP); // move map to the center of the screen @@ -710,7 +710,7 @@ var TMXUncompressedTest = TileDemo.extend({ var TMXTilesetTest = TileDemo.extend({ ctor:function () { this._super(); - var map = new cc.TMXTiledMap(s_resprefix + "TileMaps/orthogonal-test5.tmx"); + var map = new cc.TMXTiledMap("res/TileMaps/orthogonal-test5.tmx"); this.addChild(map, 0, TAG_TILE_MAP); if ("opengl" in cc.sys.capabilities) { @@ -760,7 +760,7 @@ var TMXOrthoObjectsTest = TileDemo.extend({ drawNode.setLineWidth(3); drawNode.setDrawColor(cc.color(255,255,255,255)); - var map = new cc.TMXTiledMap(s_resprefix + "TileMaps/ortho-objects.tmx"); + var map = new cc.TMXTiledMap("res/TileMaps/ortho-objects.tmx"); this.addChild(map, 0, TAG_TILE_MAP); var group = map.getObjectGroup("Object Group 1"); @@ -835,7 +835,7 @@ var TMXIsoObjectsTest = TileDemo.extend({ drawNode.setDrawColor(cc.color(255,255,255,255)); this.addChild(drawNode); - var map = new cc.TMXTiledMap(s_resprefix + "TileMaps/iso-test-objectgroup.tmx"); + var map = new cc.TMXTiledMap("res/TileMaps/iso-test-objectgroup.tmx"); this.addChild(map, 0, TAG_TILE_MAP); var group = map.getObjectGroup("Object Group 1"); @@ -906,7 +906,7 @@ var TMXIsoObjectsTest = TileDemo.extend({ var TMXResizeTest = TileDemo.extend({ ctor:function () { this._super(); - var map = new cc.TMXTiledMap(s_resprefix + "TileMaps/orthogonal-test5.tmx"); + var map = new cc.TMXTiledMap("res/TileMaps/orthogonal-test5.tmx"); this.addChild(map, 0, TAG_TILE_MAP); var layer; @@ -950,7 +950,7 @@ var TMXIsoZorder = TileDemo.extend({ tamara:null, ctor:function () { this._super(); - var map = new cc.TMXTiledMap(s_resprefix + "TileMaps/iso-test-zorder.tmx"); + var map = new cc.TMXTiledMap("res/TileMaps/iso-test-zorder.tmx"); this.addChild(map, 0, TAG_TILE_MAP); map.x = -map.width / 2; @@ -1019,7 +1019,7 @@ var TMXOrthoZorder = TileDemo.extend({ tamara:null, ctor:function () { this._super(); - var map = new cc.TMXTiledMap(s_resprefix + "TileMaps/orthogonal-test-zorder.tmx"); + var map = new cc.TMXTiledMap("res/TileMaps/orthogonal-test-zorder.tmx"); this.addChild(map, 0, TAG_TILE_MAP); this.tamara = new _ccsg.Sprite(s_pathSister1); @@ -1082,7 +1082,7 @@ var TMXIsoVertexZ = TMXFixBugLayer.extend({ tamara:null, ctor:function () { this._super(); - var map = new cc.TMXTiledMap(s_resprefix + "TileMaps/iso-test-vertexz.tmx"); + var map = new cc.TMXTiledMap("res/TileMaps/iso-test-vertexz.tmx"); this.addChild(map, 0, TAG_TILE_MAP); map.x = -map.width / 2; @@ -1157,7 +1157,7 @@ var TMXOrthoVertexZ = TMXFixBugLayer.extend({ tamara:null, ctor:function () { this._super(); - var map = new cc.TMXTiledMap(s_resprefix + "TileMaps/orthogonal-test-vertexz.tmx"); + var map = new cc.TMXTiledMap("res/TileMaps/orthogonal-test-vertexz.tmx"); this.addChild(map, 0, TAG_TILE_MAP); // because I'm lazy, I'm reusing a tile as an sprite, but since this method uses vertexZ, you @@ -1231,7 +1231,7 @@ var TMXOrthoVertexZ = TMXFixBugLayer.extend({ var TMXIsoMoveLayer = TileDemo.extend({ ctor:function () { this._super(); - var map = new cc.TMXTiledMap(s_resprefix + "TileMaps/iso-test-movelayer.tmx"); + var map = new cc.TMXTiledMap("res/TileMaps/iso-test-movelayer.tmx"); this.addChild(map, 0, TAG_TILE_MAP); map.x = -700; map.y = -50; @@ -1252,7 +1252,7 @@ var TMXIsoMoveLayer = TileDemo.extend({ var TMXOrthoMoveLayer = TileDemo.extend({ ctor:function () { this._super(); - var map = new cc.TMXTiledMap(s_resprefix + "TileMaps/orthogonal-test-movelayer.tmx"); + var map = new cc.TMXTiledMap("res/TileMaps/orthogonal-test-movelayer.tmx"); this.addChild(map, 0, TAG_TILE_MAP); }, title:function () { @@ -1271,7 +1271,7 @@ var TMXOrthoMoveLayer = TileDemo.extend({ var TMXTilePropertyTest = TileDemo.extend({ ctor:function () { this._super(); - var map = new cc.TMXTiledMap(s_resprefix + "TileMaps/ortho-tile-property.tmx"); + var map = new cc.TMXTiledMap("res/TileMaps/ortho-tile-property.tmx"); this.addChild(map, 0, TAG_TILE_MAP); for (var i = 1; i <= 6; i++) { @@ -1314,7 +1314,7 @@ var TMXTilePropertyTest = TileDemo.extend({ var TMXOrthoFlipTest = TileDemo.extend({ ctor:function () { this._super(); - var map = new cc.TMXTiledMap(s_resprefix + "TileMaps/ortho-rotation-test.tmx"); + var map = new cc.TMXTiledMap("res/TileMaps/ortho-rotation-test.tmx"); this.addChild(map, 0, TAG_TILE_MAP); this.log("ContentSize:" + map.width + "," + map.height); @@ -1350,7 +1350,7 @@ var TMXOrthoFlipTest = TileDemo.extend({ var TMXOrthoFlipRunTimeTest = TileDemo.extend({ ctor:function () { this._super(); - var map = new cc.TMXTiledMap(s_resprefix + "TileMaps/ortho-rotation-test.tmx"); + var map = new cc.TMXTiledMap("res/TileMaps/ortho-rotation-test.tmx"); this.addChild(map, 0, TAG_TILE_MAP); this.log("ContentSize:" + map.width + "," + map.height); @@ -1435,8 +1435,8 @@ var TMXOrthoFromXMLTest = TileDemo.extend({ ctor:function () { this._super(); - var resources = s_resprefix + "TileMaps"; - var filePath = s_resprefix + "TileMaps/orthogonal-test1.tmx"; + var resources = "res/TileMaps"; + var filePath = "res/TileMaps/orthogonal-test1.tmx"; var xmlStr = cc.loader.getRes(filePath); var map = new cc.TMXTiledMap(xmlStr, resources); this.addChild(map, 0, TAG_TILE_MAP); @@ -1485,7 +1485,7 @@ var TMXOrthoFromXMLTest = TileDemo.extend({ var TMXBug987 = TileDemo.extend({ ctor:function () { this._super(); - var map = new cc.TMXTiledMap(s_resprefix + "TileMaps/orthogonal-test6.tmx"); + var map = new cc.TMXTiledMap("res/TileMaps/orthogonal-test6.tmx"); this.addChild(map, 0, TAG_TILE_MAP); this.log("ContentSize:" + map.width + "," + map.height); @@ -1540,7 +1540,7 @@ var TMXBug987 = TileDemo.extend({ var TMXBug787 = TileDemo.extend({ ctor:function () { this._super(); - var map = new cc.TMXTiledMap(s_resprefix + "TileMaps/iso-test-bug787.tmx"); + var map = new cc.TMXTiledMap("res/TileMaps/iso-test-bug787.tmx"); this.addChild(map, 0, TAG_TILE_MAP); map.scale = 0.25; @@ -1576,7 +1576,7 @@ var TMXGIDObjectsTest = TileDemo.extend({ drawNode.setDrawColor(cc.color(255,255,255,255)); this.addChild(drawNode); - var map = new cc.TMXTiledMap(s_resprefix + "TileMaps/test-object-layer.tmx"); + var map = new cc.TMXTiledMap("res/TileMaps/test-object-layer.tmx"); this.addChild(map, 0, TAG_TILE_MAP); this.log("ContentSize:" + map.width + "," + map.height); @@ -1639,7 +1639,7 @@ var TMXGIDObjectsTest = TileDemo.extend({ var TMXIsoOffsetTest = TileDemo.extend({ ctor:function () { this._super(); - var map = new cc.TMXTiledMap(s_resprefix + "TileMaps/tile_iso_offset.tmx"); + var map = new cc.TMXTiledMap("res/TileMaps/tile_iso_offset.tmx"); this.addChild(map, 0, TAG_TILE_MAP); }, diff --git a/test/visual-tests/src/tests-main.js b/test/visual-tests/src/tests-main.js index da5026e1ca..8de946bcb1 100644 --- a/test/visual-tests/src/tests-main.js +++ b/test/visual-tests/src/tests-main.js @@ -333,14 +333,6 @@ var testNames = [ return new LayerTestScene(); } }, - { - title:"Loader Test", - platforms: PLATFORM_ALL, - linksrc:"src/LoaderTest/LoaderTest.js", - testScene:function () { - return new LoaderTestScene(); - } - }, { title:"Node Test", platforms: PLATFORM_ALL, diff --git a/test/visual-tests/src/tests_resources.js b/test/visual-tests/src/tests_resources.js index 43adc2a1c1..3999ef644e 100644 --- a/test/visual-tests/src/tests_resources.js +++ b/test/visual-tests/src/tests_resources.js @@ -1,225 +1,209 @@ -// Resources prefix -var s_resprefix = ""; -var ccbjs = ""; -// js-test use cpptest resource in debug mode , and in the release mode, console will copy the resource into the res dir -// so the respath will modify to res, -if (!cc.sys.isNative) -{ - cc.game._loadConfig(); - if (cc.game.config[cc.game.CONFIG_KEY.engineDir] !== "frameworks/cocos2d-html5") { - ccbjs = "../../js-tests/resjs/"; - } - else - { - ccbjs = ""; - } +var res = "res/"; -} - -var s_pathGrossini = "Images/grossini.png"; -var s_pathSister1 = "Images/grossinis_sister1.png"; -var s_pathSister2 = "Images/grossinis_sister2.png"; -var s_pathB1 = "Images/b1.png"; -var s_pathB2 = "Images/b2.png"; -var s_pathR1 = "Images/r1.png"; -var s_pathR2 = "Images/r2.png"; -var s_pathF1 = "Images/f1.png"; -var s_pathF2 = "Images/f2.png"; -var s_pathBlock = "Images/blocks.png"; -var s_back = "Images/background.png"; +var s_pathGrossini = "res/Images/grossini.png"; +var s_pathSister1 = "res/Images/grossinis_sister1.png"; +var s_pathSister2 = "res/Images/grossinis_sister2.png"; +var s_pathB1 = "res/Images/b1.png"; +var s_pathB2 = "res/Images/b2.png"; +var s_pathR1 = "res/Images/r1.png"; +var s_pathR2 = "res/Images/r2.png"; +var s_pathF1 = "res/Images/f1.png"; +var s_pathF2 = "res/Images/f2.png"; +var s_pathBlock = "res/Images/blocks.png"; +var s_back = "res/Images/background.png"; var s_back1 = "res/Images/background1.png"; var s_back2 = "res/Images/background2.png"; -var s_back3 = "Images/background3.png"; -var s_stars1 = "Images/stars.png"; -var s_stars2 = "Images/stars2.png"; -var s_fire = "Images/fire.png"; -var s_snow = "Images/snow.png"; -var s_streak = "Images/streak.png"; -var s_playNormal = "Images/btn-play-normal.png"; -var s_playSelect = "Images/btn-play-selected.png"; -var s_aboutNormal = "Images/btn-about-normal.png"; -var s_aboutSelect = "Images/btn-about-selected.png"; -var s_highNormal = "Images/btn-highscores-normal.png"; -var s_highSelect = "Images/btn-highscores-selected.png"; -var s_ball = "Images/ball.png"; -var s_paddle = "Images/paddle.png"; -var s_pathClose = "Images/close.png"; -var s_menuItem = "Images/menuitemsprite.png"; -var s_shapeModeMenuItem = "Images/shapemode.png"; -var s_textureModeMenuItem = "Images/texturemode.png"; -var s_MovementMenuItem = "Images/movement.png"; -var s_sendScore = "Images/SendScoreButton.png"; -var s_pressSendScore = "Images/SendScoreButtonPressed.png"; -var s_power = "Images/powered.png"; -var s_atlasTest = "Images/atlastest.png"; -var s_stars2Grayscale = "Images/stars2-grayscale.png"; -var s_starsGrayscale = "Images/stars-grayscale.png"; -var s_grossini_dance_atlas = "Images/grossini_dance_atlas.png"; -var s_piece = "Images/piece.png"; -var s_grossini_dance_atlas_mono = "Images/grossini_dance_atlas-mono.png"; -var s_lookup_desktop_plist = "Images/lookup-desktop.plist"; -var s_lookup_mobile_plist = "Images/lookup-mobile.plist"; -var s_lookup_html5_plist = "Images/lookup-html5.plist"; +var s_back3 = "res/Images/background3.png"; +var s_stars1 = "res/Images/stars.png"; +var s_stars2 = "res/Images/stars2.png"; +var s_fire = "res/Images/fire.png"; +var s_snow = "res/Images/snow.png"; +var s_streak = "res/Images/streak.png"; +var s_playNormal = "res/Images/btn-play-normal.png"; +var s_playSelect = "res/Images/btn-play-selected.png"; +var s_aboutNormal = "res/Images/btn-about-normal.png"; +var s_aboutSelect = "res/Images/btn-about-selected.png"; +var s_highNormal = "res/Images/btn-highscores-normal.png"; +var s_highSelect = "res/Images/btn-highscores-selected.png"; +var s_ball = "res/Images/ball.png"; +var s_paddle = "res/Images/paddle.png"; +var s_pathClose = "res/Images/close.png"; +var s_menuItem = "res/Images/menuitemsprite.png"; +var s_shapeModeMenuItem = "res/Images/shapemode.png"; +var s_textureModeMenuItem = "res/Images/texturemode.png"; +var s_MovementMenuItem = "res/Images/movement.png"; +var s_sendScore = "res/Images/SendScoreButton.png"; +var s_pressSendScore = "res/Images/SendScoreButtonPressed.png"; +var s_power = "res/Images/powered.png"; +var s_atlasTest = "res/Images/atlastest.png"; +var s_stars2Grayscale = "res/Images/stars2-grayscale.png"; +var s_starsGrayscale = "res/Images/stars-grayscale.png"; +var s_grossini_dance_atlas = "res/Images/grossini_dance_atlas.png"; +var s_piece = "res/Images/piece.png"; +var s_grossini_dance_atlas_mono = "res/Images/grossini_dance_atlas-mono.png"; +var s_lookup_desktop_plist = "res/Images/lookup-desktop.plist"; +var s_lookup_mobile_plist = "res/Images/lookup-mobile.plist"; +var s_lookup_html5_plist = "res/Images/lookup-html5.plist"; -var s_grossini = "animations/grossini.png"; -var s_grossini_gray = "animations/grossini_gray.png"; -var s_grossini_blue = "animations/grossini_blue.png"; -var s_grossini_aliases = "animations/grossini-aliases.png"; -var s_dragon_animation = "animations/dragon_animation.png"; -var s_ghosts = "animations/ghosts.png"; -var s_grossini_family = "animations/grossini_family.png"; +var s_grossini = "res/animations/grossini.png"; +var s_grossini_gray = "res/animations/grossini_gray.png"; +var s_grossini_blue = "res/animations/grossini_blue.png"; +var s_grossini_aliases = "res/animations/grossini-aliases.png"; +var s_dragon_animation = "res/animations/dragon_animation.png"; +var s_ghosts = "res/animations/ghosts.png"; +var s_grossini_family = "res/animations/grossini_family.png"; -var s_tcc_issue_1 = "animations/tcc_issue_1.png"; -var s_tcc_issue_2 = "animations/tcc_issue_2.png"; -var s_tcc_issue_1_plist = "animations/tcc_issue_1.plist"; -var s_tcc_issue_2_plist = "animations/tcc_issue_2.plist"; +var s_tcc_issue_1 = "res/animations/tcc_issue_1.png"; +var s_tcc_issue_2 = "res/animations/tcc_issue_2.png"; +var s_tcc_issue_1_plist = "res/animations/tcc_issue_1.plist"; +var s_tcc_issue_2_plist = "res/animations/tcc_issue_2.plist"; -var s_Cowboy_json = "ccs-res/armature/Cowboy.ExportJson"; -var s_Cowboy_plist = "ccs-res/armature/Cowboy0.plist"; -var s_Cowboy_png = "ccs-res/armature/Cowboy0.png"; -var s_hero_json = "ccs-res/armature/hero.ExportJson"; -var s_hero0_plist = "ccs-res/armature/hero0.plist"; -var s_hero0_png = "ccs-res/armature/hero0.png"; -var s_horse_json = "ccs-res/armature/horse.ExportJson"; -var s_horse0_plist = "ccs-res/armature/horse0.plist"; -var s_horse0_png = "ccs-res/armature/horse0.png"; -var s_bear_json = "ccs-res/armature/bear.ExportJson"; -var s_bear0_plist = "ccs-res/armature/bear0.plist"; -var s_bear0_png = "ccs-res/armature/bear0.png"; -var s_blood_plist = "ccs-res/armature/blood.plist"; -var s_HeroAnimation_json = "ccs-res/armature/HeroAnimation.ExportJson"; -var s_HeroAnimation0_plist = "ccs-res/armature/HeroAnimation0.plist"; -var s_HeroAnimation0_png = "ccs-res/armature/HeroAnimation0.png"; -var s_cyborg_plist = "ccs-res/armature/cyborg.plist"; -var s_cyborg_png = "ccs-res/armature/cyborg.png"; -var s_cyborg_xml = "ccs-res/armature/cyborg.xml"; -var s_Dragon_plist = "ccs-res/armature/Dragon.plist"; -var s_Dragon_png = "ccs-res/armature/Dragon.png"; -var s_Dragon_xml = "ccs-res/armature/Dragon.xml"; -var s_knight_plist = "ccs-res/armature/knight.plist"; -var s_knight_png = "ccs-res/armature/knight.png"; -var s_knight_xml = "ccs-res/armature/knight.xml"; -var s_robot_plist = "ccs-res/armature/robot.plist"; -var s_robot_png = "ccs-res/armature/robot.png"; -var s_robot_xml = "ccs-res/armature/robot.xml"; -var s_weapon_plist = "ccs-res/armature/weapon.plist"; -var s_weapon_png = "ccs-res/armature/weapon.png"; -var s_weapon_xml = "ccs-res/armature/weapon.xml"; -var s_testEasing_json = "ccs-res/armature/testEasing.ExportJson"; -var s_testEasing0_plist = "ccs-res/armature/testEasing0.plist"; -var s_testEasing0_png = "ccs-res/armature/testEasing0.png"; +var s_Cowboy_json = "res/ccs-res/armature/Cowboy.ExportJson"; +var s_Cowboy_plist = "res/ccs-res/armature/Cowboy0.plist"; +var s_Cowboy_png = "res/ccs-res/armature/Cowboy0.png"; +var s_hero_json = "res/ccs-res/armature/hero.ExportJson"; +var s_hero0_plist = "res/ccs-res/armature/hero0.plist"; +var s_hero0_png = "res/ccs-res/armature/hero0.png"; +var s_horse_json = "res/ccs-res/armature/horse.ExportJson"; +var s_horse0_plist = "res/ccs-res/armature/horse0.plist"; +var s_horse0_png = "res/ccs-res/armature/horse0.png"; +var s_bear_json = "res/ccs-res/armature/bear.ExportJson"; +var s_bear0_plist = "res/ccs-res/armature/bear0.plist"; +var s_bear0_png = "res/ccs-res/armature/bear0.png"; +var s_blood_plist = "res/ccs-res/armature/blood.plist"; +var s_HeroAnimation_json = "res/ccs-res/armature/HeroAnimation.ExportJson"; +var s_HeroAnimation0_plist = "res/ccs-res/armature/HeroAnimation0.plist"; +var s_HeroAnimation0_png = "res/ccs-res/armature/HeroAnimation0.png"; +var s_cyborg_plist = "res/ccs-res/armature/cyborg.plist"; +var s_cyborg_png = "res/ccs-res/armature/cyborg.png"; +var s_cyborg_xml = "res/ccs-res/armature/cyborg.xml"; +var s_Dragon_plist = "res/ccs-res/armature/Dragon.plist"; +var s_Dragon_png = "res/ccs-res/armature/Dragon.png"; +var s_Dragon_xml = "res/ccs-res/armature/Dragon.xml"; +var s_knight_plist = "res/ccs-res/armature/knight.plist"; +var s_knight_png = "res/ccs-res/armature/knight.png"; +var s_knight_xml = "res/ccs-res/armature/knight.xml"; +var s_robot_plist = "res/ccs-res/armature/robot.plist"; +var s_robot_png = "res/ccs-res/armature/robot.png"; +var s_robot_xml = "res/ccs-res/armature/robot.xml"; +var s_weapon_plist = "res/ccs-res/armature/weapon.plist"; +var s_weapon_png = "res/ccs-res/armature/weapon.png"; +var s_weapon_xml = "res/ccs-res/armature/weapon.xml"; +var s_testEasing_json = "res/ccs-res/armature/testEasing.ExportJson"; +var s_testEasing0_plist = "res/ccs-res/armature/testEasing0.plist"; +var s_testEasing0_png = "res/ccs-res/armature/testEasing0.png"; -var s_s9s_blocks9 = "Images/blocks9ss.png"; -var s_s9s_blocks9_plist = "Images/blocks9ss.plist"; +var s_s9s_blocks9 = "res/Images/blocks9ss.png"; +var s_s9s_blocks9_plist = "res/Images/blocks9ss.plist"; var s_blocks9 = "res/Images/blocks9.png"; -var s_s9s_ui = "Images/ui.png"; -var s_s9s_ui_plist = "Images/ui.plist"; +var s_s9s_ui = "res/Images/ui.png"; +var s_s9s_ui_plist = "res/Images/ui.plist"; -var s_boilingFoamPlist = "Images/BoilingFoam.plist"; -var s_grossiniPlist = "animations/grossini.plist"; -var s_grossini_grayPlist = "animations/grossini_gray.plist"; -var s_grossini_bluePlist = "animations/grossini_blue.plist"; -var s_grossini_aliasesPlist = "animations/grossini-aliases.plist"; -var s_ghostsPlist = "animations/ghosts.plist"; -var s_grossini_familyPlist = "animations/grossini_family.plist"; -var s_animations2Plist = "animations/animations-2.plist"; -var s_animationsPlist = "animations/animations.plist"; +var s_boilingFoamPlist = "res/Images/BoilingFoam.plist"; +var s_grossiniPlist = "res/animations/grossini.plist"; +var s_grossini_grayPlist = "res/animations/grossini_gray.plist"; +var s_grossini_bluePlist = "res/animations/grossini_blue.plist"; +var s_grossini_aliasesPlist = "res/animations/grossini-aliases.plist"; +var s_ghostsPlist = "res/animations/ghosts.plist"; +var s_grossini_familyPlist = "res/animations/grossini_family.plist"; +var s_animations2Plist = "res/animations/animations-2.plist"; +var s_animationsPlist = "res/animations/animations.plist"; -var s_helloWorld = "Images/HelloWorld.png"; -var s_grossiniDance01 = "Images/grossini_dance_01.png"; -var s_grossiniDance02 = "Images/grossini_dance_02.png"; -var s_grossiniDance03 = "Images/grossini_dance_03.png"; -var s_grossiniDance04 = "Images/grossini_dance_04.png"; -var s_grossiniDance05 = "Images/grossini_dance_05.png"; -var s_grossiniDance06 = "Images/grossini_dance_06.png"; -var s_grossiniDance07 = "Images/grossini_dance_07.png"; -var s_grossiniDance08 = "Images/grossini_dance_08.png"; -var s_grossiniDance09 = "Images/grossini_dance_09.png"; -var s_grossiniDance10 = "Images/grossini_dance_10.png"; -var s_grossiniDance11 = "Images/grossini_dance_11.png"; -var s_grossiniDance12 = "Images/grossini_dance_12.png"; -var s_grossiniDance13 = "Images/grossini_dance_13.png"; -var s_grossiniDance14 = "Images/grossini_dance_14.png"; +var s_helloWorld = "res/Images/HelloWorld.png"; +var s_grossiniDance01 = "res/Images/grossini_dance_01.png"; +var s_grossiniDance02 = "res/Images/grossini_dance_02.png"; +var s_grossiniDance03 = "res/Images/grossini_dance_03.png"; +var s_grossiniDance04 = "res/Images/grossini_dance_04.png"; +var s_grossiniDance05 = "res/Images/grossini_dance_05.png"; +var s_grossiniDance06 = "res/Images/grossini_dance_06.png"; +var s_grossiniDance07 = "res/Images/grossini_dance_07.png"; +var s_grossiniDance08 = "res/Images/grossini_dance_08.png"; +var s_grossiniDance09 = "res/Images/grossini_dance_09.png"; +var s_grossiniDance10 = "res/Images/grossini_dance_10.png"; +var s_grossiniDance11 = "res/Images/grossini_dance_11.png"; +var s_grossiniDance12 = "res/Images/grossini_dance_12.png"; +var s_grossiniDance13 = "res/Images/grossini_dance_13.png"; +var s_grossiniDance14 = "res/Images/grossini_dance_14.png"; -var s_arrows = "Images/arrows.png"; -var s_arrowsBar = "Images/arrowsBar.png"; -var s_arrows_hd = "Images/arrows-hd.png"; -var s_arrowsBar_hd = "Images/arrowsBar-hd.png"; +var s_arrows = "res/Images/arrows.png"; +var s_arrowsBar = "res/Images/arrowsBar.png"; +var s_arrows_hd = "res/Images/arrows-hd.png"; +var s_arrowsBar_hd = "res/Images/arrowsBar-hd.png"; // tilemaps resource -var s_tilesPng = "TileMaps/tiles.png"; -var s_levelMapTga = "TileMaps/levelmap.tga"; -var s_fixedOrthoTest2Png = "TileMaps/fixed-ortho-test2.png"; -var s_hexaTilesPng = "TileMaps/hexa-tiles.png"; -var s_isoTestPng = "TileMaps/iso-test.png"; -var s_isoTest2Png = "TileMaps/iso-test2.png"; -var s_isoPng = "TileMaps/iso.png"; -var s_orthoTest1BwPng = "TileMaps/ortho-test1_bw.png"; -var s_orthoTest1Png = "TileMaps/ortho-test1.png"; -var s_tilesHdPng = "TileMaps/tiles-hd.png"; -var s_tmwDesertSpacingHdPng = "TileMaps/tmw_desert_spacing-hd.png"; -var s_tmwDesertSpacingPng = "TileMaps/tmw_desert_spacing.png"; -var s_tileISOOffsetPng = "TileMaps/tile_iso_offset.png"; -var s_tileISOOffsetTmx = "TileMaps/tile_iso_offset.tmx"; +var s_tilesPng = "res/TileMaps/tiles.png"; +var s_levelMapTga = "res/TileMaps/levelmap.tga"; +var s_fixedOrthoTest2Png = "res/TileMaps/fixed-ortho-test2.png"; +var s_hexaTilesPng = "res/TileMaps/hexa-tiles.png"; +var s_isoTestPng = "res/TileMaps/iso-test.png"; +var s_isoTest2Png = "res/TileMaps/iso-test2.png"; +var s_isoPng = "res/TileMaps/iso.png"; +var s_orthoTest1BwPng = "res/TileMaps/ortho-test1_bw.png"; +var s_orthoTest1Png = "res/TileMaps/ortho-test1.png"; +var s_tilesHdPng = "res/TileMaps/tiles-hd.png"; +var s_tmwDesertSpacingHdPng = "res/TileMaps/tmw_desert_spacing-hd.png"; +var s_tmwDesertSpacingPng = "res/TileMaps/tmw_desert_spacing.png"; +var s_tileISOOffsetPng = "res/TileMaps/tile_iso_offset.png"; +var s_tileISOOffsetTmx = "res/TileMaps/tile_iso_offset.tmx"; -var s_fnTuffyBoldItalicCharmapPng = "fonts/tuffy_bold_italic-charmap.png"; -var s_fpsImages = "fps_images.png"; -var s_bitmapFontTest = "fonts/bitmapFontTest.png"; -var s_bitmapFontTest2 = "fonts/bitmapFontTest2.png"; -var s_bitmapFontTest3 = "fonts/bitmapFontTest3.png"; -var s_bitmapFontTest4 = "fonts/bitmapFontTest4.png"; -var s_bitmapFontTest5 = "fonts/bitmapFontTest5.png"; -var s_konqa32 = "fonts/konqa32.png"; -var s_konqa32_hd = "fonts/konqa32-hd.png"; -var s_bitmapFontChinese = "fonts/bitmapFontChinese.png"; -var s_arial16 = "fonts/arial16.png"; -var s_larabie_16 = "fonts/larabie-16.png"; -var s_larabie_16_hd = "fonts/larabie-16-hd.png"; -var s_futura48 = "fonts/futura-48.png"; -var s_arial_unicode_26 = "fonts/arial-unicode-26.png"; +var s_fnTuffyBoldItalicCharmapPng = "res/fonts/tuffy_bold_italic-charmap.png"; +var s_fpsImages = "res/fps_images.png"; +var s_bitmapFontTest = "res/fonts/bitmapFontTest.png"; +var s_bitmapFontTest2 = "res/fonts/bitmapFontTest2.png"; +var s_bitmapFontTest3 = "res/fonts/bitmapFontTest3.png"; +var s_bitmapFontTest4 = "res/fonts/bitmapFontTest4.png"; +var s_bitmapFontTest5 = "res/fonts/bitmapFontTest5.png"; +var s_konqa32 = "res/fonts/konqa32.png"; +var s_konqa32_hd = "res/fonts/konqa32-hd.png"; +var s_bitmapFontChinese = "res/fonts/bitmapFontChinese.png"; +var s_arial16 = "res/fonts/arial16.png"; +var s_larabie_16 = "res/fonts/larabie-16.png"; +var s_larabie_16_hd = "res/fonts/larabie-16-hd.png"; +var s_futura48 = "res/fonts/futura-48.png"; +var s_arial_unicode_26 = "res/fonts/arial-unicode-26.png"; -var s_bitmapFontTest_fnt = "fonts/bitmapFontTest.fnt"; -var s_bitmapFontTest2_fnt = "fonts/bitmapFontTest2.fnt"; -var s_bitmapFontTest3_fnt = "fonts/bitmapFontTest3.fnt"; -var s_bitmapFontTest4_fnt = "fonts/bitmapFontTest4.fnt"; -var s_bitmapFontTest5_fnt = "fonts/bitmapFontTest5.fnt"; -var s_konqa32_fnt = "fonts/konqa32.fnt"; -var s_konqa32_hd_fnt = "fonts/konqa32-hd.fnt"; -var s_bitmapFontChinese_fnt = "fonts/bitmapFontChinese.fnt"; -var s_arial16_fnt = "fonts/arial16.fnt"; -var s_futura48_fnt = "fonts/futura-48.fnt"; -var s_helvetica32_fnt = "fonts/helvetica-32.fnt"; -var s_geneva32_fnt = "fonts/geneva-32.fnt"; -var s_helvetica_helvetica_32_png = "fonts/helvetica-geneva-32.png"; -var s_arial_unicode_26_fnt = "fonts/arial-unicode-26.fnt"; -var s_markerFelt_fnt = "fonts/markerFelt.fnt"; -var s_markerFelt_png = "fonts/markerFelt.png"; -var s_markerFelt_hd_fnt = "fonts/markerFelt-hd.fnt"; -var s_markerFelt_hd_png = "fonts/markerFelt-hd.png"; +var s_bitmapFontTest_fnt = "res/fonts/bitmapFontTest.fnt"; +var s_bitmapFontTest2_fnt = "res/fonts/bitmapFontTest2.fnt"; +var s_bitmapFontTest3_fnt = "res/fonts/bitmapFontTest3.fnt"; +var s_bitmapFontTest4_fnt = "res/fonts/bitmapFontTest4.fnt"; +var s_bitmapFontTest5_fnt = "res/fonts/bitmapFontTest5.fnt"; +var s_konqa32_fnt = "res/fonts/konqa32.fnt"; +var s_konqa32_hd_fnt = "res/fonts/konqa32-hd.fnt"; +var s_bitmapFontChinese_fnt = "res/fonts/bitmapFontChinese.fnt"; +var s_arial16_fnt = "res/fonts/arial16.fnt"; +var s_futura48_fnt = "res/fonts/futura-48.fnt"; +var s_helvetica32_fnt = "res/fonts/helvetica-32.fnt"; +var s_geneva32_fnt = "res/fonts/geneva-32.fnt"; +var s_helvetica_helvetica_32_png = "res/fonts/helvetica-geneva-32.png"; +var s_arial_unicode_26_fnt = "res/fonts/arial-unicode-26.fnt"; +var s_markerFelt_fnt = "res/fonts/markerFelt.fnt"; +var s_markerFelt_png = "res/fonts/markerFelt.png"; +var s_markerFelt_hd_fnt = "res/fonts/markerFelt-hd.fnt"; +var s_markerFelt_hd_png = "res/fonts/markerFelt-hd.png"; -var s_larabie_16_plist = "fonts/larabie-16.plist"; -var s_larabie_16_hd_plist = "fonts/larabie-16-hd.plist"; -var s_tuffy_bold_italic_charmap = "fonts/tuffy_bold_italic-charmap.plist"; -var s_tuffy_bold_italic_charmap_hd = "fonts/tuffy_bold_italic-charmap-hd.plist"; +var s_larabie_16_plist = "res/fonts/larabie-16.plist"; +var s_larabie_16_hd_plist = "res/fonts/larabie-16-hd.plist"; +var s_tuffy_bold_italic_charmap = "res/fonts/tuffy_bold_italic-charmap.plist"; +var s_tuffy_bold_italic_charmap_hd = "res/fonts/tuffy_bold_italic-charmap-hd.plist"; -var s_particles = "Images/particles.png"; -var s_particles_hd = "Images/particles-hd.png"; -var s_texture512 = "Images/texture512x512.png"; -var s_hole_effect_png = "Images/hole_effect.png"; -var s_hole_stencil_png = "Images/hole_stencil.png"; -var s_pathFog = "Images/Fog.png"; -var s_circle_plist = "Images/bugs/circle.plist"; -var s_circle_png = "Images/bugs/circle.png"; +var s_particles = "res/Images/particles.png"; +var s_particles_hd = "res/Images/particles-hd.png"; +var s_texture512 = "res/Images/texture512x512.png"; +var s_hole_effect_png = "res/Images/hole_effect.png"; +var s_hole_stencil_png = "res/Images/hole_stencil.png"; +var s_pathFog = "res/Images/Fog.png"; +var s_circle_plist = "res/Images/bugs/circle.plist"; +var s_circle_png = "res/Images/bugs/circle.png"; -var s_extensions_background = "extensions/background.png"; -var s_extensions_buttonBackground = "extensions/buttonBackground.png"; -var s_extensions_button = "extensions/button.png"; -var s_extensions_buttonHighlighted = "extensions/buttonHighlighted.png"; -var s_extensions_ribbon = "extensions/ribbon.png"; -var s_image_icon = "Images/Icon.png"; -var s_html5_logo = "Images/cocos-html5.png"; +var s_extensions_background = "res/extensions/background.png"; +var s_extensions_buttonBackground = "res/extensions/buttonBackground.png"; +var s_extensions_button = "res/extensions/button.png"; +var s_extensions_buttonHighlighted = "res/extensions/buttonHighlighted.png"; +var s_extensions_ribbon = "res/extensions/ribbon.png"; +var s_image_icon = "res/Images/Icon.png"; +var s_html5_logo = "res/Images/cocos-html5.png"; var g_resources = [ //global @@ -272,7 +256,9 @@ var g_resources = [ s_playSelect, s_bitmapFontTest5_fnt, s_extensions_background, - s_extensions_ribbon + s_extensions_ribbon, + // s_back1, + // s_back2 ]; var g_sprites = [ @@ -299,8 +285,8 @@ var g_sprites = [ s_s9s_blocks9_plist, s_s9s_blocks9, - "Images/dot.png", - "Images/wood.jpg" + "res/Images/dot.png", + "res/Images/wood.jpg" ]; var g_menu = [ @@ -330,28 +316,28 @@ var g_s9s_blocks = [ var g_opengl_resources = [ //preload shader source - ccbjs + "Shaders/example_Outline.fsh", - ccbjs + "Shaders/example_Outline.vsh", - ccbjs + "Shaders/example_Blur.fsh", - ccbjs + "Shaders/example_ColorBars.fsh", - ccbjs + "Shaders/example_ColorBars.vsh", - ccbjs + "Shaders/example_Flower.fsh", - ccbjs + "Shaders/example_Flower.vsh", - ccbjs + "Shaders/example_Heart.fsh", - ccbjs + "Shaders/example_Heart.vsh", - ccbjs + "Shaders/example_Julia.fsh", - ccbjs + "Shaders/example_Julia.vsh", - ccbjs + "Shaders/example_Mandelbrot.fsh", - ccbjs + "Shaders/example_Mandelbrot.vsh", - ccbjs + "Shaders/example_Monjori.fsh", - ccbjs + "Shaders/example_Monjori.vsh", - ccbjs + "Shaders/example_Plasma.fsh", - ccbjs + "Shaders/example_Plasma.vsh", - ccbjs + "Shaders/example_Twist.fsh", - ccbjs + "Shaders/example_Twist.vsh", + res + "Shaders/example_Outline.fsh", + res + "Shaders/example_Outline.vsh", + res + "Shaders/example_Blur.fsh", + res + "Shaders/example_ColorBars.fsh", + res + "Shaders/example_ColorBars.vsh", + res + "Shaders/example_Flower.fsh", + res + "Shaders/example_Flower.vsh", + res + "Shaders/example_Heart.fsh", + res + "Shaders/example_Heart.vsh", + res + "Shaders/example_Julia.fsh", + res + "Shaders/example_Julia.vsh", + res + "Shaders/example_Mandelbrot.fsh", + res + "Shaders/example_Mandelbrot.vsh", + res + "Shaders/example_Monjori.fsh", + res + "Shaders/example_Monjori.vsh", + res + "Shaders/example_Plasma.fsh", + res + "Shaders/example_Plasma.vsh", + res + "Shaders/example_Twist.fsh", + res + "Shaders/example_Twist.vsh", - "fonts/west_england-64.fnt", - "fonts/west_england-64.png" + "res/fonts/west_england-64.fnt", + "res/fonts/west_england-64.png" ]; var g_label = [ @@ -395,7 +381,7 @@ var g_label = [ s_markerFelt_png, s_markerFelt_hd_fnt, s_markerFelt_hd_png, - "fonts/strings.xml" + "res/fonts/strings.xml" ]; var g_transitions = [ @@ -408,24 +394,24 @@ var g_box2d = [ ]; var g_cocosdeshion = [ - "background.mp3", - "effect2.mp3" + "res/background.mp3", + "res/effect2.mp3" //"background.ogg", //one sound only, cc.audio can auto select other format to load if the sound format isn't supported on some browser. //"effect2.ogg" ]; var g_parallax = [ - "TileMaps/orthogonal-test2.tmx", + "res/TileMaps/orthogonal-test2.tmx", s_fixedOrthoTest2Png, s_power, s_back ]; var g_eventDispatcher = [ - "Images/CyanSquare.png", - "Images/MagentaSquare.png", - "Images/YellowSquare.png", - "Images/ball.png", + "res/Images/CyanSquare.png", + "res/Images/MagentaSquare.png", + "res/Images/YellowSquare.png", + "res/Images/ball.png", s_extensions_button, s_extensions_buttonHighlighted, s_extensions_buttonBackground @@ -443,21 +429,21 @@ var g_particle = [ s_snow, s_particles, s_particles_hd, - "Particles/BoilingFoam.plist", - "Particles/BurstPipe.plist", - "Particles/Comet.plist", - "Particles/debian.plist", - "Particles/ExplodingRing.plist", - "Particles/Flower.plist", - "Particles/Galaxy.plist", - "Particles/LavaFlow.plist", - "Particles/Phoenix.plist", - "Particles/SmallSun.plist", - "Particles/SpinningPeas.plist", - "Particles/Spiral.plist", - "Particles/SpookyPeas.plist", - "Particles/TestPremultipliedAlpha.plist", - "Particles/Upsidedown.plist" + "res/Particles/BoilingFoam.plist", + "res/Particles/BurstPipe.plist", + "res/Particles/Comet.plist", + "res/Particles/debian.plist", + "res/Particles/ExplodingRing.plist", + "res/Particles/Flower.plist", + "res/Particles/Galaxy.plist", + "res/Particles/LavaFlow.plist", + "res/Particles/Phoenix.plist", + "res/Particles/SmallSun.plist", + "res/Particles/SpinningPeas.plist", + "res/Particles/Spiral.plist", + "res/Particles/SpookyPeas.plist", + "res/Particles/TestPremultipliedAlpha.plist", + "res/Particles/Upsidedown.plist" ]; var g_fonts = [ @@ -465,22 +451,22 @@ var g_fonts = [ { type:"font", name:"Thonburi", - srcs:["../cpp-tests/Resources/fonts/Thonburi.eot", "../cpp-tests/Resources/fonts/Thonburi.ttf"] + srcs:["res/fonts/Thonburi.eot", "res/fonts/Thonburi.ttf"] }, { type:"font", name:"Schwarzwald Regular", - srcs:["../cpp-tests/Resources/fonts/Schwarzwald_Regular.eot", "../cpp-tests/Resources/fonts/Schwarzwald Regular.ttf"] + srcs:["res/fonts/Schwarzwald_Regular.eot", "res/fonts/Schwarzwald Regular.ttf"] }, { type:"font", name:"ThonburiBold", - srcs:["../cpp-tests/Resources/fonts/ThonburiBold.eot", "../cpp-tests/Resources/fonts/ThonburiBold.ttf"] + srcs:["res/fonts/ThonburiBold.eot", "res/fonts/ThonburiBold.ttf"] }, { type:"font", name:"Courier New", - srcs:["../cpp-tests/Resources/fonts/Courier New.eot", "../cpp-tests/Resources/fonts/Courier New.ttf"] + srcs:["res/fonts/Courier New.eot", "res/fonts/Courier New.ttf"] } ]; @@ -488,490 +474,75 @@ var g_extensions = [ s_image_icon, ]; -var g_cocoStudio = [ - //Armature - s_Cowboy_json , - s_Cowboy_plist, - s_Cowboy_png, - s_hero_json, - s_hero0_plist, - s_hero0_png, - s_horse_json, - s_horse0_plist, - s_horse0_png, - s_bear_json, - s_bear0_plist, - s_bear0_png, - s_blood_plist, - s_HeroAnimation_json, - s_HeroAnimation0_plist, - s_HeroAnimation0_png, - s_cyborg_plist , - s_cyborg_png , - s_cyborg_xml , - s_Dragon_plist , - s_Dragon_png , - s_Dragon_xml , - s_knight_plist , - s_knight_png , - s_knight_xml , - s_robot_plist , - s_robot_png , - s_robot_xml , - s_weapon_plist , - s_weapon_png , - s_weapon_xml , - s_testEasing_json , - s_testEasing0_plist , - s_testEasing0_png , - -//GUI - "Particles/SmallSun.plist", - "Images/b1.png", - "Images/b2.png", - "Images/f1.png", - "Images/f2.png", - "ccs-res/cocosui/UIEditorTest/UIButton/background.png", - "ccs-res/cocosui/UIEditorTest/UIButton/buttonBackground.png", - "ccs-res/cocosui/UIEditorTest/UIButton/buttonHighlighted.png", - "ccs-res/cocosui/UIEditorTest/UIButton/button_n.png", - "ccs-res/cocosui/UIEditorTest/UIButton/button_p.png", - "ccs-res/cocosui/UIEditorTest/UIButton/ribbon.png", - "ccs-res/cocosui/UIEditorTest/UIButton/Button_1.json", - "ccs-res/cocosui/UIEditorTest/UICheckBox/background.png", - "ccs-res/cocosui/UIEditorTest/UICheckBox/buttonBackground.png", - "ccs-res/cocosui/UIEditorTest/UICheckBox/ribbon.png", - "ccs-res/cocosui/UIEditorTest/UICheckBox/selected01.png", - "ccs-res/cocosui/UIEditorTest/UICheckBox/selected02.png", - "ccs-res/cocosui/UIEditorTest/UICheckBox/checkbox_1.json", - "ccs-res/cocosui/UIEditorTest/UICheckBox/MainScene.json", - "ccs-res/cocosui/UIEditorTest/UICheckBox/Default/CheckBox_Disable.png", - "ccs-res/cocosui/UIEditorTest/UICheckBox/img/btn_music.png", - "ccs-res/cocosui/UIEditorTest/UICheckBox/img/btn_sound_off.png", - "ccs-res/cocosui/UIEditorTest/UIImageView/background.png", - "ccs-res/cocosui/UIEditorTest/UIImageView/buttonBackground.png", - "ccs-res/cocosui/UIEditorTest/UIImageView/buttonHighlighted.png", - "ccs-res/cocosui/UIEditorTest/UIImageView/GUI/image.png", - "ccs-res/cocosui/UIEditorTest/UIImageView/ribbon.png", - "ccs-res/cocosui/UIEditorTest/UIImageView/ImageView_1.json", - "ccs-res/cocosui/UIEditorTest/UILabelAtlas/background.png", - "ccs-res/cocosui/UIEditorTest/UILabelAtlas/buttonBackground.png", - "ccs-res/cocosui/UIEditorTest/UILabelAtlas/GUI/labelatlasimg.png", - "ccs-res/cocosui/UIEditorTest/UILabelAtlas/ribbon.png", - "ccs-res/cocosui/UIEditorTest/UILabelAtlas/labelatlas_1.json", - "ccs-res/cocosui/UIEditorTest/UILabelBMFont/background.png", - "ccs-res/cocosui/UIEditorTest/UILabelBMFont/buttonBackground.png", - "ccs-res/cocosui/UIEditorTest/UILabelBMFont/GUI/missing-font.fnt", - "ccs-res/cocosui/UIEditorTest/UILabelBMFont/GUI/missing-font.png", - "ccs-res/cocosui/UIEditorTest/UILabelBMFont/ribbon.png", - "ccs-res/cocosui/UIEditorTest/UILabelBMFont/labelbmfont_1.json", - "ccs-res/cocosui/UIEditorTest/UILabel/background.png", - "ccs-res/cocosui/UIEditorTest/UILabel/buttonBackground.png", - "ccs-res/cocosui/UIEditorTest/UILabel/ribbon.png", - "ccs-res/cocosui/UIEditorTest/UILabel/label_1.json", - "ccs-res/cocosui/UIEditorTest/UILayout/BackgroundImage/background.png", - "ccs-res/cocosui/UIEditorTest/UILayout/BackgroundImage/buttonBackground.png", - "ccs-res/cocosui/UIEditorTest/UILayout/BackgroundImage/button_n.png", - "ccs-res/cocosui/UIEditorTest/UILayout/BackgroundImage/button_p.png", - "ccs-res/cocosui/UIEditorTest/UILayout/BackgroundImage/GUI/image.png", - "ccs-res/cocosui/UIEditorTest/UILayout/BackgroundImage/Hello.png", - "ccs-res/cocosui/UIEditorTest/UILayout/BackgroundImage/ribbon.png", - "ccs-res/cocosui/UIEditorTest/UILayout/BackgroundImage/selected01.png", - "ccs-res/cocosui/UIEditorTest/UILayout/BackgroundImage/selected02.png", - "ccs-res/cocosui/UIEditorTest/UILayout/BackgroundImage/backgroundimage_1.json", - "ccs-res/cocosui/UIEditorTest/UILayout/Color/background.png", - "ccs-res/cocosui/UIEditorTest/UILayout/Color/buttonBackground.png", - "ccs-res/cocosui/UIEditorTest/UILayout/Color/button_n.png", - "ccs-res/cocosui/UIEditorTest/UILayout/Color/button_p.png", - "ccs-res/cocosui/UIEditorTest/UILayout/Color/GUI/image.png", - "ccs-res/cocosui/UIEditorTest/UILayout/Color/ribbon.png", - "ccs-res/cocosui/UIEditorTest/UILayout/Color/selected01.png", - "ccs-res/cocosui/UIEditorTest/UILayout/Color/selected02.png", - "ccs-res/cocosui/UIEditorTest/UILayout/Color/color_1.json", - "ccs-res/cocosui/UIEditorTest/UILayout/Layout/background.png", - "ccs-res/cocosui/UIEditorTest/UILayout/Layout/buttonBackground.png", - "ccs-res/cocosui/UIEditorTest/UILayout/Layout/button_n.png", - "ccs-res/cocosui/UIEditorTest/UILayout/Layout/button_p.png", - "ccs-res/cocosui/UIEditorTest/UILayout/Layout/GUI/image.png", - "ccs-res/cocosui/UIEditorTest/UILayout/Layout/ribbon.png", - "ccs-res/cocosui/UIEditorTest/UILayout/Layout/selected01.png", - "ccs-res/cocosui/UIEditorTest/UILayout/Layout/selected02.png", - "ccs-res/cocosui/UIEditorTest/UILayout/Layout/layout_1.json", - "ccs-res/cocosui/UIEditorTest/UILayout/Gradient_Color/background.png", - "ccs-res/cocosui/UIEditorTest/UILayout/Gradient_Color/buttonBackground.png", - "ccs-res/cocosui/UIEditorTest/UILayout/Gradient_Color/button_n.png", - "ccs-res/cocosui/UIEditorTest/UILayout/Gradient_Color/button_p.png", - "ccs-res/cocosui/UIEditorTest/UILayout/Gradient_Color/GUI/image.png", - "ccs-res/cocosui/UIEditorTest/UILayout/Gradient_Color/ribbon.png", - "ccs-res/cocosui/UIEditorTest/UILayout/Gradient_Color/selected01.png", - "ccs-res/cocosui/UIEditorTest/UILayout/Gradient_Color/selected02.png", - "ccs-res/cocosui/UIEditorTest/UILayout/Gradient_Color/gradient_color_1.json", - "ccs-res/cocosui/UIEditorTest/UILayout/Linear_Horizontal_Layout/background.png", - "ccs-res/cocosui/UIEditorTest/UILayout/Linear_Horizontal_Layout/buttonBackground.png", - "ccs-res/cocosui/UIEditorTest/UILayout/Linear_Horizontal_Layout/button_n.png", - "ccs-res/cocosui/UIEditorTest/UILayout/Linear_Horizontal_Layout/button_p.png", - "ccs-res/cocosui/UIEditorTest/UILayout/Linear_Horizontal_Layout/GUI/image.png", - "ccs-res/cocosui/UIEditorTest/UILayout/Linear_Horizontal_Layout/ribbon.png", - "ccs-res/cocosui/UIEditorTest/UILayout/Linear_Horizontal_Layout/selected01.png", - "ccs-res/cocosui/UIEditorTest/UILayout/Linear_Horizontal_Layout/selected02.png", - "ccs-res/cocosui/UIEditorTest/UILayout/Linear_Horizontal_Layout/linear_horizontal.json", - "ccs-res/cocosui/UIEditorTest/UILayout/Linear_Vertical_Layout/background.png", - "ccs-res/cocosui/UIEditorTest/UILayout/Linear_Vertical_Layout/buttonBackground.png", - "ccs-res/cocosui/UIEditorTest/UILayout/Linear_Vertical_Layout/button_n.png", - "ccs-res/cocosui/UIEditorTest/UILayout/Linear_Vertical_Layout/button_p.png", - "ccs-res/cocosui/UIEditorTest/UILayout/Linear_Vertical_Layout/GUI/image.png", - "ccs-res/cocosui/UIEditorTest/UILayout/Linear_Vertical_Layout/ribbon.png", - "ccs-res/cocosui/UIEditorTest/UILayout/Linear_Vertical_Layout/selected01.png", - "ccs-res/cocosui/UIEditorTest/UILayout/Linear_Vertical_Layout/selected02.png", - "ccs-res/cocosui/UIEditorTest/UILayout/Linear_Vertical_Layout/linear_vertical.json", - "ccs-res/cocosui/UIEditorTest/UILayout/Relative_Align_Location/background.png", - "ccs-res/cocosui/UIEditorTest/UILayout/Relative_Align_Location/buttonBackground.png", - "ccs-res/cocosui/UIEditorTest/UILayout/Relative_Align_Location/button_n.png", - "ccs-res/cocosui/UIEditorTest/UILayout/Relative_Align_Location/button_p.png", - "ccs-res/cocosui/UIEditorTest/UILayout/Relative_Align_Location/GUI/image.png", - "ccs-res/cocosui/UIEditorTest/UILayout/Relative_Align_Location/ribbon.png", - "ccs-res/cocosui/UIEditorTest/UILayout/Relative_Align_Location/selected01.png", - "ccs-res/cocosui/UIEditorTest/UILayout/Relative_Align_Location/selected02.png", - "ccs-res/cocosui/UIEditorTest/UILayout/Relative_Align_Location/relative_align_location.json", - "ccs-res/cocosui/UIEditorTest/UILayout/Relative_Align_Parent/background.png", - "ccs-res/cocosui/UIEditorTest/UILayout/Relative_Align_Parent/buttonBackground.png", - "ccs-res/cocosui/UIEditorTest/UILayout/Relative_Align_Parent/button_n.png", - "ccs-res/cocosui/UIEditorTest/UILayout/Relative_Align_Parent/button_p.png", - "ccs-res/cocosui/UIEditorTest/UILayout/Relative_Align_Parent/GUI/image.png", - "ccs-res/cocosui/UIEditorTest/UILayout/Relative_Align_Parent/ribbon.png", - "ccs-res/cocosui/UIEditorTest/UILayout/Relative_Align_Parent/selected01.png", - "ccs-res/cocosui/UIEditorTest/UILayout/Relative_Align_Parent/selected02.png", - "ccs-res/cocosui/UIEditorTest/UILayout/Relative_Align_Parent/relative_align_parent.json", - "ccs-res/cocosui/UIEditorTest/UILayout/Scale9_BackgroundImage/background.png", - "ccs-res/cocosui/UIEditorTest/UILayout/Scale9_BackgroundImage/buttonBackground.png", - "ccs-res/cocosui/UIEditorTest/UILayout/Scale9_BackgroundImage/button_n.png", - "ccs-res/cocosui/UIEditorTest/UILayout/Scale9_BackgroundImage/button_p.png", - "ccs-res/cocosui/UIEditorTest/UILayout/Scale9_BackgroundImage/GUI/image.png", - "ccs-res/cocosui/UIEditorTest/UILayout/Scale9_BackgroundImage/ribbon.png", - "ccs-res/cocosui/UIEditorTest/UILayout/Scale9_BackgroundImage/selected01.png", - "ccs-res/cocosui/UIEditorTest/UILayout/Scale9_BackgroundImage/selected02.png", - "ccs-res/cocosui/UIEditorTest/UILayout/Scale9_BackgroundImage/slider_bar.png", - "ccs-res/cocosui/UIEditorTest/UILayout/Scale9_BackgroundImage/scale9.json", - "ccs-res/cocosui/UIEditorTest/UIListView/Horizontal/background.png", - "ccs-res/cocosui/UIEditorTest/UIListView/Horizontal/buttonBackground.png", - "ccs-res/cocosui/UIEditorTest/UIListView/Horizontal/button_p.png", - "ccs-res/cocosui/UIEditorTest/UIListView/Horizontal/GUI/button.png", - "ccs-res/cocosui/UIEditorTest/UIListView/Horizontal/GUI/image.png", - "ccs-res/cocosui/UIEditorTest/UIListView/Horizontal/ribbon.png", - "ccs-res/cocosui/UIEditorTest/UIListView/Horizontal/horizontal_1.json", - "ccs-res/cocosui/UIEditorTest/UIListView/Vertical/background.png", - "ccs-res/cocosui/UIEditorTest/UIListView/Vertical/buttonBackground.png", - "ccs-res/cocosui/UIEditorTest/UIListView/Vertical/button_p.png", - "ccs-res/cocosui/UIEditorTest/UIListView/Vertical/GUI/button.png", - "ccs-res/cocosui/UIEditorTest/UIListView/Vertical/GUI/image.png", - "ccs-res/cocosui/UIEditorTest/UIListView/Vertical/ribbon.png", - "ccs-res/cocosui/UIEditorTest/UIListView/Vertical/vertical_1.json", - "ccs-res/cocosui/UIEditorTest/UILoadingBar/background.png", - "ccs-res/cocosui/UIEditorTest/UILoadingBar/buttonBackground.png", - "ccs-res/cocosui/UIEditorTest/UILoadingBar/GUI/loadingbar.png", - "ccs-res/cocosui/UIEditorTest/UILoadingBar/ribbon.png", - "ccs-res/cocosui/UIEditorTest/UILoadingBar/loadingbar_1.json", - "ccs-res/cocosui/UIEditorTest/UIPageView/background.png", - "ccs-res/cocosui/UIEditorTest/UIPageView/buttonBackground.png", - "ccs-res/cocosui/UIEditorTest/UIPageView/button_n.png", - "ccs-res/cocosui/UIEditorTest/UIPageView/ribbon.png", - "ccs-res/cocosui/UIEditorTest/UIPageView/pageview_1.json", - "ccs-res/cocosui/UIEditorTest/UIScrollView/Both/background.png", - "ccs-res/cocosui/UIEditorTest/UIScrollView/Both/buttonBackground.png", - "ccs-res/cocosui/UIEditorTest/UIScrollView/Both/button_n.png", - "ccs-res/cocosui/UIEditorTest/UIScrollView/Both/button_p.png", - "ccs-res/cocosui/UIEditorTest/UIScrollView/Both/GUI/image.png", - "ccs-res/cocosui/UIEditorTest/UIScrollView/Both/ribbon.png", - "ccs-res/cocosui/UIEditorTest/UIScrollView/Both/selected01.png", - "ccs-res/cocosui/UIEditorTest/UIScrollView/Both/selected02.png", - "ccs-res/cocosui/UIEditorTest/UIScrollView/Both/both_1.json", - "ccs-res/cocosui/UIEditorTest/UIScrollView/Horizontal/background.png", - "ccs-res/cocosui/UIEditorTest/UIScrollView/Horizontal/buttonBackground.png", - "ccs-res/cocosui/UIEditorTest/UIScrollView/Horizontal/button_n.png", - "ccs-res/cocosui/UIEditorTest/UIScrollView/Horizontal/button_p.png", - "ccs-res/cocosui/UIEditorTest/UIScrollView/Horizontal/GUI/image.png", - "ccs-res/cocosui/UIEditorTest/UIScrollView/Horizontal/ribbon.png", - "ccs-res/cocosui/UIEditorTest/UIScrollView/Horizontal/selected01.png", - "ccs-res/cocosui/UIEditorTest/UIScrollView/Horizontal/selected02.png", - "ccs-res/cocosui/UIEditorTest/UIScrollView/Horizontal/horizontal_1.json", - "ccs-res/cocosui/UIEditorTest/UIScrollView/Vertical/background.png", - "ccs-res/cocosui/UIEditorTest/UIScrollView/Vertical/buttonBackground.png", - "ccs-res/cocosui/UIEditorTest/UIScrollView/Vertical/button_n.png", - "ccs-res/cocosui/UIEditorTest/UIScrollView/Vertical/button_p.png", - "ccs-res/cocosui/UIEditorTest/UIScrollView/Vertical/GUI/image.png", - "ccs-res/cocosui/UIEditorTest/UIScrollView/Vertical/ribbon.png", - "ccs-res/cocosui/UIEditorTest/UIScrollView/Vertical/selected01.png", - "ccs-res/cocosui/UIEditorTest/UIScrollView/Vertical/selected02.png", - "ccs-res/cocosui/UIEditorTest/UIScrollView/Vertical/vertical_1.json", - "ccs-res/cocosui/UIEditorTest/UISlider/2014-1-26 11-42-09.png", - "ccs-res/cocosui/UIEditorTest/UISlider/2014-1-26 11-43-52.png", - "ccs-res/cocosui/UIEditorTest/UISlider/background.png", - "ccs-res/cocosui/UIEditorTest/UISlider/buttonBackground.png", - "ccs-res/cocosui/UIEditorTest/UISlider/ribbon.png", - "ccs-res/cocosui/UIEditorTest/UISlider/silder_progressBar.png", - "ccs-res/cocosui/UIEditorTest/UISlider/slider_bar.png", - "ccs-res/cocosui/UIEditorTest/UISlider/slider_bar_button.png", - "ccs-res/cocosui/UIEditorTest/UISlider/slider_1.json", - "ccs-res/cocosui/UIEditorTest/UITextField/background.png", - "ccs-res/cocosui/UIEditorTest/UITextField/buttonBackground.png", - "ccs-res/cocosui/UIEditorTest/UITextField/ribbon.png", - "ccs-res/cocosui/UIEditorTest/UITextField/textfield_1.json", - "ccs-res/cocosui/UIEditorTest/UIWidgetAddNode/background.png", - "ccs-res/cocosui/UIEditorTest/UIWidgetAddNode/buttonBackground.png", - "ccs-res/cocosui/UIEditorTest/UIWidgetAddNode/ribbon.png", - "ccs-res/cocosui/UIEditorTest/UIWidgetAddNode/widget_add_node.json", - "background-music-aac.wav", - "pew-pew-lei.wav", - //Components - "components/Player.png", - "components/Projectile.png", - "components/Target.png", - //Scene - "ccs-res/scenetest/ArmatureComponentTest/ArmatureComponentTest.json", - "ccs-res/scenetest/ArmatureComponentTest/fishes/blowFish/Blowfish.ExportJson", - "ccs-res/scenetest/ArmatureComponentTest/fishes/blowFish/Blowfish0.plist", - "ccs-res/scenetest/ArmatureComponentTest/fishes/blowFish/Blowfish0.png", - "ccs-res/scenetest/ArmatureComponentTest/fishes/Butterflyfish/Butterflyfish.ExportJson", - "ccs-res/scenetest/ArmatureComponentTest/fishes/Butterflyfish/Butterflyfish0.plist", - "ccs-res/scenetest/ArmatureComponentTest/fishes/Butterflyfish/Butterflyfish0.png", - "ccs-res/scenetest/ArmatureComponentTest/Images/startMenuBG.png", - "ccs-res/scenetest/AttributeComponentTest/AttributeComponentTest.json", - "ccs-res/scenetest/AttributeComponentTest/grossinis_sister1.png", - "ccs-res/scenetest/AttributeComponentTest/grossinis_sister2.png", - "ccs-res/scenetest/AttributeComponentTest/PlayerAttribute.json", - "ccs-res/scenetest/BackgroundComponentTest/BackgroundComponentTest.json", - "ccs-res/scenetest/BackgroundComponentTest/Images/startMenuBG.png", - "ccs-res/scenetest/BackgroundComponentTest/Misc/music_logo.mp3", - "ccs-res/scenetest/BackgroundComponentTest/Misc/music_logo.wav", - "ccs-res/scenetest/BackgroundComponentTest/Particles/qipao01.plist", - "ccs-res/scenetest/BackgroundComponentTest/Particles/qipao01.png", - "ccs-res/scenetest/BackgroundComponentTest/startMenu/Fish_UI/starMenuButton01.png", - "ccs-res/scenetest/BackgroundComponentTest/startMenu/Fish_UI/starMenuButton02.png", - "ccs-res/scenetest/BackgroundComponentTest/startMenu/Fish_UI/ui_logo_001-hd.png", - "ccs-res/scenetest/BackgroundComponentTest/startMenu/startMenu_1.json", - "ccs-res/scenetest/EffectComponentTest/CowBoy/Cowboy.ExportJson", - "ccs-res/scenetest/EffectComponentTest/CowBoy/Cowboy0.plist", - "ccs-res/scenetest/EffectComponentTest/CowBoy/Cowboy0.png", - "ccs-res/scenetest/EffectComponentTest/EffectComponentTest.json", - "ccs-res/scenetest/EffectComponentTest/pew-pew-lei.wav", - "ccs-res/scenetest/LoadSceneEdtiorFileTest/fishes/blowFish/Blowfish.ExportJson", - "ccs-res/scenetest/LoadSceneEdtiorFileTest/fishes/blowFish/Blowfish0.plist", - "ccs-res/scenetest/LoadSceneEdtiorFileTest/fishes/blowFish/Blowfish0.png", - "ccs-res/scenetest/LoadSceneEdtiorFileTest/fishes/Butterflyfish/Butterflyfish.ExportJson", - "ccs-res/scenetest/LoadSceneEdtiorFileTest/fishes/Butterflyfish/Butterflyfish0.plist", - "ccs-res/scenetest/LoadSceneEdtiorFileTest/fishes/Butterflyfish/Butterflyfish0.png", - "ccs-res/scenetest/LoadSceneEdtiorFileTest/FishJoy2.json", - "ccs-res/scenetest/LoadSceneEdtiorFileTest/Images/startMenuBG.png", - "ccs-res/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.mp3", - "ccs-res/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.wav", - "ccs-res/scenetest/LoadSceneEdtiorFileTest/Particles/qipao01.plist", - "ccs-res/scenetest/LoadSceneEdtiorFileTest/Particles/qipao01.png", - "ccs-res/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/starMenuButton01.png", - "ccs-res/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/starMenuButton02.png", - "ccs-res/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/ui_logo_001-hd.png", - "ccs-res/scenetest/LoadSceneEdtiorFileTest/startMenu/startMenu_1.json", - "ccs-res/scenetest/ParticleComponentTest/ParticleComponentTest.json", - "ccs-res/scenetest/ParticleComponentTest/SmallSun.plist", - "ccs-res/scenetest/ParticleComponentTest/Upsidedown.plist", - "ccs-res/scenetest/SpriteComponentTest/grossinis_sister1.png", - "ccs-res/scenetest/SpriteComponentTest/grossinis_sister2.png", - "ccs-res/scenetest/SpriteComponentTest/SpriteComponentTest.json", - "ccs-res/scenetest/TmxMapComponentTest/iso-test.png", - "ccs-res/scenetest/TmxMapComponentTest/iso-test.tmx", - "ccs-res/scenetest/TmxMapComponentTest/TmxMapComponentTest.json", - "ccs-res/scenetest/TriggerTest/fishes/blowFish/Blowfish.ExportJson", - "ccs-res/scenetest/TriggerTest/fishes/blowFish/Blowfish0.plist", - "ccs-res/scenetest/TriggerTest/fishes/blowFish/Blowfish0.png", - "ccs-res/scenetest/TriggerTest/fishes/Butterflyfish/Butterflyfish.ExportJson", - "ccs-res/scenetest/TriggerTest/fishes/Butterflyfish/Butterflyfish0.plist", - "ccs-res/scenetest/TriggerTest/fishes/Butterflyfish/Butterflyfish0.png", - "ccs-res/scenetest/TriggerTest/Images/startMenuBG.png", - "ccs-res/scenetest/TriggerTest/TriggerTest.json", - "ccs-res/scenetest/UIComponentTest/fishes/blowFish/Blowfish.ExportJson", - "ccs-res/scenetest/UIComponentTest/fishes/blowFish/Blowfish0.plist", - "ccs-res/scenetest/UIComponentTest/fishes/blowFish/Blowfish0.png", - "ccs-res/scenetest/UIComponentTest/fishes/Butterflyfish/Butterflyfish.ExportJson", - "ccs-res/scenetest/UIComponentTest/fishes/Butterflyfish/Butterflyfish0.plist", - "ccs-res/scenetest/UIComponentTest/fishes/Butterflyfish/Butterflyfish0.png", - "ccs-res/scenetest/UIComponentTest/Images/startMenuBG.png", - "ccs-res/scenetest/UIComponentTest/starMenuButton/starMenuButton.ExportJson", - "ccs-res/scenetest/UIComponentTest/starMenuButton/starMenuButton0.plist", - "ccs-res/scenetest/UIComponentTest/starMenuButton/starMenuButton0.png", - "ccs-res/scenetest/UIComponentTest/UIComponentTest.json", - - //parser - "ccs-res/cocosui/UIEditorTest/cocostudio1_3/CocostudioV1_3_1.ExportJson", - "ccs-res/cocosui/UIEditorTest/cocostudio1_3/CocostudioV1_30.plist", - "ccs-res/cocosui/UIEditorTest/cocostudio1_3/CocostudioV1_30.png", - "ccs-res/cocosui/UIEditorTest/cocostudio1_3/SmallSun.plist", - "ccs-res/cocosui/UIEditorTest/cocostudio1_3/GUI/labelatlasimg.png", - "ccs-res/cocosui/UIEditorTest/cocostudio1_3/GUI/missing-font.fnt", - "ccs-res/cocosui/UIEditorTest/cocostudio1_3/GUI/missing-font.png", - "ccs-res/cocosui/UIEditorTest/cocostudio1_4/Cocostudio1_4_1.ExportJson", - "ccs-res/cocosui/UIEditorTest/cocostudio1_4/Cocostudio1_40.plist", - "ccs-res/cocosui/UIEditorTest/cocostudio1_4/Cocostudio1_40.png", - "ccs-res/cocosui/UIEditorTest/cocostudio1_4/SmallSun.plist", - "ccs-res/cocosui/UIEditorTest/cocostudio1_4/GUI/labelatlasimg.png", - "ccs-res/cocosui/UIEditorTest/cocostudio1_4/GUI/missing-font.fnt", - "ccs-res/cocosui/UIEditorTest/cocostudio1_4/GUI/missing-font.png", - "ccs-res/cocosui/UIEditorTest/cocostudio1_5/Cocostudio1_5_1.ExportJson", - "ccs-res/cocosui/UIEditorTest/cocostudio1_5/Cocostudio1_50.plist", - "ccs-res/cocosui/UIEditorTest/cocostudio1_5/Cocostudio1_50.png", - "ccs-res/cocosui/UIEditorTest/cocostudio1_5/SmallSun.plist", - "ccs-res/cocosui/UIEditorTest/cocostudio1_5/GUI/labelatlasimg.png", - "ccs-res/cocosui/UIEditorTest/cocostudio1_5/GUI/missing-font.fnt", - "ccs-res/cocosui/UIEditorTest/cocostudio1_5/GUI/missing-font.png", - - "ccs-res/cocosui/UIEditorTest/2.1/MainScene.json", - "ccs-res/cocosui/UIEditorTest/2.1/plist1/Plist.plist", - "ccs-res/cocosui/UIEditorTest/2.1/Plist/ui.plist", - "ccs-res/cocosui/UIEditorTest/2.1/LoadingBar/pipe2.png", - "ccs-res/cocosui/UIEditorTest/2.1/Slider/2013-8-13 15-44-11.png", - "ccs-res/cocosui/UIEditorTest/2.1/Slider/teehanlax - iOS 6 - iPhone_slider01.png", - "ccs-res/cocosui/UIEditorTest/2.1/particle/blue.plist", - "ccs-res/cocosui/UIEditorTest/2.1/Default/Slider_Back.png", - "ccs-res/cocosui/UIEditorTest/2.1/Default/SliderNode_Normal.png", - "ccs-res/cocosui/UIEditorTest/2.1/Default/SliderNode_Press.png", - "ccs-res/cocosui/UIEditorTest/2.1/Default/SliderNode_Disable.png", - "ccs-res/cocosui/UIEditorTest/2.1/Default/Slider_PressBar.png", - "ccs-res/cocosui/UIEditorTest/2.1/Default/defaultParticle.plist", - "ccs-res/cocosui/UIEditorTest/2.1/Default/TextAtlas.png", - "ccs-res/cocosui/UIEditorTest/2.1/fonts_weapon_001-hd.png", - "ccs-res/cocosui/UIEditorTest/2.1/FNT/futura.fnt", - "ccs-res/cocosui/UIEditorTest/2.1/Default/defaultBMFont.fnt", - "ccs-res/cocosui/UIEditorTest/2.1/FNT/Heiti18.fnt", - - "Particles/BoilingFoam.plist", - "ccs-res/cocosui/CustomImageViewTest/NewProject_2_1.ExportJson", - "ccs-res/cocosui/CustomImageViewTest/NewProject_20.plist", - "ccs-res/cocosui/CustomImageViewTest/NewProject_20.png", - - "ActionTimeline/DemoPlayer_skeleton.json" -]; - -var g_ui = [ - "ccs-res/cocosui/switch-mask.png", - "ccs-res/cocosui/animationbuttonnormal.png", - "ccs-res/cocosui/animationbuttonpressed.png", - "ccs-res/cocosui/arrow.png", - "ccs-res/cocosui/b11.png", - "ccs-res/cocosui/backtotopnormal.png", - "ccs-res/cocosui/backtotoppressed.png", - "ccs-res/cocosui/bitmapFontTest2.fnt", - "ccs-res/cocosui/bitmapFontTest2.png", - "ccs-res/cocosui/button.png", - "ccs-res/cocosui/buttonHighlighted.png", - "ccs-res/cocosui/ccicon.png", - "ccs-res/cocosui/check_box_active.png", - "ccs-res/cocosui/check_box_active_disable.png", - "ccs-res/cocosui/check_box_active_press.png", - "ccs-res/cocosui/check_box_normal.png", - "ccs-res/cocosui/check_box_normal_disable.png", - "ccs-res/cocosui/check_box_normal_press.png", - "ccs-res/cocosui/CloseNormal.png", - "ccs-res/cocosui/CloseSelected.png", - "ccs-res/cocosui/green_edit.png", - "ccs-res/cocosui/grossini-aliases.png", - "ccs-res/cocosui/Hello.png", - "ccs-res/cocosui/labelatlas.png", - "ccs-res/cocosui/loadingbar.png", - {type:"font", name:"Marker Felt", srcs:["../cpp-tests/Resources/fonts/Marker Felt.ttf"]}, - "ccs-res/cocosui/scrollviewbg.png", - "ccs-res/cocosui/slidbar.png", - "ccs-res/cocosui/sliderballnormal.png", - "ccs-res/cocosui/sliderballpressed.png", - "ccs-res/cocosui/sliderProgress.png", - "ccs-res/cocosui/sliderProgress2.png", - "ccs-res/cocosui/sliderThumb.png", - "ccs-res/cocosui/sliderTrack.png", - "ccs-res/cocosui/sliderTrack2.png", - "ccs-res/cocosui/slider_bar_active_9patch.png", - "ccs-res/cocosui/UITest/b1.png", - "ccs-res/cocosui/UITest/b2.png", - "ccs-res/cocosui/UITest/background.png", - "ccs-res/cocosui/UITest/buttonBackground.png", - "ccs-res/cocosui/UITest/f1.png", - "ccs-res/cocosui/UITest/f2.png", - "ccs-res/cocosui/UITest/r1.png", - "ccs-res/cocosui/UITest/r2.png", - "ccs-res/cocosui/UITest/ribbon.png", - "ccs-res/cocosui/UITest/UITest.json", - "ccs-res/cocosui/100/100.ExportJson", - "ccs-res/cocosui/100/1000.plist", - "ccs-res/cocosui/100/1000.png", - s_s9s_blocks9_plist, - "ccs-res/cocosui/CloseSelected.png" -]; - var g_performace = [ - "animations/crystals.plist", - "animations/crystals.png", - "fps_images.png", - "Images/spritesheet1.png", - "Images/sprites_test/sprite-0-0.png", - "Images/sprites_test/sprite-0-1.png", - "Images/sprites_test/sprite-0-2.png", - "Images/sprites_test/sprite-0-3.png", - "Images/sprites_test/sprite-0-4.png", - "Images/sprites_test/sprite-0-5.png", - "Images/sprites_test/sprite-0-6.png", - "Images/sprites_test/sprite-0-7.png", - "Images/sprites_test/sprite-1-0.png", - "Images/sprites_test/sprite-1-1.png", - "Images/sprites_test/sprite-1-2.png", - "Images/sprites_test/sprite-1-3.png", - "Images/sprites_test/sprite-1-4.png", - "Images/sprites_test/sprite-1-5.png", - "Images/sprites_test/sprite-1-6.png", - "Images/sprites_test/sprite-1-7.png", - "Images/sprites_test/sprite-2-0.png", - "Images/sprites_test/sprite-2-1.png", - "Images/sprites_test/sprite-2-2.png", - "Images/sprites_test/sprite-2-3.png", - "Images/sprites_test/sprite-2-4.png", - "Images/sprites_test/sprite-2-5.png", - "Images/sprites_test/sprite-2-6.png", - "Images/sprites_test/sprite-2-7.png", - "Images/sprites_test/sprite-3-0.png", - "Images/sprites_test/sprite-3-1.png", - "Images/sprites_test/sprite-3-2.png", - "Images/sprites_test/sprite-3-3.png", - "Images/sprites_test/sprite-3-4.png", - "Images/sprites_test/sprite-3-5.png", - "Images/sprites_test/sprite-3-6.png", - "Images/sprites_test/sprite-3-7.png", - "Images/sprites_test/sprite-4-0.png", - "Images/sprites_test/sprite-4-1.png", - "Images/sprites_test/sprite-4-2.png", - "Images/sprites_test/sprite-4-3.png", - "Images/sprites_test/sprite-4-4.png", - "Images/sprites_test/sprite-4-5.png", - "Images/sprites_test/sprite-4-6.png", - "Images/sprites_test/sprite-4-7.png", - "Images/sprites_test/sprite-5-0.png", - "Images/sprites_test/sprite-5-1.png", - "Images/sprites_test/sprite-5-2.png", - "Images/sprites_test/sprite-5-3.png", - "Images/sprites_test/sprite-5-4.png", - "Images/sprites_test/sprite-5-5.png", - "Images/sprites_test/sprite-5-6.png", - "Images/sprites_test/sprite-5-7.png", - "Images/sprites_test/sprite-6-0.png", - "Images/sprites_test/sprite-6-1.png", - "Images/sprites_test/sprite-6-2.png", - "Images/sprites_test/sprite-6-3.png", - "Images/sprites_test/sprite-6-4.png", - "Images/sprites_test/sprite-6-5.png", - "Images/sprites_test/sprite-6-6.png", - "Images/sprites_test/sprite-6-7.png", - "Images/sprites_test/sprite-7-0.png", - "Images/sprites_test/sprite-7-1.png", - "Images/sprites_test/sprite-7-2.png", - "Images/sprites_test/sprite-7-3.png", - "Images/sprites_test/sprite-7-4.png", - "Images/sprites_test/sprite-7-5.png", - "Images/sprites_test/sprite-7-6.png", - "Images/sprites_test/sprite-7-7.png" + "res/animations/crystals.plist", + "res/animations/crystals.png", + "res/fps_images.png", + "res/Images/spritesheet1.png", + "res/Images/sprites_test/sprite-0-0.png", + "res/Images/sprites_test/sprite-0-1.png", + "res/Images/sprites_test/sprite-0-2.png", + "res/Images/sprites_test/sprite-0-3.png", + "res/Images/sprites_test/sprite-0-4.png", + "res/Images/sprites_test/sprite-0-5.png", + "res/Images/sprites_test/sprite-0-6.png", + "res/Images/sprites_test/sprite-0-7.png", + "res/Images/sprites_test/sprite-1-0.png", + "res/Images/sprites_test/sprite-1-1.png", + "res/Images/sprites_test/sprite-1-2.png", + "res/Images/sprites_test/sprite-1-3.png", + "res/Images/sprites_test/sprite-1-4.png", + "res/Images/sprites_test/sprite-1-5.png", + "res/Images/sprites_test/sprite-1-6.png", + "res/Images/sprites_test/sprite-1-7.png", + "res/Images/sprites_test/sprite-2-0.png", + "res/Images/sprites_test/sprite-2-1.png", + "res/Images/sprites_test/sprite-2-2.png", + "res/Images/sprites_test/sprite-2-3.png", + "res/Images/sprites_test/sprite-2-4.png", + "res/Images/sprites_test/sprite-2-5.png", + "res/Images/sprites_test/sprite-2-6.png", + "res/Images/sprites_test/sprite-2-7.png", + "res/Images/sprites_test/sprite-3-0.png", + "res/Images/sprites_test/sprite-3-1.png", + "res/Images/sprites_test/sprite-3-2.png", + "res/Images/sprites_test/sprite-3-3.png", + "res/Images/sprites_test/sprite-3-4.png", + "res/Images/sprites_test/sprite-3-5.png", + "res/Images/sprites_test/sprite-3-6.png", + "res/Images/sprites_test/sprite-3-7.png", + "res/Images/sprites_test/sprite-4-0.png", + "res/Images/sprites_test/sprite-4-1.png", + "res/Images/sprites_test/sprite-4-2.png", + "res/Images/sprites_test/sprite-4-3.png", + "res/Images/sprites_test/sprite-4-4.png", + "res/Images/sprites_test/sprite-4-5.png", + "res/Images/sprites_test/sprite-4-6.png", + "res/Images/sprites_test/sprite-4-7.png", + "res/Images/sprites_test/sprite-5-0.png", + "res/Images/sprites_test/sprite-5-1.png", + "res/Images/sprites_test/sprite-5-2.png", + "res/Images/sprites_test/sprite-5-3.png", + "res/Images/sprites_test/sprite-5-4.png", + "res/Images/sprites_test/sprite-5-5.png", + "res/Images/sprites_test/sprite-5-6.png", + "res/Images/sprites_test/sprite-5-7.png", + "res/Images/sprites_test/sprite-6-0.png", + "res/Images/sprites_test/sprite-6-1.png", + "res/Images/sprites_test/sprite-6-2.png", + "res/Images/sprites_test/sprite-6-3.png", + "res/Images/sprites_test/sprite-6-4.png", + "res/Images/sprites_test/sprite-6-5.png", + "res/Images/sprites_test/sprite-6-6.png", + "res/Images/sprites_test/sprite-6-7.png", + "res/Images/sprites_test/sprite-7-0.png", + "res/Images/sprites_test/sprite-7-1.png", + "res/Images/sprites_test/sprite-7-2.png", + "res/Images/sprites_test/sprite-7-3.png", + "res/Images/sprites_test/sprite-7-4.png", + "res/Images/sprites_test/sprite-7-5.png", + "res/Images/sprites_test/sprite-7-6.png", + "res/Images/sprites_test/sprite-7-7.png" ]; var g_tilemaps = [ @@ -989,56 +560,56 @@ var g_tilemaps = [ s_tilesPng, s_tileISOOffsetPng, s_tileISOOffsetTmx, - "TileMaps/ortho-test2.png", + "res/TileMaps/ortho-test2.png", //tmx - "TileMaps/orthogonal-test1.tmx", - "TileMaps/orthogonal-test1.tsx", - "TileMaps/orthogonal-test2.tmx", - "TileMaps/orthogonal-test3.tmx", - "TileMaps/orthogonal-test4.tmx", - "TileMaps/orthogonal-test4-hd.tmx", - "TileMaps/orthogonal-test5.tmx", - "TileMaps/orthogonal-test6.tmx", - "TileMaps/orthogonal-test6-hd.tmx", - "TileMaps/hexa-test.tmx", - "TileMaps/iso-test.tmx", - "TileMaps/iso-test1.tmx", - "TileMaps/iso-test2.tmx", - "TileMaps/iso-test2-uncompressed.tmx", - "TileMaps/ortho-objects.tmx", - "TileMaps/iso-test-objectgroup.tmx", - "TileMaps/iso-test-zorder.tmx", - "TileMaps/orthogonal-test-zorder.tmx", - "TileMaps/iso-test-vertexz.tmx", - "TileMaps/orthogonal-test-vertexz.tmx", - "TileMaps/iso-test-movelayer.tmx", - "TileMaps/orthogonal-test-movelayer.tmx", - "TileMaps/iso-test-bug787.tmx", - "TileMaps/test-object-layer.tmx", - "TileMaps/ortho-tile-property.tmx", - "TileMaps/ortho-rotation-test.tmx" + "res/TileMaps/orthogonal-test1.tmx", + "res/TileMaps/orthogonal-test1.tsx", + "res/TileMaps/orthogonal-test2.tmx", + "res/TileMaps/orthogonal-test3.tmx", + "res/TileMaps/orthogonal-test4.tmx", + "res/TileMaps/orthogonal-test4-hd.tmx", + "res/TileMaps/orthogonal-test5.tmx", + "res/TileMaps/orthogonal-test6.tmx", + "res/TileMaps/orthogonal-test6-hd.tmx", + "res/TileMaps/hexa-test.tmx", + "res/TileMaps/iso-test.tmx", + "res/TileMaps/iso-test1.tmx", + "res/TileMaps/iso-test2.tmx", + "res/TileMaps/iso-test2-uncompressed.tmx", + "res/TileMaps/ortho-objects.tmx", + "res/TileMaps/iso-test-objectgroup.tmx", + "res/TileMaps/iso-test-zorder.tmx", + "res/TileMaps/orthogonal-test-zorder.tmx", + "res/TileMaps/iso-test-vertexz.tmx", + "res/TileMaps/orthogonal-test-vertexz.tmx", + "res/TileMaps/iso-test-movelayer.tmx", + "res/TileMaps/orthogonal-test-movelayer.tmx", + "res/TileMaps/iso-test-bug787.tmx", + "res/TileMaps/test-object-layer.tmx", + "res/TileMaps/ortho-tile-property.tmx", + "res/TileMaps/ortho-rotation-test.tmx" ]; var g_spine = [ - "spine/spineboy.atlas", - "spine/spineboy.json", - "spine/spineboy.png", - "spine/sprite.png", - "spine/goblins-ffd.png", - "spine/goblins-ffd.atlas", - "spine/goblins-ffd.json" + "res/spine/spineboy.atlas", + "res/spine/spineboy.json", + "res/spine/spineboy.png", + "res/spine/sprite.png", + "res/spine/goblins-ffd.png", + "res/spine/goblins-ffd.atlas", + "res/spine/goblins-ffd.json" ]; var g_ccs2 = [ - "ActionTimeline/boy_1.csb", - "ActionTimeline/armature/Cowboy0.plist", - "ccs-res/cocosui/UIEditorTest/UILabelBMFont_Editor/GUI/missing-font.fnt", - "ccs-res/cocosui/UIEditorTest/UILabelBMFont_Editor/GUI/missing-font.png" + "res/ActionTimeline/boy_1.csb", + "res/ActionTimeline/armature/Cowboy0.plist", + "res/ccs-res/cocosui/UIEditorTest/UILabelBMFont_Editor/GUI/missing-font.fnt", + "res/ccs-res/cocosui/UIEditorTest/UILabelBMFont_Editor/GUI/missing-font.png" ]; if (!cc.sys.isNative) { var res = res || {}; - res.CCControlColourPickerSpriteSheet_plist = "extensions/CCControlColourPickerSpriteSheet.plist"; - res.CCControlColourPickerSpriteSheet_png = "extensions/CCControlColourPickerSpriteSheet.png"; + res.CCControlColourPickerSpriteSheet_plist = "res/extensions/CCControlColourPickerSpriteSheet.plist"; + res.CCControlColourPickerSpriteSheet_png = "res/extensions/CCControlColourPickerSpriteSheet.png"; } \ No newline at end of file