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

fix CocosStudio 3DReader test resource

This commit is contained in:
Ray 2015-02-25 15:49:04 +08:00
parent 71f90306f7
commit ff07f62e83
9 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build/cocos2d_tests.xcodeproj/project.pbxproj
View File

@ -96,10 +96,6 @@
15EFA68D198B3AD8000C57D3 /* libluacocos2d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15EFA665198B33EE000C57D3 /* libluacocos2d iOS.a */; };
182C5CBA1A95B2FD00C30D34 /* CocosStudio3DTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 182C5CB81A95B2FD00C30D34 /* CocosStudio3DTest.cpp */; };
182C5CBB1A95B30500C30D34 /* CocosStudio3DTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 182C5CB81A95B2FD00C30D34 /* CocosStudio3DTest.cpp */; };
182C5CC31A95D05900C30D34 /* CocosStudio3DTest in Resources */ = {isa = PBXBuildFile; fileRef = 182C5CC21A95D05900C30D34 /* CocosStudio3DTest */; };
182C5CC41A95D05900C30D34 /* CocosStudio3DTest in Resources */ = {isa = PBXBuildFile; fileRef = 182C5CC21A95D05900C30D34 /* CocosStudio3DTest */; };
182C5CC51A95D05900C30D34 /* CocosStudio3DTest in Resources */ = {isa = PBXBuildFile; fileRef = 182C5CC21A95D05900C30D34 /* CocosStudio3DTest */; };
182C5CC61A95D05900C30D34 /* CocosStudio3DTest in Resources */ = {isa = PBXBuildFile; fileRef = 182C5CC21A95D05900C30D34 /* CocosStudio3DTest */; };
182C5CCD1A95D9BA00C30D34 /* src in Resources */ = {isa = PBXBuildFile; fileRef = 182C5CCC1A95D9BA00C30D34 /* src */; };
182C5CCE1A95D9BA00C30D34 /* src in Resources */ = {isa = PBXBuildFile; fileRef = 182C5CCC1A95D9BA00C30D34 /* src */; };
182C5CCF1A95D9BA00C30D34 /* src in Resources */ = {isa = PBXBuildFile; fileRef = 182C5CCC1A95D9BA00C30D34 /* src */; };
@ -1083,7 +1079,6 @@
15EE465A19A7200300AF29F1 /* libcurl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcurl.a; path = ../external/curl/prebuilt/ios/libcurl.a; sourceTree = "<group>"; };
182C5CB81A95B2FD00C30D34 /* CocosStudio3DTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CocosStudio3DTest.cpp; path = CocosStudio3DTest/CocosStudio3DTest.cpp; sourceTree = "<group>"; };
182C5CB91A95B2FD00C30D34 /* CocosStudio3DTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CocosStudio3DTest.h; path = CocosStudio3DTest/CocosStudio3DTest.h; sourceTree = "<group>"; };
182C5CC21A95D05900C30D34 /* CocosStudio3DTest */ = {isa = PBXFileReference; lastKnownFileType = folder; name = CocosStudio3DTest; path = "../tests/cpp-tests/Resources/CocosStudio3DTest"; sourceTree = "<group>"; };
182C5CCC1A95D9BA00C30D34 /* src */ = {isa = PBXFileReference; lastKnownFileType = folder; name = src; path = "../tests/lua-tests/src"; sourceTree = "<group>"; };
1A0EE2B218CDF6DA004CD58F /* cpp-empty-test Mac.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "cpp-empty-test Mac.app"; sourceTree = BUILT_PRODUCTS_DIR; };
1A0EE31418CDF733004CD58F /* lua-empty-test Mac.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "lua-empty-test Mac.app"; sourceTree = BUILT_PRODUCTS_DIR; };
@ -3210,7 +3205,6 @@
1AC35CA818CED83500F37B72 /* Resources */ = {
isa = PBXGroup;
children = (
182C5CC21A95D05900C30D34 /* CocosStudio3DTest */,
B63993301A49359F00B07923 /* Particle3D */,
15B3709219EE5D1000ABE682 /* Manifests */,
3E2BDB0019C5E5D40055CDCD /* background.wav */,
@ -4389,7 +4383,6 @@
1AC35DC918CEE65100F37B72 /* zwoptex in Resources */,
1AC35DBD18CEE65100F37B72 /* extensions in Resources */,
1AC35DC718CEE65100F37B72 /* spine in Resources */,
182C5CC41A95D05900C30D34 /* CocosStudio3DTest in Resources */,
1AC35DB718CEE65100F37B72 /* animations in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
@ -4434,7 +4427,6 @@
1AC35DCA18CEE65200F37B72 /* animations in Resources */,
1A1645A9191B6283008C7C7F /* ccs-res in Resources */,
1AC35DA118CEE5D100F37B72 /* Icon-72.png in Resources */,
182C5CC61A95D05900C30D34 /* CocosStudio3DTest in Resources */,
1AC35DA218CEE5D100F37B72 /* Icon-76.png in Resources */,
1AC35DF418CEE65B00F37B72 /* effect1.raw in Resources */,
1AC35DD918CEE65200F37B72 /* Shaders in Resources */,
@ -4492,7 +4484,6 @@
1AC35CD418CED84500F37B72 /* ccb in Resources */,
C08689C118D370C90093E810 /* background.caf in Resources */,
1AC35CE418CED84500F37B72 /* effect1.wav in Resources */,
182C5CC31A95D05900C30D34 /* CocosStudio3DTest in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -4536,7 +4527,6 @@
1AC35C8A18CECF1400F37B72 /* Default@2x.png in Resources */,
1AC35CE318CED84500F37B72 /* effect1.raw in Resources */,
1A221C9D191771E400FD2BE4 /* ccs-res in Resources */,
182C5CC51A95D05900C30D34 /* CocosStudio3DTest in Resources */,
1AC35C9018CECF1400F37B72 /* Icon-29.png in Resources */,
1AC35D0918CED84500F37B72 /* TileMaps in Resources */,
1AC35CFF18CED84500F37B72 /* Particles in Resources */,

8
tests/cpp-tests/Classes/CocosStudio3DTest/CocosStudio3DTest.cpp
View File

@ -133,7 +133,7 @@ void CocosStudio3DTestDemo::backCallback(Ref* sender)
//------------------------------------------------------------------
CSNode3DTest::CSNode3DTest()
{
auto node = CSLoader::createNode("CocosStudio3DTest/Node3D.csb");
auto node = CSLoader::createNode("ccs-res/CocosStudio3DTest/Node3D.csb");
addChild(node);
}
@ -155,7 +155,7 @@ std::string CSNode3DTest::subtitle() const
//------------------------------------------------------------------
CSSprite3DTest::CSSprite3DTest()
{
auto node = CSLoader::createNode("CocosStudio3DTest/Sprite3D.csb");
auto node = CSLoader::createNode("ccs-res/CocosStudio3DTest/Sprite3D.csb");
auto size = Director::getInstance()->getWinSize();
auto sprite3D = node->getChildByTag(8);
@ -184,9 +184,9 @@ std::string CSSprite3DTest::subtitle() const
//------------------------------------------------------------------
CSUserCameraTest::CSUserCameraTest()
{
auto node = CSLoader::createNode("CocosStudio3DTest/UserCamera.csb");
auto node = CSLoader::createNode("ccs-res/CocosStudio3DTest/UserCamera.csb");
auto sprite3D = Sprite3D::create("CocosStudio3DTest/dragon/dragon.c3b");
auto sprite3D = Sprite3D::create("ccs-res/CocosStudio3DTest/dragon/dragon.c3b");
sprite3D->setPosition3D(Vec3(100, 95, 80));
sprite3D->setCameraMask((unsigned int)CameraFlag::USER1);

BIN
tests/cpp-tests/Resources/CocosStudio3DTest/Node3D.csb
View File

Binary file not shown.

BIN
tests/cpp-tests/Resources/CocosStudio3DTest/Sprite3D.csb
View File

Binary file not shown.

BIN
tests/cpp-tests/Resources/CocosStudio3DTest/UserCamera.csb
View File

Binary file not shown.

BIN
tests/cpp-tests/Resources/CocosStudio3DTest/dragon/dragon.c3b
View File

Binary file not shown.

BIN
tests/cpp-tests/Resources/CocosStudio3DTest/dragon/xiaohuolong_tex_body.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 25 KiB

BIN
tests/cpp-tests/Resources/CocosStudio3DTest/dragon/xiaohuolong_tex_head.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 143 KiB

8
tests/lua-tests/src/CocosStudio3DTest/CocosStudio3DTest.lua
View File

@ -10,7 +10,7 @@ function CSNode3DTest.create()
Helper.initWithLayer(layer)
Helper.titleLabel:setString("Node3DReader Test")
local node = cc.CSLoader:createNode("CocosStudio3DTest/Node3D.csb");
local node = cc.CSLoader:createNode("ccs-res/CocosStudio3DTest/Node3D.csb");
layer:addChild(node);
return layer;
@ -28,7 +28,7 @@ function CSSprite3DTest.create()
Helper.initWithLayer(layer)
Helper.titleLabel:setString("Sprite3DReader Test")
local node = cc.CSLoader:createNode("CocosStudio3DTest/Sprite3D.csb")
local node = cc.CSLoader:createNode("ccs-res/CocosStudio3DTest/Sprite3D.csb")
local sprite3D = node:getChildByTag(8)
local size = cc.Director:getInstance():getWinSize()
@ -54,9 +54,9 @@ function CSUserCameraTest.create()
Helper.initWithLayer(layer)
Helper.titleLabel:setString("UserCameraReader Test")
local node = cc.CSLoader:createNode("CocosStudio3DTest/UserCamera.csb")
local node = cc.CSLoader:createNode("ccs-res/CocosStudio3DTest/UserCamera.csb")
local sprite3D = cc.Sprite3D:create("CocosStudio3DTest/dragon/dragon.c3b")
local sprite3D = cc.Sprite3D:create("ccs-res/CocosStudio3DTest/dragon/dragon.c3b")
sprite3D:setPosition3D(cc.vec3(100, 95, 80))
sprite3D:setCameraMask(cc.CameraFlag.USER1)