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

remove resource to use armature resource

This commit is contained in:
2youyou2 2014-06-13 14:41:28 +08:00
parent e0f6ae9db4
commit 1c5d9ba212
5 changed files with 2 additions and 337 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioTimelineActionTest/TimelineActionTestScene.cpp
View File

@ -182,6 +182,8 @@ void TestTimelineAction::onEnter()
{ {
TimelineActionTestLayer::onEnter(); TimelineActionTestLayer::onEnter();
SpriteFrameCache::getInstance()->addSpriteFramesWithFile("armature/Cowboy0.plist", "armature/Cowboy0.png");
Node* node = NodeReader::getInstance()->createNode("TimelineAction/boy_1.ExportJson"); Node* node = NodeReader::getInstance()->createNode("TimelineAction/boy_1.ExportJson");
TimelineAction* action = TimelineActionCache::getInstance()->createAction("TimelineAction/boy_1.ExportJson"); TimelineAction* action = TimelineActionCache::getInstance()->createAction("TimelineAction/boy_1.ExportJson");

198
tests/cpp-tests/Resources/TimelineAction/boy0.plist
View File

@ -1,198 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>frames</key>
<dict>
<key>testAnimationResource/6.png</key>
<dict>
<key>width</key>
<integer>474</integer>
<key>height</key>
<integer>402</integer>
<key>originalWidth</key>
<integer>474</integer>
<key>originalHeight</key>
<integer>402</integer>
<key>x</key>
<integer>0</integer>
<key>y</key>
<integer>0</integer>
<key>offsetX</key>
<real>0</real>
<key>offsetY</key>
<real>0</real>
</dict>
<key>testAnimationResource/8.png</key>
<dict>
<key>width</key>
<integer>135</integer>
<key>height</key>
<integer>180</integer>
<key>originalWidth</key>
<integer>135</integer>
<key>originalHeight</key>
<integer>180</integer>
<key>x</key>
<integer>476</integer>
<key>y</key>
<integer>0</integer>
<key>offsetX</key>
<real>0</real>
<key>offsetY</key>
<real>0</real>
</dict>
<key>testAnimationResource/3.png</key>
<dict>
<key>width</key>
<integer>247</integer>
<key>height</key>
<integer>479</integer>
<key>originalWidth</key>
<integer>247</integer>
<key>originalHeight</key>
<integer>479</integer>
<key>x</key>
<integer>613</integer>
<key>y</key>
<integer>0</integer>
<key>offsetX</key>
<real>0</real>
<key>offsetY</key>
<real>0</real>
</dict>
<key>testAnimationResource/5.png</key>
<dict>
<key>width</key>
<integer>190</integer>
<key>height</key>
<integer>236</integer>
<key>originalWidth</key>
<integer>190</integer>
<key>originalHeight</key>
<integer>236</integer>
<key>x</key>
<integer>862</integer>
<key>y</key>
<integer>0</integer>
<key>offsetX</key>
<real>0</real>
<key>offsetY</key>
<real>0</real>
</dict>
<key>testAnimationResource/4.png</key>
<dict>
<key>width</key>
<integer>141</integer>
<key>height</key>
<integer>110</integer>
<key>originalWidth</key>
<integer>141</integer>
<key>originalHeight</key>
<integer>110</integer>
<key>x</key>
<integer>1054</integer>
<key>y</key>
<integer>0</integer>
<key>offsetX</key>
<real>0</real>
<key>offsetY</key>
<real>0</real>
</dict>
<key>testAnimationResource/2.png</key>
<dict>
<key>width</key>
<integer>186</integer>
<key>height</key>
<integer>252</integer>
<key>originalWidth</key>
<integer>186</integer>
<key>originalHeight</key>
<integer>252</integer>
<key>x</key>
<integer>1197</integer>
<key>y</key>
<integer>0</integer>
<key>offsetX</key>
<real>0</real>
<key>offsetY</key>
<real>0</real>
</dict>
<key>testAnimationResource/7.png</key>
<dict>
<key>width</key>
<integer>146</integer>
<key>height</key>
<integer>112</integer>
<key>originalWidth</key>
<integer>146</integer>
<key>originalHeight</key>
<integer>112</integer>
<key>x</key>
<integer>1385</integer>
<key>y</key>
<integer>0</integer>
<key>offsetX</key>
<real>0</real>
<key>offsetY</key>
<real>0</real>
</dict>
<key>testAnimationResource/hat.png</key>
<dict>
<key>width</key>
<integer>452</integer>
<key>height</key>
<integer>458</integer>
<key>originalWidth</key>
<integer>452</integer>
<key>originalHeight</key>
<integer>458</integer>
<key>x</key>
<integer>1533</integer>
<key>y</key>
<integer>0</integer>
<key>offsetX</key>
<real>0</real>
<key>offsetY</key>
<real>0</real>
</dict>
<key>testAnimationResource/1.png</key>
<dict>
<key>width</key>
<integer>201</integer>
<key>height</key>
<integer>320</integer>
<key>originalWidth</key>
<integer>201</integer>
<key>originalHeight</key>
<integer>320</integer>
<key>x</key>
<integer>0</integer>
<key>y</key>
<integer>481</integer>
<key>offsetX</key>
<real>0</real>
<key>offsetY</key>
<real>0</real>
</dict>
</dict>
<key>metadata</key>
<dict>
<key>format</key>
<integer>0</integer>
<key>textureFileName</key>
<string>boy0.png</string>
<key>realTextureFileName</key>
<string>boy0.png</string>
<key>size</key>
<string>{2048,2048}</string>
</dict>
<key>texture</key>
<dict>
<key>width</key>
<integer>2048</integer>
<key>height</key>
<integer>2048</integer>
</dict>
</dict>
</plist>

BIN
tests/cpp-tests/Resources/TimelineAction/boy0.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 481 KiB

139
tests/cpp-tests/Resources/hd/TimelineAction/boy0.plist
View File

@ -1,139 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>frames</key>
<dict>
<key>testAnimationResource/1.png</key>
<dict>
<key>frame</key>
<string>{{1404,2},{402,640}}</string>
<key>offset</key>
<string>{0,0}</string>
<key>rotated</key>
<true/>
<key>sourceColorRect</key>
<string>{{0,0},{402,640}}</string>
<key>sourceSize</key>
<string>{402,640}</string>
</dict>
<key>testAnimationResource/2.png</key>
<dict>
<key>frame</key>
<string>{{1404,406},{372,504}}</string>
<key>offset</key>
<string>{0,0}</string>
<key>rotated</key>
<true/>
<key>sourceColorRect</key>
<string>{{0,0},{372,504}}</string>
<key>sourceSize</key>
<string>{372,504}</string>
</dict>
<key>testAnimationResource/3.png</key>
<dict>
<key>frame</key>
<string>{{2,2},{494,958}}</string>
<key>offset</key>
<string>{0,0}</string>
<key>rotated</key>
<false/>
<key>sourceColorRect</key>
<string>{{0,0},{494,958}}</string>
<key>sourceSize</key>
<string>{494,958}</string>
</dict>
<key>testAnimationResource/4.png</key>
<dict>
<key>frame</key>
<string>{{808,1192},{282,220}}</string>
<key>offset</key>
<string>{0,0}</string>
<key>rotated</key>
<false/>
<key>sourceColorRect</key>
<string>{{0,0},{282,220}}</string>
<key>sourceSize</key>
<string>{282,220}</string>
</dict>
<key>testAnimationResource/5.png</key>
<dict>
<key>frame</key>
<string>{{1404,780},{380,472}}</string>
<key>offset</key>
<string>{0,0}</string>
<key>rotated</key>
<true/>
<key>sourceColorRect</key>
<string>{{0,0},{380,472}}</string>
<key>sourceSize</key>
<string>{380,472}</string>
</dict>
<key>testAnimationResource/6.png</key>
<dict>
<key>frame</key>
<string>{{2,962},{948,804}}</string>
<key>offset</key>
<string>{0,0}</string>
<key>rotated</key>
<true/>
<key>sourceColorRect</key>
<string>{{0,0},{948,804}}</string>
<key>sourceSize</key>
<string>{948,804}</string>
</dict>
<key>testAnimationResource/7.png</key>
<dict>
<key>frame</key>
<string>{{1170,920},{292,224}}</string>
<key>offset</key>
<string>{0,0}</string>
<key>rotated</key>
<true/>
<key>sourceColorRect</key>
<string>{{0,0},{292,224}}</string>
<key>sourceSize</key>
<string>{292,224}</string>
</dict>
<key>testAnimationResource/8.png</key>
<dict>
<key>frame</key>
<string>{{808,920},{270,360}}</string>
<key>offset</key>
<string>{0,0}</string>
<key>rotated</key>
<true/>
<key>sourceColorRect</key>
<string>{{0,0},{270,360}}</string>
<key>sourceSize</key>
<string>{270,360}</string>
</dict>
<key>testAnimationResource/hat.png</key>
<dict>
<key>frame</key>
<string>{{498,2},{904,916}}</string>
<key>offset</key>
<string>{0,0}</string>
<key>rotated</key>
<false/>
<key>sourceColorRect</key>
<string>{{0,0},{904,916}}</string>
<key>sourceSize</key>
<string>{904,916}</string>
</dict>
</dict>
<key>metadata</key>
<dict>
<key>format</key>
<integer>2</integer>
<key>realTextureFileName</key>
<string>boy0.png</string>
<key>size</key>
<string>{2048,2048}</string>
<key>smartupdate</key>
<string>$TexturePacker:SmartUpdate:63c2c50874dc08cc1bcf50b622528838:1/1$</string>
<key>textureFileName</key>
<string>boy0.png</string>
</dict>
</dict>
</plist>

BIN
tests/cpp-tests/Resources/hd/TimelineAction/boy0.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.0 MiB