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

update for light3d reader

This commit is contained in:
liamcindy 2015-11-02 16:55:08 +08:00 committed by unknown
parent 0c8aed8a1a
commit 872141d547
7 changed files with 38 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,6 +7,10 @@
objects = {
/* Begin PBXBuildFile section */
0C261F281BE7528900707478 /* Light3DReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0C261F261BE7528900707478 /* Light3DReader.cpp */; };
0C261F291BE7528900707478 /* Light3DReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0C261F261BE7528900707478 /* Light3DReader.cpp */; };
0C261F2A1BE7528900707478 /* Light3DReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C261F271BE7528900707478 /* Light3DReader.h */; };
0C261F2B1BE7528900707478 /* Light3DReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C261F271BE7528900707478 /* Light3DReader.h */; };
15AE180819AAD2F700C27E9E /* CCAABB.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15AE17E419AAD2F700C27E9E /* CCAABB.cpp */; };
15AE180919AAD2F700C27E9E /* CCAABB.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15AE17E419AAD2F700C27E9E /* CCAABB.cpp */; };
15AE180A19AAD2F700C27E9E /* CCAABB.h in Headers */ = {isa = PBXBuildFile; fileRef = 15AE17E519AAD2F700C27E9E /* CCAABB.h */; };
@ -3691,6 +3695,8 @@
06CAAABF186AD63B0012A414 /* TriggerMng.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TriggerMng.h; sourceTree = "<group>"; };
06CAAAC0186AD63B0012A414 /* TriggerObj.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TriggerObj.cpp; sourceTree = "<group>"; };
06CAAAC1186AD63B0012A414 /* TriggerObj.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TriggerObj.h; sourceTree = "<group>"; };
0C261F261BE7528900707478 /* Light3DReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Light3DReader.cpp; sourceTree = "<group>"; };
0C261F271BE7528900707478 /* Light3DReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Light3DReader.h; sourceTree = "<group>"; };
1551A33F158F2AB200E66CFE /* libcocos2d Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libcocos2d Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; };
1551A342158F2AB200E66CFE /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
15AE17E419AAD2F700C27E9E /* CCAABB.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCAABB.cpp; sourceTree = "<group>"; };
@ -5683,6 +5689,15 @@
path = ActionTimeline;
sourceTree = "<group>";
};
0C261F251BE7528900707478 /* Light3DReader */ = {
isa = PBXGroup;
children = (
0C261F261BE7528900707478 /* Light3DReader.cpp */,
0C261F271BE7528900707478 /* Light3DReader.h */,
);
path = Light3DReader;
sourceTree = "<group>";
};
1551A334158F2AB200E66CFE = {
isa = PBXGroup;
children = (
@ -7750,6 +7765,7 @@
50FCEB6818C72017004AD434 /* WidgetReader */ = {
isa = PBXGroup;
children = (
0C261F251BE7528900707478 /* Light3DReader */,
A045F6EC1BA81821005076C7 /* GameNode3DReader */,
C503066F1B60B590001E6D43 /* SkeletonReader */,
18956BAF1A9DFBEC006E9155 /* Particle3DReader */,
@ -9094,6 +9110,7 @@
B665E28C1AA80A6500DDB1C5 /* CCPUDynamicAttribute.h in Headers */,
B665E3941AA80A6500DDB1C5 /* CCPUPlaneColliderTranslator.h in Headers */,
46A170E71807CECA005B8026 /* CCPhysicsBody.h in Headers */,
0C261F2A1BE7528900707478 /* Light3DReader.h in Headers */,
B665E22C1AA80A6500DDB1C5 /* CCPUBoxCollider.h in Headers */,
B6CAB4011AF9AA1A00B9B856 /* btMultiBodyConstraintSolver.h in Headers */,
B6CAB2FB1AF9AA1A00B9B856 /* btTriangleCallback.h in Headers */,
@ -10921,6 +10938,7 @@
B6CAB50C1AF9AA1A00B9B856 /* btHashMap.h in Headers */,
15AE185819AAD31200C27E9E /* CDAudioManager.h in Headers */,
B6CAB3841AF9AA1A00B9B856 /* btMinkowskiPenetrationDepthSolver.h in Headers */,
0C261F2B1BE7528900707478 /* Light3DReader.h in Headers */,
B665E38D1AA80A6500DDB1C5 /* CCPUPlane.h in Headers */,
B6CAB3501AF9AA1A00B9B856 /* gim_geom_types.h in Headers */,
B6CAB3941AF9AA1A00B9B856 /* btSimplexSolverInterface.h in Headers */,
@ -11629,6 +11647,7 @@
826294351AAF004C00CB7CF7 /* HttpCookie.cpp in Sources */,
1A5702F6180BCE750088DEC7 /* CCTMXTiledMap.cpp in Sources */,
1A5702FA180BCE750088DEC7 /* CCTMXXMLParser.cpp in Sources */,
0C261F281BE7528900707478 /* Light3DReader.cpp in Sources */,
B665E3621AA80A6500DDB1C5 /* CCPUOnTimeObserver.cpp in Sources */,
15AE18DF19AAD35000C27E9E /* TriggerBase.cpp in Sources */,
15AE1A7219AAD40300C27E9E /* b2ContactSolver.cpp in Sources */,
@ -12740,6 +12759,7 @@
B6CAB26E1AF9AA1A00B9B856 /* btSphereSphereCollisionAlgorithm.cpp in Sources */,
50ABBED01925AB6F00A911A9 /* TGAlib.cpp in Sources */,
50693C5F1B6BF2AE005C5820 /* CCDownloader.cpp in Sources */,
0C261F291BE7528900707478 /* Light3DReader.cpp in Sources */,
1A01C68518F57BE800EFE3A6 /* CCArray.cpp in Sources */,
B665E2AF1AA80A6500DDB1C5 /* CCPUFlockCenteringAffectorTranslator.cpp in Sources */,
B29A7E2219EE1B7700872B35 /* PolygonBatch.cpp in Sources */,

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

@ -411,6 +411,7 @@
<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\Light3DReader\Light3DReader.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\WidgetReader\ListViewReader\ListViewReader.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\WidgetReader\LoadingBarReader\LoadingBarReader.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\WidgetReader\NodeReaderDefine.h" />
@ -1020,6 +1021,7 @@
<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\Light3DReader\Light3DReader.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\WidgetReader\ListViewReader\ListViewReader.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\WidgetReader\LoadingBarReader\LoadingBarReader.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\WidgetReader\NodeReaderDefine.cpp" />
@ -1283,4 +1285,4 @@
<ItemGroup>
<Text Include="$(MSBuildThisFileDirectory)..\..\..\..\physics3d\CMakeLists.txt" />
</ItemGroup>
</Project>
</Project>

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

@ -1871,6 +1871,9 @@
<Filter>renderer</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\network\CCDownloaderImpl.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\WidgetReader\Light3DReader\Light3DReader.h">
<Filter>cocostudio\reader\WidgetReader\Light3DReader</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\cocos2d.cpp">
@ -3574,6 +3577,9 @@
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\renderer\CCTextureCube.cpp">
<Filter>renderer</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\WidgetReader\Light3DReader\Light3DReader.cpp">
<Filter>cocostudio\reader\WidgetReader\Light3DReader</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<Filter Include="2d">
@ -3849,6 +3855,9 @@
<Filter Include="cocostudio\reader\WidgetReader\GameNodeDReader">
<UniqueIdentifier>{4cfeb8e0-8355-4a28-aff7-3e96e400bad1}</UniqueIdentifier>
</Filter>
<Filter Include="cocostudio\reader\WidgetReader\Light3DReader">
<UniqueIdentifier>{815a6275-839e-45a6-9f35-4e84b13ba538}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<None Include="$(MSBuildThisFileDirectory)..\..\..\cocos2d.def" />

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

@ -64,6 +64,7 @@
#include "cocostudio/WidgetReader/UserCameraReader/UserCameraReader.h"
#include "cocostudio/WidgetReader/Particle3DReader/Particle3DReader.h"
#include "cocostudio/WidgetReader/GameNode3DReader/GameNode3DReader.h"
#include "cocostudio/WidgetReader/Light3DReader/Light3DReader.h"
#include "cocostudio/WidgetReader/SkeletonReader/BoneNodeReader.h"
#include "cocostudio/WidgetReader/SkeletonReader/SkeletonNodeReader.h"
@ -216,6 +217,7 @@ CSLoader::CSLoader()
CREATE_CLASS_NODE_READER_INFO(UserCameraReader);
CREATE_CLASS_NODE_READER_INFO(Particle3DReader);
CREATE_CLASS_NODE_READER_INFO(GameNode3DReader);
CREATE_CLASS_NODE_READER_INFO(Light3DReader);
CREATE_CLASS_NODE_READER_INFO(BoneNodeReader);
CREATE_CLASS_NODE_READER_INFO(SkeletonNodeReader);

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

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

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

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

5
cocos/editor-support/cocostudio/WidgetReader/Light3DReader/Light3DReader.h
View File

@ -22,9 +22,8 @@
THE SOFTWARE.
****************************************************************************/
#ifndef __cocos2d_libs__Sprite3DReader__
#define __cocos2d_libs__Sprite3DReader__
#ifndef __cocos2d_libs__Light3DReader__
#define __cocos2d_libs__Light3DReader__
#include "cocos2d.h"
#include "cocostudio/CocosStudioExport.h"
#include "cocostudio/WidgetReader/NodeReaderProtocol.h"