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

Fix gamenode3d parse failed error 

- Fix the parser issue
- Add GameNode3DReader to win8 universal project
- Add GameNode3d reader to Android & Linux project

Squashed from https://github.com/cocos2d/cocos2d-x/pull/13369
This commit is contained in:
肖峰 2015-08-14 13:27:13 +08:00 committed by pandamicro
parent 22925c2710
commit 0473b08dbb
7 changed files with 39 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
build/cocos2d_libs.xcodeproj/project.pbxproj
View File

@ -1871,6 +1871,10 @@
85505F0E1B60E3DB003F2CD4 /* SkeletonNodeReader.h in Headers */ = {isa = PBXBuildFile; fileRef = C50306741B60B5B2001E6D43 /* SkeletonNodeReader.h */; };
85B3743A1B204B9400C488D6 /* clipper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 85B374381B204B9400C488D6 /* clipper.cpp */; };
85B3743B1B204B9400C488D6 /* clipper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 85B374381B204B9400C488D6 /* clipper.cpp */; };
943CF4541B7DB10F00B6303F /* GameNode3DReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 943CF4521B7DB10F00B6303F /* GameNode3DReader.cpp */; };
943CF4551B7DB10F00B6303F /* GameNode3DReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 943CF4521B7DB10F00B6303F /* GameNode3DReader.cpp */; };
943CF4561B7DB10F00B6303F /* GameNode3DReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 943CF4531B7DB10F00B6303F /* GameNode3DReader.h */; };
943CF4571B7DB10F00B6303F /* GameNode3DReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 943CF4531B7DB10F00B6303F /* GameNode3DReader.h */; };
A07A4CAF1783777C0073F6A7 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1551A342158F2AB200E66CFE /* Foundation.framework */; };
B2165EEA19921124000BE3E6 /* CCPrimitiveCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B257B45E198A353E00D9A687 /* CCPrimitiveCommand.cpp */; };
B217703C1977ECB4009EE11B /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B217703B1977ECB4009EE11B /* IOKit.framework */; };
@ -4652,6 +4656,8 @@
5E9F61251A3FFE3D0038DE01 /* CCPlane.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCPlane.h; sourceTree = "<group>"; };
8525E3A11B291E42008EE815 /* clipper.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = clipper.hpp; sourceTree = "<group>"; };
85B374381B204B9400C488D6 /* clipper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = clipper.cpp; sourceTree = "<group>"; };
943CF4521B7DB10F00B6303F /* GameNode3DReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GameNode3DReader.cpp; sourceTree = "<group>"; };
943CF4531B7DB10F00B6303F /* GameNode3DReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GameNode3DReader.h; sourceTree = "<group>"; };
A07A4D641783777C0073F6A7 /* libcocos2d iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libcocos2d iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; };
B20564AA1A6E5744001C1B6E /* ccShader_PositionColorTextureAsPointsize.vert */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_PositionColorTextureAsPointsize.vert; sourceTree = "<group>"; };
B217703B1977ECB4009EE11B /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; };
@ -7678,6 +7684,7 @@
50FCEB6818C72017004AD434 /* WidgetReader */ = {
isa = PBXGroup;
children = (
943CF4511B7DB10F00B6303F /* GameNode3DReader */,
C503066F1B60B590001E6D43 /* SkeletonReader */,
18956BAF1A9DFBEC006E9155 /* Particle3DReader */,
182C5CE21A9D70C000C30D34 /* UserCameraReader */,
@ -7842,6 +7849,15 @@
path = ../external/clipper;
sourceTree = "<group>";
};
943CF4511B7DB10F00B6303F /* GameNode3DReader */ = {
isa = PBXGroup;
children = (
943CF4521B7DB10F00B6303F /* GameNode3DReader.cpp */,
943CF4531B7DB10F00B6303F /* GameNode3DReader.h */,
);
path = GameNode3DReader;
sourceTree = "<group>";
};
B29594B81926D61F003EEF37 /* 3d */ = {
isa = PBXGroup;
children = (
@ -9559,6 +9575,7 @@
15AE187D19AAD33D00C27E9E /* CCBFileLoader.h in Headers */,
15AE181219AAD2F700C27E9E /* CCAnimation3D.h in Headers */,
182C5CD81A98F30500C30D34 /* Sprite3DReader.h in Headers */,
943CF4561B7DB10F00B6303F /* GameNode3DReader.h in Headers */,
1A5702F0180BCE750088DEC7 /* CCTMXLayer.h in Headers */,
501216961AC47393009A4BEA /* CCPass.h in Headers */,
50ABC01B1926664800A911A9 /* CCSAXParser.h in Headers */,
@ -10743,6 +10760,7 @@
1ABA68B11888D700007D1BB4 /* CCFontCharMap.h in Headers */,
15AE1ACF19AAD40300C27E9E /* b2PulleyJoint.h in Headers */,
D0FD03601A3B51AA00825BB5 /* CCAllocatorStrategyPool.h in Headers */,
943CF4571B7DB10F00B6303F /* GameNode3DReader.h in Headers */,
15AE198019AAD35700C27E9E /* CCTimeLine.h in Headers */,
38B8E2E419E671D2002D7CE7 /* UILayoutComponent.h in Headers */,
B6CAB2481AF9AA1A00B9B856 /* btConvexConvexAlgorithm.h in Headers */,
@ -11222,6 +11240,7 @@
50ABBED71925AB6F00A911A9 /* ZipUtils.cpp in Sources */,
B665E3B61AA80A6500DDB1C5 /* CCPURibbonTrail.cpp in Sources */,
B6CAAFF61AF9A9E100B9B856 /* CCPhysics3DShape.cpp in Sources */,
943CF4541B7DB10F00B6303F /* GameNode3DReader.cpp in Sources */,
B6CAB3071AF9AA1A00B9B856 /* btTriangleMesh.cpp in Sources */,
B29A7E1319EE1B7700872B35 /* Bone.c in Sources */,
B677B0C91B18492D006762CB /* CCNavMesh.cpp in Sources */,
@ -12009,6 +12028,7 @@
15AE1A4119AAD3D500C27E9E /* b2Distance.cpp in Sources */,
50ABBE4E1925AB6F00A911A9 /* CCEventCustom.cpp in Sources */,
B6CAB2761AF9AA1A00B9B856 /* btUnionFind.cpp in Sources */,
943CF4551B7DB10F00B6303F /* GameNode3DReader.cpp in Sources */,
15AE1BF519AAE01E00C27E9E /* CCControlSlider.cpp in Sources */,
15AE181719AAD2F700C27E9E /* CCAttachNode.cpp in Sources */,
B68779051A8CA82E00643ABF /* CCParticleSystem3D.cpp in Sources */,

2
cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems
View File

@ -408,6 +408,7 @@
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\WidgetReader\CheckBoxReader\CheckBoxReader.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\WidgetReader\ComAudioReader\ComAudioReader.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\WidgetReader\GameMapReader\GameMapReader.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\WidgetReader\GameNode3DReader\GameNode3DReader.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\WidgetReader\ImageViewReader\ImageViewReader.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\WidgetReader\LayoutReader\LayoutReader.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\WidgetReader\ListViewReader\ListViewReader.h" />
@ -1014,6 +1015,7 @@
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\WidgetReader\CheckBoxReader\CheckBoxReader.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\WidgetReader\ComAudioReader\ComAudioReader.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\WidgetReader\GameMapReader\GameMapReader.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\WidgetReader\GameNode3DReader\GameNode3DReader.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\WidgetReader\ImageViewReader\ImageViewReader.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\WidgetReader\LayoutReader\LayoutReader.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\WidgetReader\ListViewReader\ListViewReader.cpp" />

9
cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
View File

@ -1864,6 +1864,9 @@
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\network\CCIDownloaderImpl.h">
<Filter>network\Header Files</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\WidgetReader\GameNode3DReader\GameNode3DReader.h">
<Filter>cocostudio\reader\WidgetReader\GameNodeDReader</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\cocos2d.cpp">
@ -3558,6 +3561,9 @@
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\network\CCDownloaderImpl.cpp">
<Filter>network\Source Files</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\WidgetReader\GameNode3DReader\GameNode3DReader.cpp">
<Filter>cocostudio\reader\WidgetReader\GameNodeDReader</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<Filter Include="2d">
@ -3830,6 +3836,9 @@
<Filter Include="cocostudio\reader\WidgetReader\SkeletonReader">
<UniqueIdentifier>{a40f3972-1316-4674-a6d6-c9fae0b83e88}</UniqueIdentifier>
</Filter>
<Filter Include="cocostudio\reader\WidgetReader\GameNodeDReader">
<UniqueIdentifier>{4cfeb8e0-8355-4a28-aff7-3e96e400bad1}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<None Include="$(MSBuildThisFileDirectory)..\..\..\cocos2d.def" />

4
cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp
View File

@ -63,6 +63,8 @@
#include "cocostudio/WidgetReader/Sprite3DReader/Sprite3DReader.h"
#include "cocostudio/WidgetReader/UserCameraReader/UserCameraReader.h"
#include "cocostudio/WidgetReader/Particle3DReader/Particle3DReader.h"
#include "cocostudio/WidgetReader/GameNode3DReader/GameNode3DReader.h"
#include "cocostudio/WidgetReader/SkeletonReader/BoneNodeReader.h"
#include "cocostudio/WidgetReader/SkeletonReader/SkeletonNodeReader.h"
#include "flatbuffers/flatbuffers.h"
@ -213,6 +215,8 @@ CSLoader::CSLoader()
CREATE_CLASS_NODE_READER_INFO(Sprite3DReader);
CREATE_CLASS_NODE_READER_INFO(UserCameraReader);
CREATE_CLASS_NODE_READER_INFO(Particle3DReader);
CREATE_CLASS_NODE_READER_INFO(GameNode3DReader);
CREATE_CLASS_NODE_READER_INFO(BoneNodeReader);
CREATE_CLASS_NODE_READER_INFO(SkeletonNodeReader);
}

1
cocos/editor-support/cocostudio/Android.mk
View File

@ -67,6 +67,7 @@ WidgetReader/UserCameraReader/UserCameraReader.cpp \
WidgetReader/Particle3DReader/Particle3DReader.cpp \
WidgetReader/SkeletonReader/BoneNodeReader.cpp \
WidgetReader/SkeletonReader/SkeletonNodeReader.cpp \
WidgetReader/GameNode3DReader/GameNode3DReader.cpp \
ActionTimeline/CCActionTimelineCache.cpp \
ActionTimeline/CCFrame.cpp \
ActionTimeline/CCTimeLine.cpp \

1
cocos/editor-support/cocostudio/CMakeLists.txt
View File

@ -73,6 +73,7 @@ set(COCOS_CS_SRC
editor-support/cocostudio/WidgetReader/ImageViewReader/ImageViewReader.cpp
editor-support/cocostudio/WidgetReader/ButtonReader/ButtonReader.cpp
editor-support/cocostudio/WidgetReader/ScrollViewReader/ScrollViewReader.cpp
editor-support/cocostudio/WidgetReader/GameNode3DReader/GameNode3DReader.cpp
editor-support/cocostudio/ActionTimeline/CCActionTimelineCache.cpp
editor-support/cocostudio/ActionTimeline/CCActionTimeline.cpp
editor-support/cocostudio/ActionTimeline/CCActionTimelineNode.cpp

4
cocos/editor-support/cocostudio/WidgetReader/GameNode3DReader/GameNode3DReader.h
View File

@ -22,8 +22,8 @@
THE SOFTWARE.
****************************************************************************/
#ifndef __cocos2d_libs__Node3DReader__
#define __cocos2d_libs__Node3DReader__
#ifndef __cocos2d_libs__GameNode3DReader__
#define __cocos2d_libs__GameNode3DReader__
#include "cocos2d.h"
#include "cocostudio/CocosStudioExport.h"