Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix js resource path in code

This commit is contained in:
jianglong0156 2015-05-25 17:02:26 +08:00
parent 6e27825dec
commit f1145139ac
31 changed files with 188 additions and 188 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/js-tests/src/ActionsTest/ActionsTest.js
View File

@ -974,7 +974,7 @@ var ActionAnimate = ActionsDemo.extend({
//
var animation = new cc.Animation();
for (var i = 1; i < 15; i++) {
var frameName = "res/Images/grossini_dance_" + ((i < 10) ? ("0" + i) : i) + ".png";
var frameName = "Images/grossini_dance_" + ((i < 10) ? ("0" + i) : i) + ".png";
animation.addSpriteFrameWithFile(frameName);
}
animation.setDelayPerUnit(2.8 / 14);
@ -2559,7 +2559,7 @@ var Issue1438 = ActionsDemo.extend({
// Add 60 frames
for (var j = 0; j < 4; j++) {
for (var i = 1; i < 15; i++) {
var frameName = "res/Images/grossini_dance_" + ((i < 10) ? ("0" + i) : i) + ".png";
var frameName = "Images/grossini_dance_" + ((i < 10) ? ("0" + i) : i) + ".png";
animation.addSpriteFrameWithFile(frameName);
}
}

4
tests/js-tests/src/CocosDenshionTest/CocosDenshionTest.js
View File

@ -26,8 +26,8 @@
var audioEngine = cc.audioEngine;
var MUSIC_FILE = cc.sys.os == cc.sys.OS_WINRT ? "res/background.wav" : "res/Sound/background.mp3";
var EFFECT_FILE = cc.sys.os == cc.sys.OS_WINRT ? "res/effect1.wav" : "res/Sound/effect2.mp3";
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 _DenshionTests = [
'Music Test'

2
tests/js-tests/src/EaseActionsTest/EaseActionsTest.js
View File

@ -738,7 +738,7 @@ var SchedulerTest = EaseSpriteDemo.extend({
var emitter = new cc.ParticleFireworks();
emitter.setTotalParticles(250);
emitter.texture = cc.textureCache.addImage("res/Images/fire.png");
emitter.texture = cc.textureCache.addImage("Images/fire.png");
this.addChild(emitter);
//----end13----
},

2
tests/js-tests/src/ExtensionsTest/AssetsManagerTest/AssetsManagerTest.js
View File

@ -39,7 +39,7 @@ var AssetsManagerTestLayer = BaseTestLayer.extend({
ctor : function (spritePath) {
this._super();
this._spritePath = spritePath;
cc.loader.resPath = "res/";
cc.loader.resPath = "../cpp-tests/Resources/";
},
getTitle : function() {

4
tests/js-tests/src/ExtensionsTest/CocosBuilderTest/CocosBuilderTest.js
View File

@ -26,9 +26,9 @@
var CocosBuilderTestScene = TestScene.extend({
runThisTest:function(){
cc.BuilderReader.setResourcePath("res/");
//cc.BuilderReader.setResourcePath("res/");
var node = cc.BuilderReader.load("res/ccb/HelloCocosBuilder.ccbi", this);
var node = cc.BuilderReader.load("ccb/HelloCocosBuilder.ccbi", this);
if(node != null) {
this.addChild(node);

16
tests/js-tests/src/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayer.js
View File

@ -26,7 +26,7 @@
cc.BuilderReader.registerController("HelloCocosBuilderLayer", {
_openTest : function(ccbFileName) {
cc.BuilderReader.setResourcePath("res/");
//cc.BuilderReader.setResourcePath("res/");
var node = cc.BuilderReader.load(ccbFileName, this);
this["mTestTitleLabelTTF"].setString(ccbFileName);
@ -39,31 +39,31 @@ cc.BuilderReader.registerController("HelloCocosBuilderLayer", {
},
"onMenuTestClicked" : function() {
this._openTest("res/ccb/ccb/TestMenus.ccbi");
this._openTest("ccb/ccb/TestMenus.ccbi");
},
"onSpriteTestClicked" : function() {
this._openTest("res/ccb/ccb/TestSprites.ccbi");
this._openTest("ccb/ccb/TestSprites.ccbi");
},
"onButtonTestClicked" : function() {
this._openTest("res/ccb/ccb/TestButtons.ccbi");
this._openTest("ccb/ccb/TestButtons.ccbi");
},
"onAnimationsTestClicked" : function() {
this._openTest("res/ccb/ccb/TestAnimations.ccbi");
this._openTest("ccb/ccb/TestAnimations.ccbi");
},
"onParticleSystemTestClicked" : function() {
this._openTest("res/ccb/ccb/TestParticleSystems.ccbi");
this._openTest("ccb/ccb/TestParticleSystems.ccbi");
},
"onScrollViewTestClicked" : function() {
this._openTest("res/ccb/ccb/TestScrollViews.ccbi");
this._openTest("ccb/ccb/TestScrollViews.ccbi");
},
"onTimelineCallbackSoundClicked" : function() {
this._openTest("res/ccb/ccb/TestTimelineCallback.ccbi");
this._openTest("ccb/ccb/TestTimelineCallback.ccbi");
}
});

2
tests/js-tests/src/ExtensionsTest/ControlExtensionTest/CCControlColourPickerTest/CCControlColourPickerTest.js
View File

@ -53,7 +53,7 @@ var ControlColourPickerTest = ControlScene.extend({
layer_width += colourPicker.width;
// Add the black background for the text
var background = new cc.Scale9Sprite("res/extensions/buttonBackground.png");
var background = new cc.Scale9Sprite("extensions/buttonBackground.png");
background.width = 150;
background.height = 50;
background.x = layer_width + background.width / 2.0;

8
tests/js-tests/src/ExtensionsTest/ControlExtensionTest/CCControlPotentiometerTest/CCControlPotentiometerTest.js
View File

@ -38,7 +38,7 @@ var ControlPotentiometerTest = ControlScene.extend({
var layer_width = 0;
// Add the black background for the text
var background = new cc.Scale9Sprite("res/extensions/buttonBackground.png");
var background = new cc.Scale9Sprite("extensions/buttonBackground.png");
background.width = 80;
background.height = 50;
background.x = layer_width + background.width / 2.0;
@ -54,9 +54,9 @@ var ControlPotentiometerTest = ControlScene.extend({
layer.addChild(this._displayValueLabel);
// Add the slider
var potentiometer = new cc.ControlPotentiometer("res/extensions/potentiometerTrack.png"
, "res/extensions/potentiometerProgress.png"
, "res/extensions/potentiometerButton.png");
var potentiometer = new cc.ControlPotentiometer("extensions/potentiometerTrack.png"
, "extensions/potentiometerProgress.png"
, "extensions/potentiometerButton.png");
potentiometer.x = layer_width + 10 + potentiometer.width / 2;
potentiometer.y = 0;

4
tests/js-tests/src/ExtensionsTest/ControlExtensionTest/CCControlSliderTest/CCControlSliderTest.js
View File

@ -40,7 +40,7 @@ var ControlSliderTest = ControlScene.extend({
this.addChild(this._displayValueLabel);
// Add the slider
var slider = new cc.ControlSlider("res/extensions/sliderTrack.png", "res/extensions/sliderProgress.png", "res/extensions/sliderThumb.png");
var slider = new cc.ControlSlider("extensions/sliderTrack.png", "extensions/sliderProgress.png", "extensions/sliderThumb.png");
slider.anchorX = 0.5;
slider.anchorY = 1.0;
slider.setMinimumValue(0.0); // Sets the min value of range
@ -52,7 +52,7 @@ var ControlSliderTest = ControlScene.extend({
// When the value of the slider will change, the given selector will be call
slider.addTargetWithActionForControlEvents(this, this.valueChanged, cc.CONTROL_EVENT_VALUECHANGED);
var restrictSlider = new cc.ControlSlider("res/extensions/sliderTrack.png", "res/extensions/sliderProgress.png", "res/extensions/sliderThumb.png");
var restrictSlider = new cc.ControlSlider("extensions/sliderTrack.png", "extensions/sliderProgress.png", "extensions/sliderThumb.png");
restrictSlider.anchorX = 0.5;
restrictSlider.anchorY = 1.0;
restrictSlider.setMinimumValue(0.0); // Sets the min value of range

6
tests/js-tests/src/ExtensionsTest/ControlExtensionTest/CCControlStepperTest/CCControlStepperTest.js
View File

@ -36,7 +36,7 @@ var ControlStepperTest = ControlScene.extend({
var layer_width = 0;
// Add the black background for the text
var background = new cc.Scale9Sprite("res/extensions/buttonBackground.png");
var background = new cc.Scale9Sprite("extensions/buttonBackground.png");
background.width = 100;
background.height = 50;
background.x = layer_width + background.width / 2.0;
@ -72,8 +72,8 @@ var ControlStepperTest = ControlScene.extend({
return false;
},
makeControlStepper:function () {
var minusSprite = new cc.Sprite("res/extensions/stepper-minus.png");
var plusSprite = new cc.Sprite("res/extensions/stepper-plus.png");
var minusSprite = new cc.Sprite("extensions/stepper-minus.png");
var plusSprite = new cc.Sprite("extensions/stepper-plus.png");
return new cc.ControlStepper(minusSprite, plusSprite);
},

10
tests/js-tests/src/ExtensionsTest/ControlExtensionTest/CCControlSwitchTest/CCControlSwitchTest.js
View File

@ -37,7 +37,7 @@ var ControlSwitchTest = ControlScene.extend({
var layer_width = 0;
// Add the black background for the text
var background = new cc.Scale9Sprite("res/extensions/buttonBackground.png");
var background = new cc.Scale9Sprite("extensions/buttonBackground.png");
background.width = 80;
background.height = 50;
background.x = layer_width + background.width / 2.0;
@ -56,10 +56,10 @@ var ControlSwitchTest = ControlScene.extend({
// Create the switch
var switchControl = new cc.ControlSwitch
(
new cc.Sprite("res/extensions/switch-mask.png"),
new cc.Sprite("res/extensions/switch-on.png"),
new cc.Sprite("res/extensions/switch-off.png"),
new cc.Sprite("res/extensions/switch-thumb.png"),
new cc.Sprite("extensions/switch-mask.png"),
new cc.Sprite("extensions/switch-on.png"),
new cc.Sprite("extensions/switch-off.png"),
new cc.Sprite("extensions/switch-thumb.png"),
new cc.LabelTTF("On", "Arial-BoldMT", 16),
new cc.LabelTTF("Off", "Arial-BoldMT", 16)
);

8
tests/js-tests/src/ExtensionsTest/EditBoxTest/EditBoxTest.js
View File

@ -37,7 +37,7 @@ var EditBoxTestLayer = cc.Layer.extend({
},
init: function () {
this._box1 = new cc.EditBox(cc.size(170, 50), new cc.Scale9Sprite("res/extensions/green_edit.png"), new cc.Scale9Sprite("res/extensions/orange_edit.png"));
this._box1 = new cc.EditBox(cc.size(170, 50), new cc.Scale9Sprite("extensions/green_edit.png"), new cc.Scale9Sprite("extensions/orange_edit.png"));
this._box1.setString("EditBoxs");
this._box1.x = 220;
this._box1.y = 50;
@ -45,7 +45,7 @@ var EditBoxTestLayer = cc.Layer.extend({
this._box1.setDelegate(this);
this.addChild(this._box1);
this._box2 = new cc.EditBox(cc.size(130, 40), new cc.Scale9Sprite("res/extensions/green_edit.png"));
this._box2 = new cc.EditBox(cc.size(130, 40), new cc.Scale9Sprite("extensions/green_edit.png"));
this._box2.setString("EditBox Sample");
this._box2.x = 220;
this._box2.y = 190;
@ -56,7 +56,7 @@ var EditBoxTestLayer = cc.Layer.extend({
this._box2.setDelegate(this);
this.addChild(this._box2);
this._box3 = new cc.EditBox(cc.size(65, 40), new cc.Scale9Sprite("res/extensions/orange_edit.png"));
this._box3 = new cc.EditBox(cc.size(65, 40), new cc.Scale9Sprite("extensions/orange_edit.png"));
this._box3.setString("Image");
this._box3.x = 220;
this._box3.y = 250;
@ -64,7 +64,7 @@ var EditBoxTestLayer = cc.Layer.extend({
this._box3.setDelegate(this);
this.addChild(this._box3);
this._box4 = new cc.EditBox(cc.size(180, 40), new cc.Scale9Sprite("res/extensions/yellow_edit.png"));
this._box4 = new cc.EditBox(cc.size(180, 40), new cc.Scale9Sprite("extensions/yellow_edit.png"));
this._box4.setPlaceholderFontColor(cc.color(255, 0, 0));
this._box4.setPlaceHolder("Tooltip:");
this._box4.x = 40;

12
tests/js-tests/src/ExtensionsTest/S9SpriteTest/S9SpriteTest.js
View File

@ -113,8 +113,8 @@ var S9BatchNodeBasic = S9SpriteTestDemo.extend({
cc.log("S9BatchNodeBasic ...");
var batchNode = new cc.SpriteBatchNode("res/Images/blocks9.png");
cc.log("batchNode created with : " + "res/Images/blocks9.png");
var batchNode = new cc.SpriteBatchNode("Images/blocks9.png");
cc.log("batchNode created with : " + "Images/blocks9.png");
var blocks = new cc.Scale9Sprite();
cc.log("... created");
@ -207,8 +207,8 @@ var S9BatchNodeScaledNoInsets = S9SpriteTestDemo.extend({
cc.log("S9BatchNodeScaledNoInsets ...");
// scaled without insets
var batchNode_scaled = new cc.SpriteBatchNode("res/Images/blocks9.png");
cc.log("batchNode_scaled created with : " + "res/Images/blocks9.png");
var batchNode_scaled = new cc.SpriteBatchNode("Images/blocks9.png");
cc.log("batchNode_scaled created with : " + "Images/blocks9.png");
var blocks_scaled = new cc.Scale9Sprite();
cc.log("... created");
@ -312,8 +312,8 @@ var S9BatchNodeScaleWithCapInsets = S9SpriteTestDemo.extend({
cc.log("S9BatchNodeScaleWithCapInsets ...");
var batchNode_scaled_with_insets = new cc.SpriteBatchNode("res/Images/blocks9.png");
cc.log("batchNode_scaled_with_insets created with : " + "res/Images/blocks9.png");
var batchNode_scaled_with_insets = new cc.SpriteBatchNode("Images/blocks9.png");
cc.log("batchNode_scaled_with_insets created with : " + "Images/blocks9.png");
var blocks_scaled_with_insets = new cc.Scale9Sprite();
cc.log("... created");

4
tests/js-tests/src/FacebookTest/FacebookTestsManager.js
View File

@ -43,8 +43,8 @@ FacebookTestScene = TestScene.extend({
if(!cc.sys.isNative) { //browser
cc.loader.loadJs('', [
"../../frameworks/cocos2d-html5/external/pluginx/platform/facebook_sdk.js",
"../../frameworks/cocos2d-html5/external/pluginx/platform/facebook.js"
"../../../web/external/pluginx/platform/facebook_sdk.js",
"../../../web/external/pluginx/platform/facebook.js"
], function() {
var layer = nextFacebookTest();
self.addChild(layer);

2
tests/js-tests/src/GUITest/UIVideoPlayerTest/UIVideoPlayerTest.js
View File

@ -3,7 +3,7 @@ var UIVideoPlayerTest = UIScene.extend({
onEnter: function(){
UIScene.prototype.onEnter.call(this);
var video = new ccui.VideoPlayer("res/cocosui/UITest/movie.mp4");
var video = new ccui.VideoPlayer("../cpp-tests/Resources/cocosui/UITest/movie.mp4");
video.setContentSize(320, 240);
video.setPosition(800/2, 450/2);
video.setScale(0.5);

42
tests/js-tests/src/NewEventManagerTest/NewEventManagerTest.js
View File

@ -75,16 +75,16 @@ var TouchableSpriteTest = EventDispatcherTestDemo.extend({
var size = director.getVisibleSize();
var containerForSprite1 = new cc.Node();
var sprite1 = new cc.Sprite("res/Images/CyanSquare.png");
var sprite1 = new cc.Sprite("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 cc.Sprite("res/Images/MagentaSquare.png");
var sprite2 = new cc.Sprite("Images/MagentaSquare.png");
sprite2.setPosition(origin.x + size.width/2, origin.y + size.height/2);
this.addChild(sprite2, 20);
var sprite3 = new cc.Sprite("res/Images/YellowSquare.png");
var sprite3 = new cc.Sprite("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("res/Images/CyanSquare.png");
sprite1.setTexture("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("res/Images/MagentaSquare.png");
sprite2.setTexture("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("res/Images/YellowSquare.png");
sprite3.setTexture("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 cc.Sprite("res/Images/CyanSquare.png");
var sprite1 = new cc.Sprite("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 cc.Sprite("res/Images/ball.png");
var sprite = new cc.Sprite("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 cc.Sprite("res/Images/CyanSquare.png");
this._sprite = new cc.Sprite("Images/CyanSquare.png");
this._sprite.setPosition(origin.x + size.width/2, origin.y + size.height/2);
this.addChild(this._sprite, 10);
@ -885,11 +885,11 @@ var GlobalZTouchTest = EventDispatcherTestDemo.extend({
var SPRITE_COUNT = 8, sprite;
for (var i = 0; i < SPRITE_COUNT; i++) {
if(i==4) {
sprite = new cc.Sprite("res/Images/CyanSquare.png");
sprite = new cc.Sprite("Images/CyanSquare.png");
this._sprite = sprite;
this._sprite.setGlobalZOrder(-1);
} else
sprite = new cc.Sprite("res/Images/YellowSquare.png");
sprite = new cc.Sprite("Images/YellowSquare.png");
cc.eventManager.addListener(listener.clone(), sprite);
this.addChild(sprite);
@ -1005,17 +1005,17 @@ var StopPropagationTest = EventDispatcherTestDemo.extend({
for (var i = 0; i < SPRITE_COUNT; i++) {
if(i==4) {
sprite1 = new cc.Sprite("res/Images/CyanSquare.png");
sprite1 = new cc.Sprite("Images/CyanSquare.png");
sprite1.setTag(StopPropagationTest._TAG_BLUE_SPRITE);
this.addChild(sprite1, 100);
sprite2 = new cc.Sprite("res/Images/CyanSquare.png");
sprite2 = new cc.Sprite("Images/CyanSquare.png");
sprite2.setTag(StopPropagationTest._TAG_BLUE_SPRITE2);
this.addChild(sprite2, 100);
} else {
sprite1 = new cc.Sprite("res/Images/YellowSquare.png");
sprite1 = new cc.Sprite("Images/YellowSquare.png");
this.addChild(sprite1, 0);
sprite2 = new cc.Sprite("res/Images/YellowSquare.png");
sprite2 = new cc.Sprite("Images/YellowSquare.png");
this.addChild(sprite2, 0);
}
@ -1075,20 +1075,20 @@ var Issue4160 = EventDispatcherTestDemo.extend({
var size = cc.director.getVisibleSize();
var sprite1 = TouchableSprite.create(-30);
sprite1.setTexture("res/Images/CyanSquare.png");
sprite1.setTexture("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("res/Images/MagentaSquare.png");
sprite2.setTexture("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("res/Images/YellowSquare.png");
sprite3.setTexture("Images/YellowSquare.png");
sprite3.x = 0;
sprite3.y = 0;
sprite2.addChild(sprite3, 21);
@ -1119,19 +1119,19 @@ var PauseResumeTargetTest = EventDispatcherTestDemo.extend({
var size = cc.director.getVisibleSize();
var sprite1 = TouchableSprite.create();
sprite1.setTexture("res/Images/CyanSquare.png");
sprite1.setTexture("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("res/Images/MagentaSquare.png");
sprite2.setTexture("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("res/Images/YellowSquare.png");
sprite3.setTexture("Images/YellowSquare.png");
sprite3.x = 0;
sprite3.y = 0;
sprite2.addChild(sprite3, -1);

24
tests/js-tests/src/OpenGLTest/OpenGLTest.js
View File

@ -638,7 +638,7 @@ var ShaderHeartTest = OpenGLTestLayer.extend({
this._super();
if( 'opengl' in cc.sys.capabilities ) {
var shaderNode = new ShaderNode("res/Shaders/example_Heart.vsh", "res/Shaders/example_Heart.fsh");
var shaderNode = new ShaderNode("../../js-tests/res/Shaders/example_Heart.vsh", "../../js-tests/res/Shaders/example_Heart.fsh");
this.addChild(shaderNode,10);
shaderNode.x = winSize.width/2;
shaderNode.y = winSize.height/2;
@ -678,7 +678,7 @@ var ShaderMandelbrotTest = OpenGLTestLayer.extend({
this._super();
if( 'opengl' in cc.sys.capabilities ) {
var shaderNode = new ShaderNode("res/Shaders/example_Mandelbrot.vsh", "res/Shaders/example_Mandelbrot.fsh");
var shaderNode = new ShaderNode("../../js-tests/res/Shaders/example_Mandelbrot.vsh", "../../js-tests/res/Shaders/example_Mandelbrot.fsh");
this.addChild(shaderNode,10);
shaderNode.x = winSize.width/2;
shaderNode.y = winSize.height/2;
@ -713,7 +713,7 @@ var ShaderMonjoriTest = OpenGLTestLayer.extend({
this._super();
if( 'opengl' in cc.sys.capabilities ) {
var shaderNode = new ShaderNode("res/Shaders/example_Monjori.vsh", "res/Shaders/example_Monjori.fsh");
var shaderNode = new ShaderNode("../../js-tests/res/Shaders/example_Monjori.vsh", "../../js-tests/res/Shaders/example_Monjori.fsh");
this.addChild(shaderNode,10);
shaderNode.x = winSize.width/2;
shaderNode.y = winSize.height/2;
@ -748,7 +748,7 @@ var ShaderPlasmaTest = OpenGLTestLayer.extend({
this._super();
if( 'opengl' in cc.sys.capabilities ) {
var shaderNode = new ShaderNode("res/Shaders/example_Plasma.vsh", "res/Shaders/example_Plasma.fsh");
var shaderNode = new ShaderNode("../../js-tests/res/Shaders/example_Plasma.vsh", "../../js-tests/res/Shaders/example_Plasma.fsh");
this.addChild(shaderNode,10);
shaderNode.x = winSize.width/2;
shaderNode.y = winSize.height/2;
@ -787,7 +787,7 @@ var ShaderFlowerTest = OpenGLTestLayer.extend({
if( 'opengl' in cc.sys.capabilities ) {
var shaderNode = new ShaderNode("res/Shaders/example_Flower.vsh", "res/Shaders/example_Flower.fsh");
var shaderNode = new ShaderNode("../../js-tests/res/Shaders/example_Flower.vsh", "../../js-tests/res/Shaders/example_Flower.fsh");
this.addChild(shaderNode,10);
shaderNode.x = winSize.width/2;
shaderNode.y = winSize.height/2;
@ -826,7 +826,7 @@ var ShaderJuliaTest = OpenGLTestLayer.extend({
if( 'opengl' in cc.sys.capabilities ) {
var shaderNode = new ShaderNode("res/Shaders/example_Julia.vsh", "res/Shaders/example_Julia.fsh");
var shaderNode = new ShaderNode("../../js-tests/res/Shaders/example_Julia.vsh", "../../js-tests/res/Shaders/example_Julia.fsh");
this.addChild(shaderNode,10);
shaderNode.x = winSize.width/2;
shaderNode.y = winSize.height/2;
@ -867,12 +867,12 @@ var ShaderOutlineEffect = OpenGLTestLayer.extend({
if( 'opengl' in cc.sys.capabilities ) {
if(cc.sys.isNative){
this.shader = new cc.GLProgram("res/Shaders/example_Outline_noMVP.vsh", "res/Shaders/example_Outline.fsh");
this.shader = new cc.GLProgram("../../js-tests/res/Shaders/example_Outline_noMVP.vsh", "../../js-tests/res/Shaders/example_Outline.fsh");
this.shader.link();
this.shader.updateUniforms();
}
else{
this.shader = new cc.GLProgram("res/Shaders/example_Outline.vsh", "res/Shaders/example_Outline.fsh");
this.shader = new cc.GLProgram("../../js-tests/res/Shaders/example_Outline.vsh", "../../js-tests/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);
@ -884,7 +884,7 @@ var ShaderOutlineEffect = OpenGLTestLayer.extend({
this.shader.setUniformLocationWith3f(this.shader.getUniformLocationForName('u_outlineColor'), 0 / 255, 255 / 255, 0 / 255);
}
this.sprite = new cc.Sprite('res/Images/grossini.png');
this.sprite = new cc.Sprite('Images/grossini.png');
this.sprite.attr({
x: winSize.width / 2,
y: winSize.height / 2
@ -943,13 +943,13 @@ var ShaderRetroEffect = OpenGLTestLayer.extend({
this._super();
if( 'opengl' in cc.sys.capabilities ) {
var program = new cc.GLProgram("res/Shaders/example_ColorBars.vsh", "res/Shaders/example_ColorBars.fsh");
var program = new cc.GLProgram("../../js-tests/res/Shaders/example_ColorBars.vsh", "../../js-tests/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","res/fonts/west_england-64.fnt");
var label = new cc.LabelBMFont("RETRO EFFECT","fonts/west_england-64.fnt");
if(cc.sys.isNative)
label.children[0].shaderProgram = program;
@ -1013,7 +1013,7 @@ var GLGetActiveTest = OpenGLTestLayer.extend({
this._super();
if( 'opengl' in cc.sys.capabilities ) {
var sprite = this.sprite = new cc.Sprite("res/Images/grossini.png");
var sprite = this.sprite = new cc.Sprite("Images/grossini.png");
sprite.x = winSize.width/2;
sprite.y = winSize.height/2;
this.addChild( sprite );

6
tests/js-tests/src/Particle3DTest/Particle3DTest.js
View File

@ -29,9 +29,9 @@ var Particle3DTestIdx = -1;
const PARTICLE_SYSTEM_TAG = 0x0001;
jsb.fileUtils.addSearchPath("res/Sprite3DTest");
jsb.fileUtils.addSearchPath("res/Particle3D/materials");
jsb.fileUtils.addSearchPath("res/Particle3D/scripts");
jsb.fileUtils.addSearchPath("../cpp-tests/Resources/Sprite3DTest");
jsb.fileUtils.addSearchPath("../cpp-tests/Resources/Particle3D/materials");
jsb.fileUtils.addSearchPath("../cpp-tests/Resources/Particle3D/scripts");
var Particle3DTestDemo = cc.Layer.extend({
_title:"Particle3D Test",

2
tests/js-tests/src/PerformanceTest/PerformanceAnimationTest.js
View File

@ -177,7 +177,7 @@ var CharacterView = cc.Node.extend({
init: function() {
this._super();
cc.spriteFrameCache.addSpriteFrames("res/animations/crystals.plist");
cc.spriteFrameCache.addSpriteFrames("animations/crystals.plist");
var i = 0;
rightData = new Array(10);
for (i = 0; i < 10; i++) {

4
tests/js-tests/src/PerformanceTest/PerformanceNodeChildrenTest.js
View File

@ -205,7 +205,7 @@ var IterateSpriteSheet = NodeChildrenMainScene.extend({
this._currentQuantityOfNodes = this._quantityOfNodes;
},
initWithQuantityOfNodes:function (nodes) {
this._batchNode = new cc.SpriteBatchNode("res/Images/spritesheet1.png");
this._batchNode = new cc.SpriteBatchNode("Images/spritesheet1.png");
this.addChild(this._batchNode);
this._super(nodes);
@ -328,7 +328,7 @@ var AddRemoveSpriteSheet = NodeChildrenMainScene.extend({
this._currentQuantityOfNodes = this._quantityOfNodes;
},
initWithQuantityOfNodes:function (nodes) {
this._batchNode = new cc.SpriteBatchNode("res/Images/spritesheet1.png");
this._batchNode = new cc.SpriteBatchNode("Images/spritesheet1.png");
this.addChild(this._batchNode);
this._super(nodes);

10
tests/js-tests/src/PerformanceTest/PerformanceParticleTest.js
View File

@ -108,7 +108,7 @@ var ParticleMainScene = cc.Scene.extend({
this.addChild(infoLabel, 1, TAG_INFO_LAYER);
// particles on stage
var labelAtlas = new cc.LabelAtlas("0000", "res/Images/fps_images.png", 16, 24, '.');
var labelAtlas = new cc.LabelAtlas("0000", "Images/fps_images.png", 16, 24, '.');
// var labelAtlas = cc.LabelTTF.create("0000", "Marker Felt", 30);
this.addChild(labelAtlas, 0, TAG_LABEL_ATLAS);
labelAtlas.x = s.width - 66;
@ -173,7 +173,7 @@ var ParticleMainScene = cc.Scene.extend({
this.removeChildByTag(TAG_PARTICLE_SYSTEM, true);
// remove the "fire.png" from the TextureCache cache.
//var texture = cc.textureCache.addImage("res/Images/fire.png");
//var texture = cc.textureCache.addImage("Images/fire.png");
//cc.textureCache.removeTexture(texture);
var particleSystem = new cc.ParticleSystem(this._quantityParticles);
@ -182,17 +182,17 @@ var ParticleMainScene = cc.Scene.extend({
case 1:
if ("opengl" in cc.sys.capabilities)
cc.Texture2D.defaultPixelFormat = cc.Texture2D.PIXEL_FORMAT_RGBA8888;
particleSystem.texture = cc.textureCache.addImage("res/Images/fire.png");
particleSystem.texture = cc.textureCache.addImage("Images/fire.png");
break;
case 2:
if ("opengl" in cc.sys.capabilities)
cc.Texture2D.defaultPixelFormat = cc.Texture2D.PIXEL_FORMAT_RGBA4444;
particleSystem.texture = cc.textureCache.addImage("res/Images/fire.png");
particleSystem.texture = cc.textureCache.addImage("Images/fire.png");
break;
case 3:
if ("opengl" in cc.sys.capabilities)
cc.Texture2D.defaultPixelFormat = cc.Texture2D.PIXEL_FORMAT_A8;
particleSystem.texture = cc.textureCache.addImage("res/Images/fire.png");
particleSystem.texture = cc.textureCache.addImage("Images/fire.png");
break;
default:
particleSystem = null;

24
tests/js-tests/src/PerformanceTest/PerformanceSpriteTest.js
View File

@ -76,7 +76,7 @@ var SubTest = cc.Class.extend({
switch (this._subtestNumber) {
case 1:
{
sprite = new cc.Sprite("res/Images/grossinis_sister1.png");
sprite = new cc.Sprite("Images/grossinis_sister1.png");
this._parent.addChild(sprite, 0, tag + 100);
break;
}
@ -91,7 +91,7 @@ var SubTest = cc.Class.extend({
{
var idx = parseInt(Math.random() * 14) + 1;
idx = idx < 10 ? "0" + idx : idx.toString();
var str = "res/Images/grossini_dance_" + idx + ".png";
var str = "Images/grossini_dance_" + idx + ".png";
sprite = new cc.Sprite(str);
this._parent.addChild(sprite, 0, tag + 100);
break;
@ -115,7 +115,7 @@ var SubTest = cc.Class.extend({
y = parseInt(r / 8);
x = parseInt(r % 8);
var str = "res/Images/sprites_test/sprite-" + x + "-" + y + ".png";
var str = "Images/sprites_test/sprite-" + x + "-" + y + ".png";
sprite = new cc.Sprite(str);
this._parent.addChild(sprite, 0, tag + 100);
break;
@ -170,9 +170,9 @@ var SubTest = cc.Class.extend({
// [mgr removeAllTextures];
if ( cc.sys.isNative) {
var mgr = cc.textureCache;
mgr.removeTexture(mgr.addImage("res/Images/grossinis_sister1.png"));
mgr.removeTexture(mgr.addImage("res/Images/grossini_dance_atlas.png"));
mgr.removeTexture(mgr.addImage("res/Images/spritesheet1.png"));
mgr.removeTexture(mgr.addImage("Images/grossinis_sister1.png"));
mgr.removeTexture(mgr.addImage("Images/grossini_dance_atlas.png"));
mgr.removeTexture(mgr.addImage("Images/spritesheet1.png"));
}
switch (this._subtestNumber) {
@ -184,13 +184,13 @@ var SubTest = cc.Class.extend({
case 2:
if( "opengl" in cc.sys.capabilities )
cc.Texture2D.defaultPixelFormat = cc.Texture2D.PIXEL_FORMAT_RGBA8888;
this._batchNode = new cc.SpriteBatchNode("res/Images/grossinis_sister1.png", 500);
this._batchNode = new cc.SpriteBatchNode("Images/grossinis_sister1.png", 500);
p.addChild(this._batchNode, 0);
break;
case 3:
if( "opengl" in cc.sys.capabilities )
cc.Texture2D.defaultPixelFormat = cc.Texture2D.PIXEL_FORMAT_RGBA4444;
this._batchNode = new cc.SpriteBatchNode("res/Images/grossinis_sister1.png", 500);
this._batchNode = new cc.SpriteBatchNode("Images/grossinis_sister1.png", 500);
p.addChild(this._batchNode, 0);
break;
@ -198,13 +198,13 @@ var SubTest = cc.Class.extend({
case 5:
if( "opengl" in cc.sys.capabilities )
cc.Texture2D.defaultPixelFormat = cc.Texture2D.PIXEL_FORMAT_RGBA8888;
this._batchNode = new cc.SpriteBatchNode("res/Images/grossini_dance_atlas.png", 500);
this._batchNode = new cc.SpriteBatchNode("Images/grossini_dance_atlas.png", 500);
p.addChild(this._batchNode, 0);
break;
case 6:
if( "opengl" in cc.sys.capabilities )
cc.Texture2D.defaultPixelFormat = cc.Texture2D.PIXEL_FORMAT_RGBA4444;
this._batchNode = new cc.SpriteBatchNode("res/Images/grossini_dance_atlas.png", 500);
this._batchNode = new cc.SpriteBatchNode("Images/grossini_dance_atlas.png", 500);
p.addChild(this._batchNode, 0);
break;
@ -212,13 +212,13 @@ var SubTest = cc.Class.extend({
case 8:
if( "opengl" in cc.sys.capabilities )
cc.Texture2D.defaultPixelFormat = cc.Texture2D.PIXEL_FORMAT_RGBA8888;
this._batchNode = new cc.SpriteBatchNode("res/Images/spritesheet1.png", 500);
this._batchNode = new cc.SpriteBatchNode("Images/spritesheet1.png", 500);
p.addChild(this._batchNode, 0);
break;
case 9:
if( "opengl" in cc.sys.capabilities )
cc.Texture2D.defaultPixelFormat = cc.Texture2D.PIXEL_FORMAT_RGBA4444;
this._batchNode = new cc.SpriteBatchNode("res/Images/spritesheet1.png", 500);
this._batchNode = new cc.SpriteBatchNode("Images/spritesheet1.png", 500);
p.addChild(this._batchNode, 0);
break;

6
tests/js-tests/src/PerformanceTest/PerformanceSpriteTest2.js
View File

@ -206,7 +206,7 @@ var PerformanceSpriteTest1 = PerformanceTestBase.extend({
this.addChild(parent,0,10);
for( var i=0; i<num; i++) {
var sprite = new cc.Sprite('res/Images/grossini.png');
var sprite = new cc.Sprite('Images/grossini.png');
parent.addChild( sprite );
var x = Math.random() * winSize.width;
@ -227,10 +227,10 @@ var PerformanceSpriteTest1 = PerformanceTestBase.extend({
// use the same seed for the tests
Math.seedrandom('perftest');
var parent = new cc.SpriteBatchNode('res/Images/grossini.png',num);
var parent = new cc.SpriteBatchNode('Images/grossini.png',num);
this.addChild(parent,0,10);
for( var i=0; i<num; i++) {
var sprite = new cc.Sprite('res/Images/grossini.png');
var sprite = new cc.Sprite('Images/grossini.png');
parent.addChild( sprite );
var x = Math.random() * winSize.width;

8
tests/js-tests/src/PerformanceTest/PerformanceTextureTest.js
View File

@ -88,18 +88,18 @@ var TextureTest = TextureMenuLayer.extend({
performTests:function () {
cc.log("--------");
cc.log("--- PNG 128x128 ---");
this.performTestsPNG("res/Images/test_image.png");
this.performTestsPNG("Images/test_image.png");
cc.log("--- PNG 512x512 ---");
this.performTestsPNG("res/Images/texture512x512.png");
this.performTestsPNG("Images/texture512x512.png");
cc.log("EMPTY IMAGE");
cc.log("--- PNG 1024x1024 ---");
this.performTestsPNG("res/Images/texture1024x1024.png");
this.performTestsPNG("Images/texture1024x1024.png");
cc.log("LANDSCAPE IMAGE");
cc.log("--- PNG 1024x1024 ---");
this.performTestsPNG("res/Images/landscape-1024x1024.png");
this.performTestsPNG("Images/landscape-1024x1024.png");
},
title:function () {
return "Texture Performance Test";

2
tests/js-tests/src/PerformanceTest/PerformanceVirtualMachineTest.js
View File

@ -97,7 +97,7 @@ var VirtualMachineTestMainScene = cc.Scene.extend({
},
initWithQuantityOfNodes:function (nodes) {
this._batchNode = new cc.SpriteBatchNode("res/Images/grossinis_sister1.png");
this._batchNode = new cc.SpriteBatchNode("Images/grossinis_sister1.png");
this.addChild(this._batchNode);
//srand(time());

2
tests/js-tests/src/Presentation/Presentation.js
View File

@ -481,7 +481,7 @@ var ParticlesPage = function() {
meteor.x = winSize.width*3/4;
meteor.y = winSize.height/2;
var flower = new cc.ParticleSystem("res/Particles/Flower.plist");
var flower = new cc.ParticleSystem("../cpp-tests/Resources/Particles/Flower.plist");
this.addChild( flower );
flower.x = centerPos.x;
flower.y = centerPos.y;

6
tests/js-tests/src/SchedulerTest/SchedulerTest.js
View File

@ -557,9 +557,9 @@ var SchedulerTimeScale = SchedulerTestLayer.extend({
var action2 = action.clone();
var action3 = action.clone();
var grossini = new cc.Sprite("res/Images/grossini.png");
var tamara = new cc.Sprite("res/Images/grossinis_sister1.png");
var kathia = new cc.Sprite("res/Images/grossinis_sister2.png");
var grossini = new cc.Sprite("Images/grossini.png");
var tamara = new cc.Sprite("Images/grossinis_sister1.png");
var kathia = new cc.Sprite("Images/grossinis_sister2.png");
grossini.setActionManager(this._newActionManager);
grossini.setScheduler(this._newScheduler);

6
tests/js-tests/src/SpineTest/SpineTest.js
View File

@ -87,7 +87,7 @@ var SpineTestLayerNormal = SpineTestLayer.extend({
// Make Spine's Animated skeleton Node
// You need 'json + atlas + image' resource files to make it.
// No JS binding for spine-c in this version. So, only file loading is supported.
var spineBoy = new sp.SkeletonAnimation('res/skeletons/spineboy.json', 'res/skeletons/spineboy.atlas');
var spineBoy = new sp.SkeletonAnimation('spine/spineboy.json', 'spine/spineboy.atlas');
spineBoy.setPosition(cc.p(size.width / 2, size.height / 2 - 150));
spineBoy.setMix('walk', 'jump', 0.2);
spineBoy.setMix('jump', 'run', 0.2);
@ -203,7 +203,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.SkeletonAnimation("res/skeletons/goblins-ffd.json", "res/skeletons/goblins-ffd.atlas", 1.5);
var skeletonNode = new sp.SkeletonAnimation("spine/goblins-ffd.json", "spine/goblins-ffd.atlas", 1.5);
skeletonNode.setAnimation(0, "walk", true);
skeletonNode.setSkin("goblin");
@ -247,7 +247,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.SkeletonAnimation("res/skeletons/goblins-ffd.json", "res/skeletons/goblins-ffd.atlas", 1.5);
var skeletonNode = new sp.SkeletonAnimation("spine/goblins-ffd.json", "spine/goblins-ffd.atlas", 1.5);
skeletonNode.setAnimation(0, "walk", true);
skeletonNode.setSkin("goblin");

2
tests/js-tests/src/SpriteTest/SpriteTest.js
View File

@ -5343,7 +5343,7 @@ var SpriteBlendFuncTest = SpriteTestDemo.extend({
var destTitles = ["ZERO", "ONE", "SRC_COLOR", "ONE_MINUS_SRC_COLOR", "SRC_ALPHA", "ONE_MINUS_SRC_ALPHA"],
srcTitles = ["ZERO", "ONE", "DST_COLOR", "ONE_MINUS_DST_COLOR", "SRC_ALPHA", "ONE_MINUS_SRC_ALPHA"];
var sourceImg = "res/Images/dot.png", destImg = "res/Images/wood.jpg";
var sourceImg = "Images/dot.png", destImg = "Images/wood.jpg";
var sourceTexture = cc.textureCache.addImage(sourceImg);
sourceTexture.handleLoadedTexture(true);
var sourceSprite = new cc.Sprite(sourceImg);

80
tests/js-tests/src/TextureCacheTest/TextureCacheTest.js
View File

@ -74,57 +74,57 @@ var TextureCacheTest = TextureCacheTestBase.extend({
var texCache = cc.textureCache;
// load textrues
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("res/Images/background3.png", this.loadingCallBack, this);
texCache.addImageAsync("res/Images/blocks.png", this.loadingCallBack, this);
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("Images/background1.png", this.loadingCallBack, this);
texCache.addImageAsync("Images/background2.png", this.loadingCallBack, this);
texCache.addImageAsync("Images/background3.png", this.loadingCallBack, this);
texCache.addImageAsync("Images/blocks.png", this.loadingCallBack, this);
},
addSprite:function () {
var size = cc.director.getWinSize();
// create sprites
var bg = new cc.Sprite("res/Images/HelloWorld.png");
var bg = new cc.Sprite("Images/HelloWorld.png");
bg.x = size.width / 2;
bg.y = size.height / 2;
//bg.scale = 1.7;
var s1 = new cc.Sprite("res/Images/grossini.png");
var s2 = new cc.Sprite("res/Images/grossini_dance_01.png");
var s3 = new cc.Sprite("res/Images/grossini_dance_02.png");
var s4 = new cc.Sprite("res/Images/grossini_dance_03.png");
var s5 = new cc.Sprite("res/Images/grossini_dance_04.png");
var s6 = new cc.Sprite("res/Images/grossini_dance_05.png");
var s7 = new cc.Sprite("res/Images/grossini_dance_06.png");
var s8 = new cc.Sprite("res/Images/grossini_dance_07.png");
var s9 = new cc.Sprite("res/Images/grossini_dance_08.png");
var s10 = new cc.Sprite("res/Images/grossini_dance_09.png");
var s11 = new cc.Sprite("res/Images/grossini_dance_10.png");
var s12 = new cc.Sprite("res/Images/grossini_dance_11.png");
var s13 = new cc.Sprite("res/Images/grossini_dance_12.png");
var s14 = new cc.Sprite("res/Images/grossini_dance_13.png");
var s15 = new cc.Sprite("res/Images/grossini_dance_14.png");
var s1 = new cc.Sprite("Images/grossini.png");
var s2 = new cc.Sprite("Images/grossini_dance_01.png");
var s3 = new cc.Sprite("Images/grossini_dance_02.png");
var s4 = new cc.Sprite("Images/grossini_dance_03.png");
var s5 = new cc.Sprite("Images/grossini_dance_04.png");
var s6 = new cc.Sprite("Images/grossini_dance_05.png");
var s7 = new cc.Sprite("Images/grossini_dance_06.png");
var s8 = new cc.Sprite("Images/grossini_dance_07.png");
var s9 = new cc.Sprite("Images/grossini_dance_08.png");
var s10 = new cc.Sprite("Images/grossini_dance_09.png");
var s11 = new cc.Sprite("Images/grossini_dance_10.png");
var s12 = new cc.Sprite("Images/grossini_dance_11.png");
var s13 = new cc.Sprite("Images/grossini_dance_12.png");
var s14 = new cc.Sprite("Images/grossini_dance_13.png");
var s15 = new cc.Sprite("Images/grossini_dance_14.png");
// just loading textures to slow down
var s16 = new cc.Sprite("res/Images/background1.png");
var s17 = new cc.Sprite("res/Images/background2.png");
var s18 = new cc.Sprite("res/Images/background3.png");
var s19 = new cc.Sprite("res/Images/blocks.png");
var s16 = new cc.Sprite("Images/background1.png");
var s17 = new cc.Sprite("Images/background2.png");
var s18 = new cc.Sprite("Images/background3.png");
var s19 = new cc.Sprite("Images/blocks.png");
s1.x = 50;
s1.y = 50;

64
tests/js-tests/src/tests_resources.js
View File

@ -149,7 +149,7 @@ var s_tileISOOffsetPng = "TileMaps/tile_iso_offset.png";
var s_tileISOOffsetTmx = "TileMaps/tile_iso_offset.tmx";
var s_fnTuffyBoldItalicCharmapPng = "fonts/tuffy_bold_italic-charmap.png";
var s_fpsImages = "fonts/fps_images.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";
@ -315,25 +315,25 @@ var g_s9s_blocks = [
var g_opengl_resources = [
//preload shader source
"Shaders/example_Outline.fsh",
"Shaders/example_Outline.vsh",
"Shaders/example_Blur.fsh",
"Shaders/example_ColorBars.fsh",
"Shaders/example_ColorBars.vsh",
"Shaders/example_Flower.fsh",
"Shaders/example_Flower.vsh",
"Shaders/example_Heart.fsh",
"Shaders/example_Heart.vsh",
"Shaders/example_Julia.fsh",
"Shaders/example_Julia.vsh",
"Shaders/example_Mandelbrot.fsh",
"Shaders/example_Mandelbrot.vsh",
"Shaders/example_Monjori.fsh",
"Shaders/example_Monjori.vsh",
"Shaders/example_Plasma.fsh",
"Shaders/example_Plasma.vsh",
"Shaders/example_Twist.fsh",
"Shaders/example_Twist.vsh",
"../../js-tests/res/Shaders/example_Outline.fsh",
"../../js-tests/res/Shaders/example_Outline.vsh",
"../../js-tests/res/Shaders/example_Blur.fsh",
"../../js-tests/res/Shaders/example_ColorBars.fsh",
"../../js-tests/res/Shaders/example_ColorBars.vsh",
"../../js-tests/res/Shaders/example_Flower.fsh",
"../../js-tests/res/Shaders/example_Flower.vsh",
"../../js-tests/res/Shaders/example_Heart.fsh",
"../../js-tests/res/Shaders/example_Heart.vsh",
"../../js-tests/res/Shaders/example_Julia.fsh",
"../../js-tests/res/Shaders/example_Julia.vsh",
"../../js-tests/res/Shaders/example_Mandelbrot.fsh",
"../../js-tests/res/Shaders/example_Mandelbrot.vsh",
"../../js-tests/res/Shaders/example_Monjori.fsh",
"../../js-tests/res/Shaders/example_Monjori.vsh",
"../../js-tests/res/Shaders/example_Plasma.fsh",
"../../js-tests/res/Shaders/example_Plasma.vsh",
"../../js-tests/res/Shaders/example_Twist.fsh",
"../../js-tests/res/Shaders/example_Twist.vsh",
"fonts/west_england-64.fnt",
"fonts/west_england-64.png"
@ -450,22 +450,22 @@ var g_fonts = [
{
type:"font",
name:"Thonburi",
srcs:["fonts/Thonburi.eot", "fonts/Thonburi.ttf"]
srcs:["../cpp-tests/Resources/fonts/Thonburi.eot", "../cpp-tests/Resources/fonts/Thonburi.ttf"]
},
{
type:"font",
name:"Schwarzwald Regular",
srcs:["fonts/Schwarzwald_Regular.eot", "fonts/Schwarzwald Regular.ttf"]
srcs:["../cpp-tests/Resources/fonts/Schwarzwald_Regular.eot", "../cpp-tests/Resources/fonts/Schwarzwald Regular.ttf"]
},
{
type:"font",
name:"ThonburiBold",
srcs:["fonts/ThonburiBold.eot", "fonts/ThonburiBold.ttf"]
srcs:["../cpp-tests/Resources/fonts/ThonburiBold.eot", "../cpp-tests/Resources/fonts/ThonburiBold.ttf"]
},
{
type:"font",
name:"Courier New",
srcs:["fonts/Courier New.eot", "fonts/Courier New.ttf"]
srcs:["../cpp-tests/Resources/fonts/Courier New.eot", "../cpp-tests/Resources/fonts/Courier New.ttf"]
}
];
@ -960,7 +960,7 @@ var g_ui = [
var g_performace = [
"animations/crystals.plist",
"animations/crystals.png",
"Images/fps_images.png",
"fps_images.png",
"Images/spritesheet1.png",
"Images/sprites_test/sprite-0-0.png",
"Images/sprites_test/sprite-0-1.png",
@ -1075,13 +1075,13 @@ var g_tilemaps = [
];
var g_spine = [
"skeletons/spineboy.atlas",
"skeletons/spineboy.json",
"skeletons/spineboy.png",
"skeletons/sprite.png",
"skeletons/goblins-ffd.png",
"skeletons/goblins-ffd.atlas",
"skeletons/goblins-ffd.json"
"spine/spineboy.atlas",
"spine/spineboy.json",
"spine/spineboy.png",
"spine/sprite.png",
"spine/goblins-ffd.png",
"spine/goblins-ffd.atlas",
"spine/goblins-ffd.json"
];
var g_ccs2 = [