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

fix indent

This commit is contained in:
lite3 2014-08-21 02:15:27 +08:00
parent 679d525453
commit c136e8e079
7 changed files with 3223 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cocos/base/ObjectFactory.cpp
View File

@ -102,10 +102,10 @@ void ObjectFactory::destroyInstance()
Ref* ObjectFactory::createObject(const std::string &name)
{
Ref *o = nullptr;
do
{
const TInfo t = _typeMap[name];
Ref *o = nullptr;
do
{
const TInfo t = _typeMap[name];
if (t._fun != nullptr)
{
o = t._fun();
@ -113,7 +113,7 @@ Ref* ObjectFactory::createObject(const std::string &name)
{
o = t._func();
}
} while (0);
} while (0);
return o;
}

1682
tests/cpp-empty-test/Resources/SampleUIAnimation/SampleUIAnimation.ExportJson Normal file
View File

File diff suppressed because it is too large Load Diff

84
tests/cpp-empty-test/Resources/SampleUIAnimation/SampleUIAnimation0.plist Normal file
View File

@ -0,0 +1,84 @@
<?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>backtotopnormal.png</key>
<dict>
<key>width</key>
<integer>100</integer>
<key>height</key>
<integer>30</integer>
<key>originalWidth</key>
<integer>100</integer>
<key>originalHeight</key>
<integer>30</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>backtotoppressed.png</key>
<dict>
<key>width</key>
<integer>100</integer>
<key>height</key>
<integer>30</integer>
<key>originalWidth</key>
<integer>100</integer>
<key>originalHeight</key>
<integer>30</integer>
<key>x</key>
<integer>102</integer>
<key>y</key>
<integer>0</integer>
<key>offsetX</key>
<real>0</real>
<key>offsetY</key>
<real>0</real>
</dict>
<key>CocoStudio_UIEditor.png</key>
<dict>
<key>width</key>
<integer>76</integer>
<key>height</key>
<integer>84</integer>
<key>originalWidth</key>
<integer>76</integer>
<key>originalHeight</key>
<integer>84</integer>
<key>x</key>
<integer>204</integer>
<key>y</key>
<integer>0</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>SampleUIAnimation0.png</string>
<key>realTextureFileName</key>
<string>SampleUIAnimation0.png</string>
<key>size</key>
<string>{1024,1024}</string>
</dict>
<key>texture</key>
<dict>
<key>width</key>
<integer>1024</integer>
<key>height</key>
<integer>1024</integer>
</dict>
</dict>
</plist>

BIN
tests/cpp-empty-test/Resources/SampleUIAnimation/SampleUIAnimation0.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 28 KiB

1368
tests/cpp-tests/Resources/SampleUIAnimation/SampleUIAnimation.ExportJson Normal file
View File

File diff suppressed because it is too large Load Diff

84
tests/cpp-tests/Resources/SampleUIAnimation/SampleUIAnimation0.plist Normal file
View File

@ -0,0 +1,84 @@
<?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>backtotopnormal.png</key>
<dict>
<key>width</key>
<integer>100</integer>
<key>height</key>
<integer>30</integer>
<key>originalWidth</key>
<integer>100</integer>
<key>originalHeight</key>
<integer>30</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>backtotoppressed.png</key>
<dict>
<key>width</key>
<integer>100</integer>
<key>height</key>
<integer>30</integer>
<key>originalWidth</key>
<integer>100</integer>
<key>originalHeight</key>
<integer>30</integer>
<key>x</key>
<integer>102</integer>
<key>y</key>
<integer>0</integer>
<key>offsetX</key>
<real>0</real>
<key>offsetY</key>
<real>0</real>
</dict>
<key>CocoStudio_UIEditor.png</key>
<dict>
<key>width</key>
<integer>76</integer>
<key>height</key>
<integer>84</integer>
<key>originalWidth</key>
<integer>76</integer>
<key>originalHeight</key>
<integer>84</integer>
<key>x</key>
<integer>204</integer>
<key>y</key>
<integer>0</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>SampleUIAnimation0.png</string>
<key>realTextureFileName</key>
<string>SampleUIAnimation0.png</string>
<key>size</key>
<string>{1024,1024}</string>
</dict>
<key>texture</key>
<dict>
<key>width</key>
<integer>1024</integer>
<key>height</key>
<integer>1024</integer>
</dict>
</dict>
</plist>

BIN
tests/cpp-tests/Resources/SampleUIAnimation/SampleUIAnimation0.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 28 KiB