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

Revert "add test case for staggered map" 

This reverts commit 4bbae0d9c5.
This commit is contained in:
Huabing.Xu 2014-10-11 14:24:38 +08:00
parent 27f48b0011
commit 0e1b680ab2
5 changed files with 0 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -941,8 +941,6 @@
A07A52C31783B02C0073F6A7 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A07A52C11783B01F0073F6A7 /* AVFoundation.framework */; }; A07A52C31783B02C0073F6A7 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A07A52C11783B01F0073F6A7 /* AVFoundation.framework */; };
A5030C3519D059DA000E78E7 /* OpenURLTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5030C3319D059DA000E78E7 /* OpenURLTest.cpp */; }; A5030C3519D059DA000E78E7 /* OpenURLTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5030C3319D059DA000E78E7 /* OpenURLTest.cpp */; };
A5030C3619D059DA000E78E7 /* OpenURLTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5030C3319D059DA000E78E7 /* OpenURLTest.cpp */; }; A5030C3619D059DA000E78E7 /* OpenURLTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5030C3319D059DA000E78E7 /* OpenURLTest.cpp */; };
B242B6A419E7DC67004F9B8B /* test in Resources */ = {isa = PBXBuildFile; fileRef = B242B6A319E7DC67004F9B8B /* test */; };
B242B6A519E7DC67004F9B8B /* test in Resources */ = {isa = PBXBuildFile; fileRef = B242B6A319E7DC67004F9B8B /* test */; };
B2507B6B192589AF00FA4972 /* Shaders3D in Resources */ = {isa = PBXBuildFile; fileRef = B2507B6A192589AF00FA4972 /* Shaders3D */; }; B2507B6B192589AF00FA4972 /* Shaders3D in Resources */ = {isa = PBXBuildFile; fileRef = B2507B6A192589AF00FA4972 /* Shaders3D */; };
B2507B6C192589AF00FA4972 /* Shaders3D in Resources */ = {isa = PBXBuildFile; fileRef = B2507B6A192589AF00FA4972 /* Shaders3D */; }; B2507B6C192589AF00FA4972 /* Shaders3D in Resources */ = {isa = PBXBuildFile; fileRef = B2507B6A192589AF00FA4972 /* Shaders3D */; };
B609E67319C18DAD003D0074 /* BillBoardTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B609E67119C18DAD003D0074 /* BillBoardTest.cpp */; }; B609E67319C18DAD003D0074 /* BillBoardTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B609E67119C18DAD003D0074 /* BillBoardTest.cpp */; };
@ -2971,7 +2969,6 @@
A07A52C11783B01F0073F6A7 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS6.1.sdk/System/Library/Frameworks/AVFoundation.framework; sourceTree = DEVELOPER_DIR; }; A07A52C11783B01F0073F6A7 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS6.1.sdk/System/Library/Frameworks/AVFoundation.framework; sourceTree = DEVELOPER_DIR; };
A5030C3319D059DA000E78E7 /* OpenURLTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = OpenURLTest.cpp; path = OpenURLTest/OpenURLTest.cpp; sourceTree = "<group>"; }; A5030C3319D059DA000E78E7 /* OpenURLTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = OpenURLTest.cpp; path = OpenURLTest/OpenURLTest.cpp; sourceTree = "<group>"; };
A5030C3419D059DA000E78E7 /* OpenURLTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OpenURLTest.h; path = OpenURLTest/OpenURLTest.h; sourceTree = "<group>"; }; A5030C3419D059DA000E78E7 /* OpenURLTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OpenURLTest.h; path = OpenURLTest/OpenURLTest.h; sourceTree = "<group>"; };
B242B6A319E7DC67004F9B8B /* test */ = {isa = PBXFileReference; lastKnownFileType = folder; name = test; path = "../tests/cpp-empty-test/Resources/test"; sourceTree = "<group>"; };
B2507B6A192589AF00FA4972 /* Shaders3D */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Shaders3D; path = "../tests/cpp-tests/Resources/Shaders3D"; sourceTree = "<group>"; }; B2507B6A192589AF00FA4972 /* Shaders3D */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Shaders3D; path = "../tests/cpp-tests/Resources/Shaders3D"; sourceTree = "<group>"; };
B609E67119C18DAD003D0074 /* BillBoardTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = BillBoardTest.cpp; path = BillBoardTest/BillBoardTest.cpp; sourceTree = "<group>"; }; B609E67119C18DAD003D0074 /* BillBoardTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = BillBoardTest.cpp; path = BillBoardTest/BillBoardTest.cpp; sourceTree = "<group>"; };
B609E67219C18DAD003D0074 /* BillBoardTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BillBoardTest.h; path = BillBoardTest/BillBoardTest.h; sourceTree = "<group>"; }; B609E67219C18DAD003D0074 /* BillBoardTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BillBoardTest.h; path = BillBoardTest/BillBoardTest.h; sourceTree = "<group>"; };
@ -5428,7 +5425,6 @@
1AC358FD18CEC1EF00F37B72 /* Resources */ = { 1AC358FD18CEC1EF00F37B72 /* Resources */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
B242B6A319E7DC67004F9B8B /* test */,
1AC358FE18CEC1FB00F37B72 /* bang.png */, 1AC358FE18CEC1FB00F37B72 /* bang.png */,
1AC358FF18CEC1FB00F37B72 /* fonts */, 1AC358FF18CEC1FB00F37B72 /* fonts */,
1AC3590018CEC1FB00F37B72 /* ipad */, 1AC3590018CEC1FB00F37B72 /* ipad */,
@ -7503,7 +7499,6 @@
1AC3590318CEC1FB00F37B72 /* bang.png in Resources */, 1AC3590318CEC1FB00F37B72 /* bang.png in Resources */,
1AC3590718CEC1FB00F37B72 /* ipad in Resources */, 1AC3590718CEC1FB00F37B72 /* ipad in Resources */,
1AC3590B18CEC1FB00F37B72 /* iphone in Resources */, 1AC3590B18CEC1FB00F37B72 /* iphone in Resources */,
B242B6A419E7DC67004F9B8B /* test in Resources */,
1AC358F818CEC1D400F37B72 /* Icon.icns in Resources */, 1AC358F818CEC1D400F37B72 /* Icon.icns in Resources */,
1AC3590518CEC1FB00F37B72 /* fonts in Resources */, 1AC3590518CEC1FB00F37B72 /* fonts in Resources */,
1AC358F618CEC1D400F37B72 /* MainMenu.xib in Resources */, 1AC358F618CEC1D400F37B72 /* MainMenu.xib in Resources */,
@ -7570,7 +7565,6 @@
1AC358E718CEC1CB00F37B72 /* Icon-72.png in Resources */, 1AC358E718CEC1CB00F37B72 /* Icon-72.png in Resources */,
1AC358E918CEC1CB00F37B72 /* Icon-80.png in Resources */, 1AC358E918CEC1CB00F37B72 /* Icon-80.png in Resources */,
1AC3590818CEC1FB00F37B72 /* ipad in Resources */, 1AC3590818CEC1FB00F37B72 /* ipad in Resources */,
B242B6A519E7DC67004F9B8B /* test in Resources */,
1AC358E318CEC1CB00F37B72 /* Icon-152.png in Resources */, 1AC358E318CEC1CB00F37B72 /* Icon-152.png in Resources */,
1AC358E518CEC1CB00F37B72 /* Icon-57.png in Resources */, 1AC358E518CEC1CB00F37B72 /* Icon-57.png in Resources */,
1AC358DC18CEC1CB00F37B72 /* Default.png in Resources */, 1AC358DC18CEC1CB00F37B72 /* Default.png in Resources */,

4
tests/cpp-empty-test/Classes/HelloWorldScene.cpp
View File

@ -73,10 +73,6 @@ bool HelloWorld::init()
// add the sprite as a child to this layer // add the sprite as a child to this layer
this->addChild(sprite); this->addChild(sprite);
auto map = TMXTiledMap::create("test/test.tmx");
map->setPosition(Vec2(visibleSize/2));
this->addChild(map);
return true; return true;
} }

BIN
tests/cpp-empty-test/Resources/test/grass.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 14 KiB

BIN
tests/cpp-empty-test/Resources/test/grass01.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 63 KiB

19
tests/cpp-empty-test/Resources/test/test.tmx
View File

@ -1,19 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<map version="1.0" orientation="staggered" width="3" height="3" tilewidth="127" tileheight="97">
<tileset firstgid="1" name="grass" tilewidth="127" tileheight="97">
<image source="grass.png" width="127" height="97"/>
</tileset>
<tileset firstgid="2" name="grass01" tilewidth="127" tileheight="97">
<image source="grass01.png" width="127" height="97"/>
</tileset>
<layer name="块层 1" width="3" height="3">
<data encoding="base64" compression="zlib">
eJxjZGBgYCSAAQDYAAo=
</data>
</layer>
<layer name="块层 2" width="3" height="3">
<data encoding="base64" compression="zlib">
eJxjYEAAJiSMDAAAnAAH
</data>
</layer>
</map>