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

Merge branch 'v3' of github.com:super626/cocos2d-x into Meshv3 

Conflicts:
	cocos/3d/CCSprite3D.cpp
This commit is contained in:
liuliang 2014-08-20 11:45:48 +08:00
parent c6cd9b029d 54423efe9f
commit a27a420a91
116 changed files with 10050 additions and 7813 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -804,6 +804,7 @@ Developers:
Android jni error clear & more readable log
Add support of software PVRTC v1 decompression
Fixed a bug that ttf font have not effect on Mac OS X
Fixed a bug that before touchMove Touch::_prevPoint contains junk
youknowone
Adds iOS-like elastic bounceback support for cocos2d::extension::ScrollView

1
CHANGELOG
View File

@ -22,6 +22,7 @@ cocos2d-x-3.3 ??
[NEW] ui::PageView: added `customScrollThreshold`, could determine the swipe distance to trigger a PageView scroll event
[NEW] ui::TextField: support utf8
[NEW] ui::TextField: support set color and placehold color
[NEW] ui::Widget: support swallowing touch events
[NEW] Text: added getter and setter for TextColor
[FIX] EditBox: font size is not scaled when glview is scaled on Mac OS X

3
CMakeLists.txt
View File

@ -204,6 +204,9 @@ add_subdirectory(cocos/audio)
# cocos2d library
add_subdirectory(cocos)
# cocos3d library
add_subdirectory(cocos/3d)
# network library
add_subdirectory(cocos/network)

12
build/cocos2d-win32.vc2012.sln
View File

@ -45,6 +45,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libluaextension", "..\cocos
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libluaspine", "..\cocos\scripting\lua-bindings\proj.win32\libluaspine.vcxproj", "{31EF6AB1-0D9A-4BC6-99B8-2C482EA373C4}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos3d", "..\cocos\3d\proj.win32\libcocos3d.vcxproj", "{E24950FA-5BC1-4AEE-A900-4F0259354BF0}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libluacocos3d", "..\cocos\scripting\lua-bindings\proj.win32\libluacocos3d.vcxproj", "{06840490-14A4-43D6-88BC-AAFA44D043EB}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@ -139,6 +143,14 @@ Global
{31EF6AB1-0D9A-4BC6-99B8-2C482EA373C4}.Debug|Win32.Build.0 = Debug|Win32
{31EF6AB1-0D9A-4BC6-99B8-2C482EA373C4}.Release|Win32.ActiveCfg = Release|Win32
{31EF6AB1-0D9A-4BC6-99B8-2C482EA373C4}.Release|Win32.Build.0 = Release|Win32
{E24950FA-5BC1-4AEE-A900-4F0259354BF0}.Debug|Win32.ActiveCfg = Debug|Win32
{E24950FA-5BC1-4AEE-A900-4F0259354BF0}.Debug|Win32.Build.0 = Debug|Win32
{E24950FA-5BC1-4AEE-A900-4F0259354BF0}.Release|Win32.ActiveCfg = Release|Win32
{E24950FA-5BC1-4AEE-A900-4F0259354BF0}.Release|Win32.Build.0 = Release|Win32
{06840490-14A4-43D6-88BC-AAFA44D043EB}.Debug|Win32.ActiveCfg = Debug|Win32
{06840490-14A4-43D6-88BC-AAFA44D043EB}.Debug|Win32.Build.0 = Debug|Win32
{06840490-14A4-43D6-88BC-AAFA44D043EB}.Release|Win32.ActiveCfg = Release|Win32
{06840490-14A4-43D6-88BC-AAFA44D043EB}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

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

@ -13,6 +13,7 @@
buildPhases = (
);
dependencies = (
1516202F199E76D9006099B8 /* PBXTargetDependency */,
B2F0AFEC198794EE002FE562 /* PBXTargetDependency */,
B2F0AFEE198794EE002FE562 /* PBXTargetDependency */,
B2F0AFF0198794EE002FE562 /* PBXTargetDependency */,
@ -33,6 +34,7 @@
buildPhases = (
);
dependencies = (
15162225199E7B9E006099B8 /* PBXTargetDependency */,
B2F0AFF619879508002FE562 /* PBXTargetDependency */,
B2F0AFF819879508002FE562 /* PBXTargetDependency */,
B2F0AFFA19879508002FE562 /* PBXTargetDependency */,
@ -50,6 +52,76 @@
/* End PBXAggregateTarget section */
/* Begin PBXBuildFile section */
1516200C199E75C2006099B8 /* CCAABB.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6105175199CB1A600DC41CE /* CCAABB.cpp */; };
1516200D199E75C2006099B8 /* CCOBB.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6105177199CB1A600DC41CE /* CCOBB.cpp */; };
1516200E199E75C2006099B8 /* CCRay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6105179199CB1A600DC41CE /* CCRay.cpp */; };
1516200F199E75C2006099B8 /* CCSkeleton3D.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3EA2A83E1987A6810077B3D4 /* CCSkeleton3D.cpp */; };
15162010199E75C2006099B8 /* CCAttachNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E9E80E3198639EF00FA95D0 /* CCAttachNode.cpp */; };
15162011199E75C2006099B8 /* CCSubMesh.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E9E80E5198639EF00FA95D0 /* CCSubMesh.cpp */; };
15162012199E75C2006099B8 /* CCSubMeshState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E9E80E7198639EF00FA95D0 /* CCSubMeshState.cpp */; };
15162013199E75C2006099B8 /* CCBundleReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3EA4786E195478E00068D9D1 /* CCBundleReader.cpp */; };
15162014199E75C2006099B8 /* CCBundle3D.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6AAF83F19404E0D0069DE01 /* CCBundle3D.cpp */; };
15162015199E75C2006099B8 /* CCAnimate3D.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6ACD89C193DC0CC005E0B8A /* CCAnimate3D.cpp */; };
15162016199E75C2006099B8 /* CCMeshSkin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6ACD895193D6693005E0B8A /* CCMeshSkin.cpp */; };
15162017199E75C2006099B8 /* CCAnimation3D.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6B26341193884D60088FE25 /* CCAnimation3D.cpp */; };
15162018199E75C2006099B8 /* CCMesh.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B29594B91926D61F003EEF37 /* CCMesh.cpp */; };
15162019199E75C2006099B8 /* CCObjLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B29594BB1926D61F003EEF37 /* CCObjLoader.cpp */; };
1516201A199E75C2006099B8 /* CCSprite3D.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B29594BD1926D61F003EEF37 /* CCSprite3D.cpp */; };
1516201B199E75C2006099B8 /* CCSprite3DMaterial.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B29594BF1926D61F003EEF37 /* CCSprite3DMaterial.cpp */; };
1516201C199E75FE006099B8 /* CCAABB.h in Headers */ = {isa = PBXBuildFile; fileRef = B6105176199CB1A600DC41CE /* CCAABB.h */; };
1516201D199E75FE006099B8 /* CCOBB.h in Headers */ = {isa = PBXBuildFile; fileRef = B6105178199CB1A600DC41CE /* CCOBB.h */; };
1516201E199E75FE006099B8 /* CCRay.h in Headers */ = {isa = PBXBuildFile; fileRef = B610517A199CB1A600DC41CE /* CCRay.h */; };
1516201F199E75FE006099B8 /* CCSkeleton3D.h in Headers */ = {isa = PBXBuildFile; fileRef = 3EA2A83F1987A6810077B3D4 /* CCSkeleton3D.h */; };
15162020199E75FE006099B8 /* CCAttachNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 3E9E80E4198639EF00FA95D0 /* CCAttachNode.h */; };
15162021199E75FE006099B8 /* CCSubMesh.h in Headers */ = {isa = PBXBuildFile; fileRef = 3E9E80E6198639EF00FA95D0 /* CCSubMesh.h */; };
15162022199E75FF006099B8 /* CCSubMeshState.h in Headers */ = {isa = PBXBuildFile; fileRef = 3E9E80E8198639EF00FA95D0 /* CCSubMeshState.h */; };
15162023199E75FF006099B8 /* CCBundleReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 3EA4786F195478E00068D9D1 /* CCBundleReader.h */; };
15162024199E75FF006099B8 /* CCBundle3D.h in Headers */ = {isa = PBXBuildFile; fileRef = B6AAF84019404E0D0069DE01 /* CCBundle3D.h */; };
15162025199E75FF006099B8 /* CCAnimate3D.h in Headers */ = {isa = PBXBuildFile; fileRef = B6ACD89D193DC0CC005E0B8A /* CCAnimate3D.h */; };
15162026199E75FF006099B8 /* CCMeshSkin.h in Headers */ = {isa = PBXBuildFile; fileRef = B6ACD896193D6693005E0B8A /* CCMeshSkin.h */; };
15162027199E75FF006099B8 /* CCAnimation3D.h in Headers */ = {isa = PBXBuildFile; fileRef = B6B26342193884D60088FE25 /* CCAnimation3D.h */; };
15162028199E75FF006099B8 /* CCAnimationCurve.h in Headers */ = {isa = PBXBuildFile; fileRef = B6B2633C19381FBF0088FE25 /* CCAnimationCurve.h */; };
15162029199E75FF006099B8 /* CCMesh.h in Headers */ = {isa = PBXBuildFile; fileRef = B29594BA1926D61F003EEF37 /* CCMesh.h */; };
1516202A199E75FF006099B8 /* CCObjLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = B29594BC1926D61F003EEF37 /* CCObjLoader.h */; };
1516202B199E75FF006099B8 /* CCSprite3D.h in Headers */ = {isa = PBXBuildFile; fileRef = B29594BE1926D61F003EEF37 /* CCSprite3D.h */; };
1516202C199E75FF006099B8 /* CCSprite3DMaterial.h in Headers */ = {isa = PBXBuildFile; fileRef = B29594C01926D61F003EEF37 /* CCSprite3DMaterial.h */; };
1516202D199E75FF006099B8 /* CCBundle3DData.h in Headers */ = {isa = PBXBuildFile; fileRef = B2D3D3B81948613300BA4831 /* CCBundle3DData.h */; };
15162202199E7874006099B8 /* CCAABB.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6105175199CB1A600DC41CE /* CCAABB.cpp */; };
15162203199E7874006099B8 /* CCOBB.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6105177199CB1A600DC41CE /* CCOBB.cpp */; };
15162204199E7874006099B8 /* CCRay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6105179199CB1A600DC41CE /* CCRay.cpp */; };
15162205199E7874006099B8 /* CCSkeleton3D.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3EA2A83E1987A6810077B3D4 /* CCSkeleton3D.cpp */; };
15162206199E7874006099B8 /* CCAttachNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E9E80E3198639EF00FA95D0 /* CCAttachNode.cpp */; };
15162207199E7874006099B8 /* CCSubMesh.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E9E80E5198639EF00FA95D0 /* CCSubMesh.cpp */; };
15162208199E7874006099B8 /* CCSubMeshState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E9E80E7198639EF00FA95D0 /* CCSubMeshState.cpp */; };
15162209199E7874006099B8 /* CCBundleReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3EA4786E195478E00068D9D1 /* CCBundleReader.cpp */; };
1516220A199E7874006099B8 /* CCBundle3D.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6AAF83F19404E0D0069DE01 /* CCBundle3D.cpp */; };
1516220B199E7874006099B8 /* CCAnimate3D.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6ACD89C193DC0CC005E0B8A /* CCAnimate3D.cpp */; };
1516220C199E7874006099B8 /* CCMeshSkin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6ACD895193D6693005E0B8A /* CCMeshSkin.cpp */; };
1516220D199E7874006099B8 /* CCAnimation3D.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6B26341193884D60088FE25 /* CCAnimation3D.cpp */; };
1516220E199E7874006099B8 /* CCMesh.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B29594B91926D61F003EEF37 /* CCMesh.cpp */; };
1516220F199E7874006099B8 /* CCObjLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B29594BB1926D61F003EEF37 /* CCObjLoader.cpp */; };
15162210199E7874006099B8 /* CCSprite3D.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B29594BD1926D61F003EEF37 /* CCSprite3D.cpp */; };
15162211199E7874006099B8 /* CCSprite3DMaterial.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B29594BF1926D61F003EEF37 /* CCSprite3DMaterial.cpp */; };
15162212199E7A32006099B8 /* CCAABB.h in Headers */ = {isa = PBXBuildFile; fileRef = B6105176199CB1A600DC41CE /* CCAABB.h */; };
15162213199E7A32006099B8 /* CCOBB.h in Headers */ = {isa = PBXBuildFile; fileRef = B6105178199CB1A600DC41CE /* CCOBB.h */; };
15162214199E7A32006099B8 /* CCRay.h in Headers */ = {isa = PBXBuildFile; fileRef = B610517A199CB1A600DC41CE /* CCRay.h */; };
15162215199E7A32006099B8 /* CCSkeleton3D.h in Headers */ = {isa = PBXBuildFile; fileRef = 3EA2A83F1987A6810077B3D4 /* CCSkeleton3D.h */; };
15162216199E7A32006099B8 /* CCAttachNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 3E9E80E4198639EF00FA95D0 /* CCAttachNode.h */; };
15162217199E7A32006099B8 /* CCSubMesh.h in Headers */ = {isa = PBXBuildFile; fileRef = 3E9E80E6198639EF00FA95D0 /* CCSubMesh.h */; };
15162218199E7A32006099B8 /* CCSubMeshState.h in Headers */ = {isa = PBXBuildFile; fileRef = 3E9E80E8198639EF00FA95D0 /* CCSubMeshState.h */; };
15162219199E7A32006099B8 /* CCBundleReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 3EA4786F195478E00068D9D1 /* CCBundleReader.h */; };
1516221A199E7A32006099B8 /* CCBundle3D.h in Headers */ = {isa = PBXBuildFile; fileRef = B6AAF84019404E0D0069DE01 /* CCBundle3D.h */; };
1516221B199E7A32006099B8 /* CCAnimate3D.h in Headers */ = {isa = PBXBuildFile; fileRef = B6ACD89D193DC0CC005E0B8A /* CCAnimate3D.h */; };
1516221C199E7A32006099B8 /* CCMeshSkin.h in Headers */ = {isa = PBXBuildFile; fileRef = B6ACD896193D6693005E0B8A /* CCMeshSkin.h */; };
1516221D199E7A32006099B8 /* CCAnimation3D.h in Headers */ = {isa = PBXBuildFile; fileRef = B6B26342193884D60088FE25 /* CCAnimation3D.h */; };
1516221E199E7A32006099B8 /* CCAnimationCurve.h in Headers */ = {isa = PBXBuildFile; fileRef = B6B2633C19381FBF0088FE25 /* CCAnimationCurve.h */; };
1516221F199E7A32006099B8 /* CCMesh.h in Headers */ = {isa = PBXBuildFile; fileRef = B29594BA1926D61F003EEF37 /* CCMesh.h */; };
15162220199E7A32006099B8 /* CCObjLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = B29594BC1926D61F003EEF37 /* CCObjLoader.h */; };
15162221199E7A32006099B8 /* CCSprite3D.h in Headers */ = {isa = PBXBuildFile; fileRef = B29594BE1926D61F003EEF37 /* CCSprite3D.h */; };
15162222199E7A32006099B8 /* CCSprite3DMaterial.h in Headers */ = {isa = PBXBuildFile; fileRef = B29594C01926D61F003EEF37 /* CCSprite3DMaterial.h */; };
15162223199E7A32006099B8 /* CCBundle3DData.h in Headers */ = {isa = PBXBuildFile; fileRef = B2D3D3B81948613300BA4831 /* CCBundle3DData.h */; };
15162237199F9EEA006099B8 /* cocos3d.h in Headers */ = {isa = PBXBuildFile; fileRef = 15162236199F9EEA006099B8 /* cocos3d.h */; };
15162238199F9EEA006099B8 /* cocos3d.h in Headers */ = {isa = PBXBuildFile; fileRef = 15162236199F9EEA006099B8 /* cocos3d.h */; };
15EFA211198A2BB5000C57D3 /* CCProtectedNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15EFA20F198A2BB5000C57D3 /* CCProtectedNode.cpp */; };
15EFA212198A2BB5000C57D3 /* CCProtectedNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15EFA20F198A2BB5000C57D3 /* CCProtectedNode.cpp */; };
15EFA213198A2BB5000C57D3 /* CCProtectedNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 15EFA210198A2BB5000C57D3 /* CCProtectedNode.h */; };
@ -583,30 +655,10 @@
3E6176771960F89B00DE83F5 /* CCEventListenerController.h in Headers */ = {isa = PBXBuildFile; fileRef = 3E6176641960F89B00DE83F5 /* CCEventListenerController.h */; };
3E6176781960F89B00DE83F5 /* CCGameController.h in Headers */ = {isa = PBXBuildFile; fileRef = 3E6176651960F89B00DE83F5 /* CCGameController.h */; };
3E61781D1966A5A300DE83F5 /* CCController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E61781C1966A5A300DE83F5 /* CCController.cpp */; };
3E9E80E9198639EF00FA95D0 /* CCAttachNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E9E80E3198639EF00FA95D0 /* CCAttachNode.cpp */; };
3E9E80EA198639EF00FA95D0 /* CCAttachNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E9E80E3198639EF00FA95D0 /* CCAttachNode.cpp */; };
3E9E80EB198639EF00FA95D0 /* CCAttachNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 3E9E80E4198639EF00FA95D0 /* CCAttachNode.h */; };
3E9E80EC198639EF00FA95D0 /* CCAttachNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 3E9E80E4198639EF00FA95D0 /* CCAttachNode.h */; };
3E9E80ED198639EF00FA95D0 /* CCSubMesh.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E9E80E5198639EF00FA95D0 /* CCSubMesh.cpp */; };
3E9E80EE198639EF00FA95D0 /* CCSubMesh.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E9E80E5198639EF00FA95D0 /* CCSubMesh.cpp */; };
3E9E80EF198639EF00FA95D0 /* CCSubMesh.h in Headers */ = {isa = PBXBuildFile; fileRef = 3E9E80E6198639EF00FA95D0 /* CCSubMesh.h */; };
3E9E80F0198639EF00FA95D0 /* CCSubMesh.h in Headers */ = {isa = PBXBuildFile; fileRef = 3E9E80E6198639EF00FA95D0 /* CCSubMesh.h */; };
3E9E80F1198639EF00FA95D0 /* CCSubMeshState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E9E80E7198639EF00FA95D0 /* CCSubMeshState.cpp */; };
3E9E80F2198639EF00FA95D0 /* CCSubMeshState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E9E80E7198639EF00FA95D0 /* CCSubMeshState.cpp */; };
3E9E80F3198639EF00FA95D0 /* CCSubMeshState.h in Headers */ = {isa = PBXBuildFile; fileRef = 3E9E80E8198639EF00FA95D0 /* CCSubMeshState.h */; };
3E9E80F4198639EF00FA95D0 /* CCSubMeshState.h in Headers */ = {isa = PBXBuildFile; fileRef = 3E9E80E8198639EF00FA95D0 /* CCSubMeshState.h */; };
3EA2A8401987A6810077B3D4 /* CCSkeleton3D.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3EA2A83E1987A6810077B3D4 /* CCSkeleton3D.cpp */; };
3EA2A8411987A6810077B3D4 /* CCSkeleton3D.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3EA2A83E1987A6810077B3D4 /* CCSkeleton3D.cpp */; };
3EA2A8421987A6810077B3D4 /* CCSkeleton3D.h in Headers */ = {isa = PBXBuildFile; fileRef = 3EA2A83F1987A6810077B3D4 /* CCSkeleton3D.h */; };
3EA2A8431987A6810077B3D4 /* CCSkeleton3D.h in Headers */ = {isa = PBXBuildFile; fileRef = 3EA2A83F1987A6810077B3D4 /* CCSkeleton3D.h */; };
3EA3EDBC1991CDFA00645534 /* CCCamera.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3EA3EDBA1991CDFA00645534 /* CCCamera.cpp */; };
3EA3EDBD1991CDFA00645534 /* CCCamera.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3EA3EDBA1991CDFA00645534 /* CCCamera.cpp */; };
3EA3EDBE1991CDFA00645534 /* CCCamera.h in Headers */ = {isa = PBXBuildFile; fileRef = 3EA3EDBB1991CDFA00645534 /* CCCamera.h */; };
3EA3EDBF1991CDFA00645534 /* CCCamera.h in Headers */ = {isa = PBXBuildFile; fileRef = 3EA3EDBB1991CDFA00645534 /* CCCamera.h */; };
3EA47870195478E00068D9D1 /* CCBundleReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3EA4786E195478E00068D9D1 /* CCBundleReader.cpp */; };
3EA47871195478E00068D9D1 /* CCBundleReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3EA4786E195478E00068D9D1 /* CCBundleReader.cpp */; };
3EA47872195478E00068D9D1 /* CCBundleReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 3EA4786F195478E00068D9D1 /* CCBundleReader.h */; };
3EA47873195478E00068D9D1 /* CCBundleReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 3EA4786F195478E00068D9D1 /* CCBundleReader.h */; };
460E468118080832000CDD6D /* cocos-ext.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A167D21807AF4D005B8026 /* cocos-ext.h */; };
460E468218080836000CDD6D /* cocos-ext.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A167D21807AF4D005B8026 /* cocos-ext.h */; };
460E477B180808F5000CDD6D /* ExtensionMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A168321807AF4E005B8026 /* ExtensionMacros.h */; };
@ -1301,22 +1353,6 @@
B29594B51926D5EC003EEF37 /* CCMeshCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B29594B21926D5EC003EEF37 /* CCMeshCommand.cpp */; };
B29594B61926D5EC003EEF37 /* CCMeshCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = B29594B31926D5EC003EEF37 /* CCMeshCommand.h */; };
B29594B71926D5EC003EEF37 /* CCMeshCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = B29594B31926D5EC003EEF37 /* CCMeshCommand.h */; };
B29594C21926D61F003EEF37 /* CCMesh.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B29594B91926D61F003EEF37 /* CCMesh.cpp */; };
B29594C31926D61F003EEF37 /* CCMesh.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B29594B91926D61F003EEF37 /* CCMesh.cpp */; };
B29594C41926D61F003EEF37 /* CCMesh.h in Headers */ = {isa = PBXBuildFile; fileRef = B29594BA1926D61F003EEF37 /* CCMesh.h */; };
B29594C51926D61F003EEF37 /* CCMesh.h in Headers */ = {isa = PBXBuildFile; fileRef = B29594BA1926D61F003EEF37 /* CCMesh.h */; };
B29594C61926D61F003EEF37 /* CCObjLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B29594BB1926D61F003EEF37 /* CCObjLoader.cpp */; };
B29594C71926D61F003EEF37 /* CCObjLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B29594BB1926D61F003EEF37 /* CCObjLoader.cpp */; };
B29594C81926D61F003EEF37 /* CCObjLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = B29594BC1926D61F003EEF37 /* CCObjLoader.h */; };
B29594C91926D61F003EEF37 /* CCObjLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = B29594BC1926D61F003EEF37 /* CCObjLoader.h */; };
B29594CA1926D61F003EEF37 /* CCSprite3D.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B29594BD1926D61F003EEF37 /* CCSprite3D.cpp */; };
B29594CB1926D61F003EEF37 /* CCSprite3D.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B29594BD1926D61F003EEF37 /* CCSprite3D.cpp */; };
B29594CC1926D61F003EEF37 /* CCSprite3D.h in Headers */ = {isa = PBXBuildFile; fileRef = B29594BE1926D61F003EEF37 /* CCSprite3D.h */; };
B29594CD1926D61F003EEF37 /* CCSprite3D.h in Headers */ = {isa = PBXBuildFile; fileRef = B29594BE1926D61F003EEF37 /* CCSprite3D.h */; };
B29594CE1926D61F003EEF37 /* CCSprite3DMaterial.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B29594BF1926D61F003EEF37 /* CCSprite3DMaterial.cpp */; };
B29594CF1926D61F003EEF37 /* CCSprite3DMaterial.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B29594BF1926D61F003EEF37 /* CCSprite3DMaterial.cpp */; };
B29594D01926D61F003EEF37 /* CCSprite3DMaterial.h in Headers */ = {isa = PBXBuildFile; fileRef = B29594C01926D61F003EEF37 /* CCSprite3DMaterial.h */; };
B29594D11926D61F003EEF37 /* CCSprite3DMaterial.h in Headers */ = {isa = PBXBuildFile; fileRef = B29594C01926D61F003EEF37 /* CCSprite3DMaterial.h */; };
B2C599BF1977703300B452DF /* CCBAnimationManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71CFB180E26E600808F54 /* CCBAnimationManager.h */; };
B2C599C01977703300B452DF /* CCBFileLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71CFD180E26E600808F54 /* CCBFileLoader.h */; };
B2C599C11977703300B452DF /* CCBKeyframe.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71CFF180E26E600808F54 /* CCBKeyframe.h */; };
@ -1587,8 +1623,6 @@
B2CC507719776C340041958E /* SlotData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71DA4180E26E600808F54 /* SlotData.cpp */; };
B2CC507819776C340041958E /* spine-cocos2dx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71DA6180E26E600808F54 /* spine-cocos2dx.cpp */; };
B2CC507C19776DD10041958E /* CCPhysicsJoint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46A170721807CE7A005B8026 /* CCPhysicsJoint.cpp */; };
B2D3D3B91948613300BA4831 /* CCBundle3DData.h in Headers */ = {isa = PBXBuildFile; fileRef = B2D3D3B81948613300BA4831 /* CCBundle3DData.h */; };
B2D3D3BA1948613300BA4831 /* CCBundle3DData.h in Headers */ = {isa = PBXBuildFile; fileRef = B2D3D3B81948613300BA4831 /* CCBundle3DData.h */; };
B2DB4764197661D500411E16 /* UIWidget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA1318CF08D100240AA3 /* UIWidget.cpp */; };
B2DB4765197661E400411E16 /* UIHBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50E6D32E18E174130051CA34 /* UIHBox.cpp */; };
B2DB4766197661EE00411E16 /* UILayout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905F9F818CF08D000240AA3 /* UILayout.cpp */; };
@ -1875,36 +1909,6 @@
B3AF01A31842FBA400A98B85 /* b2MotorJoint.h in Headers */ = {isa = PBXBuildFile; fileRef = B3AF019F1842FBA400A98B85 /* b2MotorJoint.h */; };
B3B12A5A17E7F44000026B4A /* libchipmunk Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A03F2CB81780BD04006731B9 /* libchipmunk Mac.a */; };
B3B12A5B17E7F45C00026B4A /* libchipmunk iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A07A4F3B178387670073F6A7 /* libchipmunk iOS.a */; };
B610517B199CB1A600DC41CE /* CCAABB.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6105175199CB1A600DC41CE /* CCAABB.cpp */; };
B610517C199CB1A600DC41CE /* CCAABB.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6105175199CB1A600DC41CE /* CCAABB.cpp */; };
B610517D199CB1A600DC41CE /* CCAABB.h in Headers */ = {isa = PBXBuildFile; fileRef = B6105176199CB1A600DC41CE /* CCAABB.h */; };
B610517E199CB1A600DC41CE /* CCAABB.h in Headers */ = {isa = PBXBuildFile; fileRef = B6105176199CB1A600DC41CE /* CCAABB.h */; };
B610517F199CB1A600DC41CE /* CCOBB.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6105177199CB1A600DC41CE /* CCOBB.cpp */; };
B6105180199CB1A600DC41CE /* CCOBB.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6105177199CB1A600DC41CE /* CCOBB.cpp */; };
B6105181199CB1A600DC41CE /* CCOBB.h in Headers */ = {isa = PBXBuildFile; fileRef = B6105178199CB1A600DC41CE /* CCOBB.h */; };
B6105182199CB1A600DC41CE /* CCOBB.h in Headers */ = {isa = PBXBuildFile; fileRef = B6105178199CB1A600DC41CE /* CCOBB.h */; };
B6105183199CB1A600DC41CE /* CCRay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6105179199CB1A600DC41CE /* CCRay.cpp */; };
B6105184199CB1A600DC41CE /* CCRay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6105179199CB1A600DC41CE /* CCRay.cpp */; };
B6105185199CB1A600DC41CE /* CCRay.h in Headers */ = {isa = PBXBuildFile; fileRef = B610517A199CB1A600DC41CE /* CCRay.h */; };
B6105186199CB1A600DC41CE /* CCRay.h in Headers */ = {isa = PBXBuildFile; fileRef = B610517A199CB1A600DC41CE /* CCRay.h */; };
B6AAF84119404E0D0069DE01 /* CCBundle3D.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6AAF83F19404E0D0069DE01 /* CCBundle3D.cpp */; };
B6AAF84219404E0D0069DE01 /* CCBundle3D.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6AAF83F19404E0D0069DE01 /* CCBundle3D.cpp */; };
B6AAF84319404E0D0069DE01 /* CCBundle3D.h in Headers */ = {isa = PBXBuildFile; fileRef = B6AAF84019404E0D0069DE01 /* CCBundle3D.h */; };
B6AAF84419404E0D0069DE01 /* CCBundle3D.h in Headers */ = {isa = PBXBuildFile; fileRef = B6AAF84019404E0D0069DE01 /* CCBundle3D.h */; };
B6ACD897193D6693005E0B8A /* CCMeshSkin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6ACD895193D6693005E0B8A /* CCMeshSkin.cpp */; };
B6ACD898193D6693005E0B8A /* CCMeshSkin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6ACD895193D6693005E0B8A /* CCMeshSkin.cpp */; };
B6ACD899193D6693005E0B8A /* CCMeshSkin.h in Headers */ = {isa = PBXBuildFile; fileRef = B6ACD896193D6693005E0B8A /* CCMeshSkin.h */; };
B6ACD89A193D6693005E0B8A /* CCMeshSkin.h in Headers */ = {isa = PBXBuildFile; fileRef = B6ACD896193D6693005E0B8A /* CCMeshSkin.h */; };
B6ACD89E193DC0CC005E0B8A /* CCAnimate3D.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6ACD89C193DC0CC005E0B8A /* CCAnimate3D.cpp */; };
B6ACD89F193DC0CC005E0B8A /* CCAnimate3D.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6ACD89C193DC0CC005E0B8A /* CCAnimate3D.cpp */; };
B6ACD8A0193DC0CC005E0B8A /* CCAnimate3D.h in Headers */ = {isa = PBXBuildFile; fileRef = B6ACD89D193DC0CC005E0B8A /* CCAnimate3D.h */; };
B6ACD8A1193DC0CC005E0B8A /* CCAnimate3D.h in Headers */ = {isa = PBXBuildFile; fileRef = B6ACD89D193DC0CC005E0B8A /* CCAnimate3D.h */; };
B6B2633F19381FBF0088FE25 /* CCAnimationCurve.h in Headers */ = {isa = PBXBuildFile; fileRef = B6B2633C19381FBF0088FE25 /* CCAnimationCurve.h */; };
B6B2634019381FBF0088FE25 /* CCAnimationCurve.h in Headers */ = {isa = PBXBuildFile; fileRef = B6B2633C19381FBF0088FE25 /* CCAnimationCurve.h */; };
B6B26343193884D60088FE25 /* CCAnimation3D.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6B26341193884D60088FE25 /* CCAnimation3D.cpp */; };
B6B26344193884D60088FE25 /* CCAnimation3D.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6B26341193884D60088FE25 /* CCAnimation3D.cpp */; };
B6B26345193884D60088FE25 /* CCAnimation3D.h in Headers */ = {isa = PBXBuildFile; fileRef = B6B26342193884D60088FE25 /* CCAnimation3D.h */; };
B6B26346193884D60088FE25 /* CCAnimation3D.h in Headers */ = {isa = PBXBuildFile; fileRef = B6B26342193884D60088FE25 /* CCAnimation3D.h */; };
ED9C6A9418599AD8000A5232 /* CCNodeGrid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ED9C6A9218599AD8000A5232 /* CCNodeGrid.cpp */; };
ED9C6A9518599AD8000A5232 /* CCNodeGrid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ED9C6A9218599AD8000A5232 /* CCNodeGrid.cpp */; };
ED9C6A9618599AD8000A5232 /* CCNodeGrid.h in Headers */ = {isa = PBXBuildFile; fileRef = ED9C6A9318599AD8000A5232 /* CCNodeGrid.h */; };
@ -1914,6 +1918,20 @@
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
1516202E199E76D9006099B8 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1551A336158F2AB200E66CFE /* Project object */;
proxyType = 1;
remoteGlobalIDString = 15161E42199E7362006099B8;
remoteInfo = "libcocos3d Mac";
};
15162224199E7B9E006099B8 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1551A336158F2AB200E66CFE /* Project object */;
proxyType = 1;
remoteGlobalIDString = 15162030199E7810006099B8;
remoteInfo = "libcocos3d iOS";
};
460E44F31807E241000CDD6D /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1551A336158F2AB200E66CFE /* Project object */;
@ -2088,6 +2106,9 @@
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>"; };
1516200B199E7363006099B8 /* libcocos3d Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libcocos3d Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; };
15162201199E7810006099B8 /* libcocos3d iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libcocos3d iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; };
15162236199F9EEA006099B8 /* cocos3d.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cocos3d.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; };
15EFA20F198A2BB5000C57D3 /* CCProtectedNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCProtectedNode.cpp; sourceTree = "<group>"; };
@ -3104,6 +3125,20 @@
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
15161F0B199E7362006099B8 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
15162101199E7810006099B8 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
1551A33C158F2AB200E66CFE /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
@ -3342,6 +3377,8 @@
B24EEA7619775ECE004493CC /* libcocosbuilder iOS.a */,
B24EEA7E19775EE1004493CC /* libspine iOS.a */,
B24EEA8619775EF3004493CC /* libnetwork iOS.a */,
1516200B199E7363006099B8 /* libcocos3d Mac.a */,
15162201199E7810006099B8 /* libcocos3d iOS.a */,
);
name = Products;
sourceTree = "<group>";
@ -5255,6 +5292,7 @@
B29594B81926D61F003EEF37 /* 3d */ = {
isa = PBXGroup;
children = (
15162236199F9EEA006099B8 /* cocos3d.h */,
B6105175199CB1A600DC41CE /* CCAABB.cpp */,
B6105176199CB1A600DC41CE /* CCAABB.h */,
B6105177199CB1A600DC41CE /* CCOBB.cpp */,
@ -5298,6 +5336,58 @@
/* End PBXGroup section */
/* Begin PBXHeadersBuildPhase section */
15161F1A199E7362006099B8 /* Headers */ = {
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
1516201C199E75FE006099B8 /* CCAABB.h in Headers */,
1516201D199E75FE006099B8 /* CCOBB.h in Headers */,
1516201E199E75FE006099B8 /* CCRay.h in Headers */,
1516201F199E75FE006099B8 /* CCSkeleton3D.h in Headers */,
15162020199E75FE006099B8 /* CCAttachNode.h in Headers */,
15162021199E75FE006099B8 /* CCSubMesh.h in Headers */,
15162022199E75FF006099B8 /* CCSubMeshState.h in Headers */,
15162023199E75FF006099B8 /* CCBundleReader.h in Headers */,
15162024199E75FF006099B8 /* CCBundle3D.h in Headers */,
15162025199E75FF006099B8 /* CCAnimate3D.h in Headers */,
15162237199F9EEA006099B8 /* cocos3d.h in Headers */,
15162026199E75FF006099B8 /* CCMeshSkin.h in Headers */,
15162027199E75FF006099B8 /* CCAnimation3D.h in Headers */,
15162028199E75FF006099B8 /* CCAnimationCurve.h in Headers */,
15162029199E75FF006099B8 /* CCMesh.h in Headers */,
1516202A199E75FF006099B8 /* CCObjLoader.h in Headers */,
1516202B199E75FF006099B8 /* CCSprite3D.h in Headers */,
1516202C199E75FF006099B8 /* CCSprite3DMaterial.h in Headers */,
1516202D199E75FF006099B8 /* CCBundle3DData.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
15162109199E7810006099B8 /* Headers */ = {
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
15162212199E7A32006099B8 /* CCAABB.h in Headers */,
15162213199E7A32006099B8 /* CCOBB.h in Headers */,
15162214199E7A32006099B8 /* CCRay.h in Headers */,
15162215199E7A32006099B8 /* CCSkeleton3D.h in Headers */,
15162216199E7A32006099B8 /* CCAttachNode.h in Headers */,
15162217199E7A32006099B8 /* CCSubMesh.h in Headers */,
15162218199E7A32006099B8 /* CCSubMeshState.h in Headers */,
15162219199E7A32006099B8 /* CCBundleReader.h in Headers */,
1516221A199E7A32006099B8 /* CCBundle3D.h in Headers */,
1516221B199E7A32006099B8 /* CCAnimate3D.h in Headers */,
15162238199F9EEA006099B8 /* cocos3d.h in Headers */,
1516221C199E7A32006099B8 /* CCMeshSkin.h in Headers */,
1516221D199E7A32006099B8 /* CCAnimation3D.h in Headers */,
1516221E199E7A32006099B8 /* CCAnimationCurve.h in Headers */,
1516221F199E7A32006099B8 /* CCMesh.h in Headers */,
15162220199E7A32006099B8 /* CCObjLoader.h in Headers */,
15162221199E7A32006099B8 /* CCSprite3D.h in Headers */,
15162222199E7A32006099B8 /* CCSprite3DMaterial.h in Headers */,
15162223199E7A32006099B8 /* CCBundle3DData.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
1551A33D158F2AB200E66CFE /* Headers */ = {
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
@ -5308,7 +5398,6 @@
50ABBE891925AB6F00A911A9 /* CCMap.h in Headers */,
50ABBE8D1925AB6F00A911A9 /* CCNS.h in Headers */,
50ABBEA51925AB6F00A911A9 /* CCScriptSupport.h in Headers */,
B29594D01926D61F003EEF37 /* CCSprite3DMaterial.h in Headers */,
1ABA68B01888D700007D1BB4 /* CCFontCharMap.h in Headers */,
5034CA3F191D591100CE6051 /* ccShader_Position_uColor.vert in Headers */,
50ABBD461925AB0000A911A9 /* CCVertex.h in Headers */,
@ -5347,13 +5436,11 @@
50ABBD8D1925AB4100A911A9 /* CCGLProgram.h in Headers */,
50ABBEA11925AB6F00A911A9 /* CCScheduler.h in Headers */,
50ABBDB71925AB4100A911A9 /* CCTexture2D.h in Headers */,
B2D3D3B91948613300BA4831 /* CCBundle3DData.h in Headers */,
50ABBE811925AB6F00A911A9 /* CCEventType.h in Headers */,
1A57008F180BC5A10088DEC7 /* CCActionTiledGrid.h in Headers */,
1A570093180BC5A10088DEC7 /* CCActionTween.h in Headers */,
50ABBD4A1925AB0000A911A9 /* Mat4.h in Headers */,
1A57009A180BC5C10088DEC7 /* CCAtlasNode.h in Headers */,
3E9E80F3198639EF00FA95D0 /* CCSubMeshState.h in Headers */,
1A5700A0180BC5D20088DEC7 /* CCNode.h in Headers */,
50ABC0671926664800A911A9 /* CCPlatformDefine.h in Headers */,
46C02E0918E91123004B7456 /* xxhash.h in Headers */,
@ -5366,7 +5453,6 @@
1AC0269C1914068200FA920D /* ConvertUTF.h in Headers */,
50ABBED11925AB6F00A911A9 /* TGAlib.h in Headers */,
1A57019F180BCB590088DEC7 /* CCFont.h in Headers */,
B6105185199CB1A600DC41CE /* CCRay.h in Headers */,
1A5701A3180BCB590088DEC7 /* CCFontAtlas.h in Headers */,
1A01C68618F57BE800EFE3A6 /* CCArray.h in Headers */,
1A5701A7180BCB590088DEC7 /* CCFontAtlasCache.h in Headers */,
@ -5376,7 +5462,6 @@
1A5701BB180BCB5A0088DEC7 /* CCLabel.h in Headers */,
1A5701BF180BCB5A0088DEC7 /* CCLabelAtlas.h in Headers */,
50ABBED91925AB6F00A911A9 /* ZipUtils.h in Headers */,
3E9E80EB198639EF00FA95D0 /* CCAttachNode.h in Headers */,
1A5701C3180BCB5A0088DEC7 /* CCLabelBMFont.h in Headers */,
50ABBE5F1925AB6F00A911A9 /* CCEventListener.h in Headers */,
1A5701C9180BCB5A0088DEC7 /* CCLabelTextFormatter.h in Headers */,
@ -5395,7 +5480,6 @@
1A5701FD180BCBAD0088DEC7 /* CCMenuItem.h in Headers */,
1A570204180BCBD40088DEC7 /* CCClippingNode.h in Headers */,
1A01C6A618F58F7500EFE3A6 /* CCNotificationCenter.h in Headers */,
B6105181199CB1A600DC41CE /* CCOBB.h in Headers */,
1A57020A180BCBDF0088DEC7 /* CCMotionStreak.h in Headers */,
1A570212180BCBF40088DEC7 /* CCProgressTimer.h in Headers */,
1A570216180BCBF40088DEC7 /* CCRenderTexture.h in Headers */,
@ -5426,7 +5510,6 @@
1A570294180BCCAB0088DEC7 /* CCAnimation.h in Headers */,
50ABBD421925AB0000A911A9 /* CCMathBase.h in Headers */,
1A570298180BCCAB0088DEC7 /* CCAnimationCache.h in Headers */,
B29594C81926D61F003EEF37 /* CCObjLoader.h in Headers */,
50ABBE911925AB6F00A911A9 /* CCPlatformMacros.h in Headers */,
50ABC05D1926664800A911A9 /* CCApplication.h in Headers */,
50ABC0071926664800A911A9 /* CCApplicationProtocol.h in Headers */,
@ -5449,7 +5532,6 @@
1A570302180BCE890088DEC7 /* CCParallaxNode.h in Headers */,
50ABBE4B1925AB6F00A911A9 /* CCEventAcceleration.h in Headers */,
1A57030E180BCF190088DEC7 /* CCComponent.h in Headers */,
3E9E80EF198639EF00FA95D0 /* CCSubMesh.h in Headers */,
1A570312180BCF190088DEC7 /* CCComponentContainer.h in Headers */,
50ABBD851925AB4100A911A9 /* CCBatchCommand.h in Headers */,
50ABC0651926664800A911A9 /* CCGL.h in Headers */,
@ -5458,7 +5540,6 @@
1A01C69418F57BE800EFE3A6 /* CCFloat.h in Headers */,
1A57034D180BD09B0088DEC7 /* tinyxml2.h in Headers */,
1A570356180BD0B00088DEC7 /* ioapi.h in Headers */,
B29594C41926D61F003EEF37 /* CCMesh.h in Headers */,
50ABBE331925AB6F00A911A9 /* CCConfiguration.h in Headers */,
50ABC01F1926664800A911A9 /* CCThread.h in Headers */,
1A57035A180BD0B00088DEC7 /* unzip.h in Headers */,
@ -5481,10 +5562,8 @@
50ABBD3A1925AB0000A911A9 /* CCAffineTransform.h in Headers */,
50ABBE571925AB6F00A911A9 /* CCEventFocus.h in Headers */,
1A01C69218F57BE800EFE3A6 /* CCDouble.h in Headers */,
3EA2A8421987A6810077B3D4 /* CCSkeleton3D.h in Headers */,
50ABBE251925AB6F00A911A9 /* base64.h in Headers */,
50ABBEC91925AB6F00A911A9 /* firePngData.h in Headers */,
B29594CC1926D61F003EEF37 /* CCSprite3D.h in Headers */,
503DD8F51926B0DB00CD74DD /* CCIMEDelegate.h in Headers */,
50ABBD5A1925AB0000A911A9 /* Vec2.h in Headers */,
B24AA987195A675C007B4522 /* CCFastTMXLayer.h in Headers */,
@ -5498,7 +5577,6 @@
50ABC00F1926664800A911A9 /* CCFileUtils.h in Headers */,
50ABBE3B1925AB6F00A911A9 /* CCData.h in Headers */,
50ABBE3F1925AB6F00A911A9 /* CCDataVisitor.h in Headers */,
3EA47872195478E00068D9D1 /* CCBundleReader.h in Headers */,
50ABBD9D1925AB4100A911A9 /* ccGLStateCache.h in Headers */,
50ABBEB91925AB6F00A911A9 /* ccUTF8.h in Headers */,
50ABBE671925AB6F00A911A9 /* CCEventListenerCustom.h in Headers */,
@ -5519,7 +5597,6 @@
50ABBDB31925AB4100A911A9 /* ccShaders.h in Headers */,
50ABBDAB1925AB4100A911A9 /* CCRenderCommandPool.h in Headers */,
5034CA45191D591100CE6051 /* ccShader_Label_outline.frag in Headers */,
B610517D199CB1A600DC41CE /* CCAABB.h in Headers */,
50ABBEB11925AB6F00A911A9 /* CCUserDefault.h in Headers */,
50ABBEC71925AB6F00A911A9 /* etc1.h in Headers */,
50ABBEA91925AB6F00A911A9 /* CCTouch.h in Headers */,
@ -5533,12 +5610,7 @@
50ABBD951925AB4100A911A9 /* CCGLProgramState.h in Headers */,
50ABC0091926664800A911A9 /* CCCommon.h in Headers */,
50ABBE531925AB6F00A911A9 /* CCEventDispatcher.h in Headers */,
B6B2633F19381FBF0088FE25 /* CCAnimationCurve.h in Headers */,
B6B26345193884D60088FE25 /* CCAnimation3D.h in Headers */,
464AD6E7197EBB1400E502D8 /* pvr.h in Headers */,
B6ACD899193D6693005E0B8A /* CCMeshSkin.h in Headers */,
B6ACD8A0193DC0CC005E0B8A /* CCAnimate3D.h in Headers */,
B6AAF84319404E0D0069DE01 /* CCBundle3D.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -5687,10 +5759,8 @@
50ABBD3B1925AB0000A911A9 /* CCAffineTransform.h in Headers */,
5034CA38191D591100CE6051 /* ccShader_PositionColorLengthTexture.vert in Headers */,
50ABBE7C1925AB6F00A911A9 /* CCEventMouse.h in Headers */,
B29594D11926D61F003EEF37 /* CCSprite3DMaterial.h in Headers */,
46A171011807CECB005B8026 /* CCPhysicsJoint.h in Headers */,
46A170FD1807CECB005B8026 /* CCPhysicsBody.h in Headers */,
B29594C51926D61F003EEF37 /* CCMesh.h in Headers */,
50ABBE9C1925AB6F00A911A9 /* CCRef.h in Headers */,
50ABBD961925AB4100A911A9 /* CCGLProgramState.h in Headers */,
46A171061807CECB005B8026 /* CCPhysicsWorld.h in Headers */,
@ -5722,13 +5792,11 @@
1A57007C180BC5A10088DEC7 /* CCActionInstant.h in Headers */,
3E6176751960F89B00DE83F5 /* CCEventController.h in Headers */,
50ABBE781925AB6F00A911A9 /* CCEventListenerTouch.h in Headers */,
B2D3D3BA1948613300BA4831 /* CCBundle3DData.h in Headers */,
B37510861823ACA100B3BA6A /* CCPhysicsWorldInfo_chipmunk.h in Headers */,
1A570080180BC5A10088DEC7 /* CCActionInterval.h in Headers */,
1A570084180BC5A10088DEC7 /* CCActionManager.h in Headers */,
50ABC0141926664800A911A9 /* CCGLView.h in Headers */,
1A570088180BC5A10088DEC7 /* CCActionPageTurn3D.h in Headers */,
3EA2A8431987A6810077B3D4 /* CCSkeleton3D.h in Headers */,
50ABBD9E1925AB4100A911A9 /* ccGLStateCache.h in Headers */,
1A57008C180BC5A10088DEC7 /* CCActionProgressTimer.h in Headers */,
1A570090180BC5A10088DEC7 /* CCActionTiledGrid.h in Headers */,
@ -5786,7 +5854,6 @@
50ABC00C1926664800A911A9 /* CCDevice.h in Headers */,
1A570205180BCBD40088DEC7 /* CCClippingNode.h in Headers */,
5034CA34191D591100CE6051 /* ccShader_PositionTexture_uColor.frag in Headers */,
B6105182199CB1A600DC41CE /* CCOBB.h in Headers */,
50ABBEA21925AB6F00A911A9 /* CCScheduler.h in Headers */,
1A57020B180BCBDF0088DEC7 /* CCMotionStreak.h in Headers */,
1A570213180BCBF40088DEC7 /* CCProgressTimer.h in Headers */,
@ -5821,7 +5888,6 @@
5034CA44191D591100CE6051 /* ccShader_Label.vert in Headers */,
1A5702F5180BCE750088DEC7 /* CCTMXObjectGroup.h in Headers */,
1A5702F9180BCE750088DEC7 /* CCTMXTiledMap.h in Headers */,
3E9E80F0198639EF00FA95D0 /* CCSubMesh.h in Headers */,
1AC0269D1914068200FA920D /* ConvertUTF.h in Headers */,
1A5702FD180BCE750088DEC7 /* CCTMXXMLParser.h in Headers */,
1A570303180BCE890088DEC7 /* CCParallaxNode.h in Headers */,
@ -5851,7 +5917,6 @@
5034CA4C191D591100CE6051 /* ccShader_Label_df_glow.frag in Headers */,
503DD8EB1926736A00CD74DD /* CCGL.h in Headers */,
50ABBE3C1925AB6F00A911A9 /* CCData.h in Headers */,
3E9E80EC198639EF00FA95D0 /* CCAttachNode.h in Headers */,
503DD8FA1926B0DB00CD74DD /* CCIMEDispatcher.h in Headers */,
50ABBEC81925AB6F00A911A9 /* etc1.h in Headers */,
50ABBDB01925AB4100A911A9 /* CCRenderer.h in Headers */,
@ -5860,12 +5925,10 @@
50ABBD861925AB4100A911A9 /* CCBatchCommand.h in Headers */,
50ABBE481925AB6F00A911A9 /* CCEvent.h in Headers */,
5027253B190BF1B900AAF4ED /* cocos2d.h in Headers */,
B29594CD1926D61F003EEF37 /* CCSprite3D.h in Headers */,
3E6176691960F89B00DE83F5 /* CCController.h in Headers */,
3E6176781960F89B00DE83F5 /* CCGameController.h in Headers */,
50ABBE641925AB6F00A911A9 /* CCEventListenerAcceleration.h in Headers */,
50ABBD921925AB4100A911A9 /* CCGLProgramCache.h in Headers */,
B29594C91926D61F003EEF37 /* CCObjLoader.h in Headers */,
50ABBE961925AB6F00A911A9 /* CCProfiling.h in Headers */,
503DD8E01926736A00CD74DD /* CCApplication.h in Headers */,
50ABBD8E1925AB4100A911A9 /* CCGLProgram.h in Headers */,
@ -5884,7 +5947,6 @@
50ABBE821925AB6F00A911A9 /* CCEventType.h in Headers */,
1AAF5852180E40B9000584C8 /* LocalStorage.h in Headers */,
50ABBD471925AB0000A911A9 /* CCVertex.h in Headers */,
B6105186199CB1A600DC41CE /* CCRay.h in Headers */,
1A9DCA2A180E6955007A3AD4 /* CCGLBufferedNode.h in Headers */,
1A01C69F18F57BE800EFE3A6 /* CCString.h in Headers */,
464AD6E8197EBB1400E502D8 /* pvr.h in Headers */,
@ -5900,10 +5962,8 @@
B276EF641988D1D500CD400F /* CCVertexIndexBuffer.h in Headers */,
ED9C6A9718599AD8000A5232 /* CCNodeGrid.h in Headers */,
50ABC0201926664800A911A9 /* CCThread.h in Headers */,
B610517E199CB1A600DC41CE /* CCAABB.h in Headers */,
1A01C69318F57BE800EFE3A6 /* CCDouble.h in Headers */,
50ABBE221925AB6F00A911A9 /* atitc.h in Headers */,
3EA47873195478E00068D9D1 /* CCBundleReader.h in Headers */,
50ABBED21925AB6F00A911A9 /* TGAlib.h in Headers */,
1A01C68D18F57BE800EFE3A6 /* CCDeprecated.h in Headers */,
503DD8EA1926736A00CD74DD /* CCESRenderer.h in Headers */,
@ -5915,14 +5975,8 @@
503DD8F11926736A00CD74DD /* OpenGL_Internal.h in Headers */,
B37510801823ACA100B3BA6A /* CCPhysicsHelper_chipmunk.h in Headers */,
50ABBDAA1925AB4100A911A9 /* CCRenderCommand.h in Headers */,
3E9E80F4198639EF00FA95D0 /* CCSubMeshState.h in Headers */,
50ABBE601925AB6F00A911A9 /* CCEventListener.h in Headers */,
50ABBEB21925AB6F00A911A9 /* CCUserDefault.h in Headers */,
B6B2634019381FBF0088FE25 /* CCAnimationCurve.h in Headers */,
B6B26346193884D60088FE25 /* CCAnimation3D.h in Headers */,
B6ACD89A193D6693005E0B8A /* CCMeshSkin.h in Headers */,
B6ACD8A1193DC0CC005E0B8A /* CCAnimate3D.h in Headers */,
B6AAF84419404E0D0069DE01 /* CCBundle3D.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -6414,6 +6468,40 @@
/* End PBXHeadersBuildPhase section */
/* Begin PBXNativeTarget section */
15161E42199E7362006099B8 /* libcocos3d Mac */ = {
isa = PBXNativeTarget;
buildConfigurationList = 15162008199E7363006099B8 /* Build configuration list for PBXNativeTarget "libcocos3d Mac" */;
buildPhases = (
15161E45199E7362006099B8 /* Sources */,
15161F0B199E7362006099B8 /* Frameworks */,
15161F1A199E7362006099B8 /* Headers */,
);
buildRules = (
);
dependencies = (
);
name = "libcocos3d Mac";
productName = cocos2dx;
productReference = 1516200B199E7363006099B8 /* libcocos3d Mac.a */;
productType = "com.apple.product-type.library.static";
};
15162030199E7810006099B8 /* libcocos3d iOS */ = {
isa = PBXNativeTarget;
buildConfigurationList = 151621FE199E7810006099B8 /* Build configuration list for PBXNativeTarget "libcocos3d iOS" */;
buildPhases = (
15162033199E7810006099B8 /* Sources */,
15162101199E7810006099B8 /* Frameworks */,
15162109199E7810006099B8 /* Headers */,
);
buildRules = (
);
dependencies = (
);
name = "libcocos3d iOS";
productName = cocos2dx;
productReference = 15162201199E7810006099B8 /* libcocos3d iOS.a */;
productType = "com.apple.product-type.library.static";
};
1551A33E158F2AB200E66CFE /* libcocos2d Mac */ = {
isa = PBXNativeTarget;
buildConfigurationList = 1551A34C158F2AB200E66CFE /* Build configuration list for PBXNativeTarget "libcocos2d Mac" */;
@ -6788,6 +6876,7 @@
A03F2B781780BD04006731B9 /* libchipmunk Mac */,
A03F2D5D1780BDF7006731B9 /* libbox2d Mac */,
A03F2E9817814268006731B9 /* libcocosdenshion Mac */,
15161E42199E7362006099B8 /* libcocos3d Mac */,
A07A4E0B178386390073F6A7 /* build all libs iOS */,
A07A4C241783777C0073F6A7 /* libcocos2d iOS */,
A07A4E111783867C0073F6A7 /* libextension iOS */,
@ -6799,11 +6888,58 @@
B24EEA6F19775ECE004493CC /* libcocosbuilder iOS */,
B24EEA7719775EE1004493CC /* libspine iOS */,
B24EEA7F19775EF3004493CC /* libnetwork iOS */,
15162030199E7810006099B8 /* libcocos3d iOS */,
);
};
/* End PBXProject section */
/* Begin PBXSourcesBuildPhase section */
15161E45199E7362006099B8 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
1516200C199E75C2006099B8 /* CCAABB.cpp in Sources */,
1516200D199E75C2006099B8 /* CCOBB.cpp in Sources */,
1516200E199E75C2006099B8 /* CCRay.cpp in Sources */,
1516200F199E75C2006099B8 /* CCSkeleton3D.cpp in Sources */,
15162010199E75C2006099B8 /* CCAttachNode.cpp in Sources */,
15162011199E75C2006099B8 /* CCSubMesh.cpp in Sources */,
15162012199E75C2006099B8 /* CCSubMeshState.cpp in Sources */,
15162013199E75C2006099B8 /* CCBundleReader.cpp in Sources */,
15162014199E75C2006099B8 /* CCBundle3D.cpp in Sources */,
15162015199E75C2006099B8 /* CCAnimate3D.cpp in Sources */,
15162016199E75C2006099B8 /* CCMeshSkin.cpp in Sources */,
15162017199E75C2006099B8 /* CCAnimation3D.cpp in Sources */,
15162018199E75C2006099B8 /* CCMesh.cpp in Sources */,
15162019199E75C2006099B8 /* CCObjLoader.cpp in Sources */,
1516201A199E75C2006099B8 /* CCSprite3D.cpp in Sources */,
1516201B199E75C2006099B8 /* CCSprite3DMaterial.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
15162033199E7810006099B8 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
15162202199E7874006099B8 /* CCAABB.cpp in Sources */,
15162203199E7874006099B8 /* CCOBB.cpp in Sources */,
15162204199E7874006099B8 /* CCRay.cpp in Sources */,
15162205199E7874006099B8 /* CCSkeleton3D.cpp in Sources */,
15162206199E7874006099B8 /* CCAttachNode.cpp in Sources */,
15162207199E7874006099B8 /* CCSubMesh.cpp in Sources */,
15162208199E7874006099B8 /* CCSubMeshState.cpp in Sources */,
15162209199E7874006099B8 /* CCBundleReader.cpp in Sources */,
1516220A199E7874006099B8 /* CCBundle3D.cpp in Sources */,
1516220B199E7874006099B8 /* CCAnimate3D.cpp in Sources */,
1516220C199E7874006099B8 /* CCMeshSkin.cpp in Sources */,
1516220D199E7874006099B8 /* CCAnimation3D.cpp in Sources */,
1516220E199E7874006099B8 /* CCMesh.cpp in Sources */,
1516220F199E7874006099B8 /* CCObjLoader.cpp in Sources */,
15162210199E7874006099B8 /* CCSprite3D.cpp in Sources */,
15162211199E7874006099B8 /* CCSprite3DMaterial.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
1551A33B158F2AB200E66CFE /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
@ -6823,14 +6959,12 @@
46A170ED1807CECA005B8026 /* CCPhysicsShape.cpp in Sources */,
50ABBE991925AB6F00A911A9 /* CCRef.cpp in Sources */,
ED9C6A9418599AD8000A5232 /* CCNodeGrid.cpp in Sources */,
B610517F199CB1A600DC41CE /* CCOBB.cpp in Sources */,
46A170E61807CECA005B8026 /* CCPhysicsBody.cpp in Sources */,
50ABBDA71925AB4100A911A9 /* CCRenderCommand.cpp in Sources */,
50ABBD501925AB0000A911A9 /* Quaternion.cpp in Sources */,
50ABBEBB1925AB6F00A911A9 /* ccUtils.cpp in Sources */,
15EFA211198A2BB5000C57D3 /* CCProtectedNode.cpp in Sources */,
50ABBEB71925AB6F00A911A9 /* ccUTF8.cpp in Sources */,
3E9E80F1198639EF00FA95D0 /* CCSubMeshState.cpp in Sources */,
50ABBE271925AB6F00A911A9 /* CCAutoreleasePool.cpp in Sources */,
50ABBE8B1925AB6F00A911A9 /* CCNS.cpp in Sources */,
46A170E81807CECA005B8026 /* CCPhysicsContact.cpp in Sources */,
@ -6855,7 +6989,6 @@
1A57008D180BC5A10088DEC7 /* CCActionTiledGrid.cpp in Sources */,
1A570091180BC5A10088DEC7 /* CCActionTween.cpp in Sources */,
50ABBEBF1925AB6F00A911A9 /* CCValue.cpp in Sources */,
3E9E80E9198639EF00FA95D0 /* CCAttachNode.cpp in Sources */,
1A570098180BC5C10088DEC7 /* CCAtlasNode.cpp in Sources */,
1A57009E180BC5D20088DEC7 /* CCNode.cpp in Sources */,
B257B460198A353E00D9A687 /* CCPrimitiveCommand.cpp in Sources */,
@ -6875,7 +7008,6 @@
1A5701B1180BCB590088DEC7 /* CCFontFNT.cpp in Sources */,
1A5701B5180BCB590088DEC7 /* CCFontFreeType.cpp in Sources */,
1A5701B9180BCB5A0088DEC7 /* CCLabel.cpp in Sources */,
3EA2A8401987A6810077B3D4 /* CCSkeleton3D.cpp in Sources */,
1A5701BD180BCB5A0088DEC7 /* CCLabelAtlas.cpp in Sources */,
50ABBE551925AB6F00A911A9 /* CCEventFocus.cpp in Sources */,
50ABBE491925AB6F00A911A9 /* CCEventAcceleration.cpp in Sources */,
@ -6888,7 +7020,6 @@
1A5701CB180BCB5A0088DEC7 /* CCLabelTTF.cpp in Sources */,
50ABBE711925AB6F00A911A9 /* CCEventListenerMouse.cpp in Sources */,
1A5701DE180BCB8C0088DEC7 /* CCLayer.cpp in Sources */,
3E9E80ED198639EF00FA95D0 /* CCSubMesh.cpp in Sources */,
1A5701E2180BCB8C0088DEC7 /* CCScene.cpp in Sources */,
1A12775C18DFCC590005F345 /* CCTweenFunction.cpp in Sources */,
1A5701E6180BCB8C0088DEC7 /* CCTransition.cpp in Sources */,
@ -6922,7 +7053,6 @@
50ABBEAF1925AB6F00A911A9 /* CCUserDefault.cpp in Sources */,
50ABBE791925AB6F00A911A9 /* CCEventMouse.cpp in Sources */,
50ABC0111926664800A911A9 /* CCGLView.cpp in Sources */,
B29594C21926D61F003EEF37 /* CCMesh.cpp in Sources */,
50ABBE3D1925AB6F00A911A9 /* CCDataVisitor.cpp in Sources */,
1A5702C8180BCE370088DEC7 /* CCTextFieldTTF.cpp in Sources */,
50ABBE7D1925AB6F00A911A9 /* CCEventTouch.cpp in Sources */,
@ -6941,21 +7071,17 @@
1A01C69C18F57BE800EFE3A6 /* CCString.cpp in Sources */,
50ABBD3C1925AB0000A911A9 /* CCGeometry.cpp in Sources */,
50ABC0011926664800A911A9 /* CCLock.cpp in Sources */,
B6105183199CB1A600DC41CE /* CCRay.cpp in Sources */,
50ABBD931925AB4100A911A9 /* CCGLProgramState.cpp in Sources */,
1A57034B180BD09B0088DEC7 /* tinyxml2.cpp in Sources */,
1A570354180BD0B00088DEC7 /* ioapi.cpp in Sources */,
1A570358180BD0B00088DEC7 /* unzip.cpp in Sources */,
3EA47870195478E00068D9D1 /* CCBundleReader.cpp in Sources */,
50ABBEB31925AB6F00A911A9 /* CCUserDefault.mm in Sources */,
50ABBEB51925AB6F00A911A9 /* CCUserDefaultAndroid.cpp in Sources */,
50ABBE831925AB6F00A911A9 /* ccFPSImages.c in Sources */,
50ABBEA71925AB6F00A911A9 /* CCTouch.cpp in Sources */,
50ABBD8B1925AB4100A911A9 /* CCGLProgram.cpp in Sources */,
B610517B199CB1A600DC41CE /* CCAABB.cpp in Sources */,
464AD6E5197EBB1400E502D8 /* pvr.cpp in Sources */,
50ABBDA31925AB4100A911A9 /* CCQuadCommand.cpp in Sources */,
B29594C61926D61F003EEF37 /* CCObjLoader.cpp in Sources */,
50ABC01D1926664800A911A9 /* CCThread.cpp in Sources */,
50ABBECB1925AB6F00A911A9 /* s3tc.cpp in Sources */,
50ABBD481925AB0000A911A9 /* Mat4.cpp in Sources */,
@ -6966,7 +7092,6 @@
50ABBE751925AB6F00A911A9 /* CCEventListenerTouch.cpp in Sources */,
50ABBE511925AB6F00A911A9 /* CCEventDispatcher.cpp in Sources */,
50ABC0051926664800A911A9 /* CCThread.mm in Sources */,
B29594CA1926D61F003EEF37 /* CCSprite3D.cpp in Sources */,
50ABC0631926664800A911A9 /* CCDevice.mm in Sources */,
50ABBE1F1925AB6F00A911A9 /* atitc.cpp in Sources */,
1A01C69818F57BE800EFE3A6 /* CCSet.cpp in Sources */,
@ -6984,7 +7109,6 @@
50ABBD9F1925AB4100A911A9 /* CCGroupCommand.cpp in Sources */,
50ABBD871925AB4100A911A9 /* CCCustomCommand.cpp in Sources */,
50ABBDBD1925AB4100A911A9 /* CCTextureCache.cpp in Sources */,
B29594CE1926D61F003EEF37 /* CCSprite3DMaterial.cpp in Sources */,
299754F4193EC95400A54AC3 /* ObjectFactory.cpp in Sources */,
50ABC0211926664800A911A9 /* CCGLViewImpl.cpp in Sources */,
50ABC00D1926664800A911A9 /* CCFileUtils.cpp in Sources */,
@ -7001,10 +7125,6 @@
46C02E0718E91123004B7456 /* xxhash.c in Sources */,
50ABBE931925AB6F00A911A9 /* CCProfiling.cpp in Sources */,
1ABA68AE1888D700007D1BB4 /* CCFontCharMap.cpp in Sources */,
B6B26343193884D60088FE25 /* CCAnimation3D.cpp in Sources */,
B6ACD897193D6693005E0B8A /* CCMeshSkin.cpp in Sources */,
B6ACD89E193DC0CC005E0B8A /* CCAnimate3D.cpp in Sources */,
B6AAF84119404E0D0069DE01 /* CCBundle3D.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -7158,7 +7278,6 @@
B2CC507C19776DD10041958E /* CCPhysicsJoint.cpp in Sources */,
B2165EEA19921124000BE3E6 /* CCPrimitiveCommand.cpp in Sources */,
503DD8EE1926736A00CD74DD /* CCImage.mm in Sources */,
3EA47871195478E00068D9D1 /* CCBundleReader.cpp in Sources */,
B37510811823ACA100B3BA6A /* CCPhysicsJointInfo_chipmunk.cpp in Sources */,
46A170FC1807CECB005B8026 /* CCPhysicsBody.cpp in Sources */,
50ABBD941925AB4100A911A9 /* CCGLProgramState.cpp in Sources */,
@ -7167,7 +7286,6 @@
46A170FE1807CECB005B8026 /* CCPhysicsContact.cpp in Sources */,
1A570062180BC5A10088DEC7 /* CCAction.cpp in Sources */,
1A570066180BC5A10088DEC7 /* CCActionCamera.cpp in Sources */,
3E9E80F2198639EF00FA95D0 /* CCSubMeshState.cpp in Sources */,
B276EF661988D1D500CD400F /* CCVertexIndexBuffer.cpp in Sources */,
1A57006A180BC5A10088DEC7 /* CCActionCatmullRom.cpp in Sources */,
1A57006E180BC5A10088DEC7 /* CCActionEase.cpp in Sources */,
@ -7175,14 +7293,11 @@
1A570072180BC5A10088DEC7 /* CCActionGrid.cpp in Sources */,
50ABBE621925AB6F00A911A9 /* CCEventListenerAcceleration.cpp in Sources */,
3E6176681960F89B00DE83F5 /* CCController-iOS.mm in Sources */,
B6105180199CB1A600DC41CE /* CCOBB.cpp in Sources */,
B29594B51926D5EC003EEF37 /* CCMeshCommand.cpp in Sources */,
B6105184199CB1A600DC41CE /* CCRay.cpp in Sources */,
50ABBE7E1925AB6F00A911A9 /* CCEventTouch.cpp in Sources */,
50ABBE6E1925AB6F00A911A9 /* CCEventListenerKeyboard.cpp in Sources */,
50ABBE461925AB6F00A911A9 /* CCEvent.cpp in Sources */,
50ABBEA01925AB6F00A911A9 /* CCScheduler.cpp in Sources */,
3E9E80EA198639EF00FA95D0 /* CCAttachNode.cpp in Sources */,
50ABBE4E1925AB6F00A911A9 /* CCEventCustom.cpp in Sources */,
50ABBE761925AB6F00A911A9 /* CCEventListenerTouch.cpp in Sources */,
50ABBE5A1925AB6F00A911A9 /* CCEventKeyboard.cpp in Sources */,
@ -7197,7 +7312,6 @@
1A570082180BC5A10088DEC7 /* CCActionManager.cpp in Sources */,
1A570086180BC5A10088DEC7 /* CCActionPageTurn3D.cpp in Sources */,
1A57008A180BC5A10088DEC7 /* CCActionProgressTimer.cpp in Sources */,
B29594CB1926D61F003EEF37 /* CCSprite3D.cpp in Sources */,
50ABBED81925AB6F00A911A9 /* ZipUtils.cpp in Sources */,
1A57008E180BC5A10088DEC7 /* CCActionTiledGrid.cpp in Sources */,
1A570092180BC5A10088DEC7 /* CCActionTween.cpp in Sources */,
@ -7206,7 +7320,6 @@
50ABBE3E1925AB6F00A911A9 /* CCDataVisitor.cpp in Sources */,
1A57009F180BC5D20088DEC7 /* CCNode.cpp in Sources */,
B37510831823ACA100B3BA6A /* CCPhysicsShapeInfo_chipmunk.cpp in Sources */,
B29594CF1926D61F003EEF37 /* CCSprite3DMaterial.cpp in Sources */,
1A57010F180BC8EE0088DEC7 /* CCDrawingPrimitives.cpp in Sources */,
1A570113180BC8EE0088DEC7 /* CCDrawNode.cpp in Sources */,
1A57011C180BC90D0088DEC7 /* CCGrabber.cpp in Sources */,
@ -7255,7 +7368,6 @@
1A57022E180BCC1A0088DEC7 /* CCParticleSystemQuad.cpp in Sources */,
50ABBD901925AB4100A911A9 /* CCGLProgramCache.cpp in Sources */,
1A57027F180BCC900088DEC7 /* CCSprite.cpp in Sources */,
3EA2A8411987A6810077B3D4 /* CCSkeleton3D.cpp in Sources */,
1A570283180BCC900088DEC7 /* CCSpriteBatchNode.cpp in Sources */,
1A570287180BCC900088DEC7 /* CCSpriteFrame.cpp in Sources */,
1A57028B180BCC900088DEC7 /* CCSpriteFrameCache.cpp in Sources */,
@ -7291,7 +7403,6 @@
50ABBD881925AB4100A911A9 /* CCCustomCommand.cpp in Sources */,
50ABBE941925AB6F00A911A9 /* CCProfiling.cpp in Sources */,
50ABBE5E1925AB6F00A911A9 /* CCEventListener.cpp in Sources */,
B29594C31926D61F003EEF37 /* CCMesh.cpp in Sources */,
50ABBEA81925AB6F00A911A9 /* CCTouch.cpp in Sources */,
503DD8E91926736A00CD74DD /* CCES2Renderer.m in Sources */,
5027253D190BF1B900AAF4ED /* cocos2d.cpp in Sources */,
@ -7300,7 +7411,6 @@
503DD8F81926B0DB00CD74DD /* CCIMEDispatcher.cpp in Sources */,
50ABBDB21925AB4100A911A9 /* ccShaders.cpp in Sources */,
50ABBD451925AB0000A911A9 /* CCVertex.cpp in Sources */,
B29594C71926D61F003EEF37 /* CCObjLoader.cpp in Sources */,
50ABBEB01925AB6F00A911A9 /* CCUserDefault.cpp in Sources */,
50ABBE521925AB6F00A911A9 /* CCEventDispatcher.cpp in Sources */,
1A01C68B18F57BE800EFE3A6 /* CCDeprecated.cpp in Sources */,
@ -7318,7 +7428,6 @@
50ABBE9A1925AB6F00A911A9 /* CCRef.cpp in Sources */,
3E6176741960F89B00DE83F5 /* CCEventController.cpp in Sources */,
50ABBE361925AB6F00A911A9 /* CCConsole.cpp in Sources */,
3E9E80EE198639EF00FA95D0 /* CCSubMesh.cpp in Sources */,
503DD8E51926736A00CD74DD /* CCDirectorCaller.mm in Sources */,
50ABBD5D1925AB0000A911A9 /* Vec3.cpp in Sources */,
50ABC0121926664800A911A9 /* CCGLView.cpp in Sources */,
@ -7331,7 +7440,6 @@
50ABBE4A1925AB6F00A911A9 /* CCEventAcceleration.cpp in Sources */,
46C02E0818E91123004B7456 /* xxhash.c in Sources */,
50ABBED01925AB6F00A911A9 /* TGAlib.cpp in Sources */,
B610517C199CB1A600DC41CE /* CCAABB.cpp in Sources */,
1A01C68518F57BE800EFE3A6 /* CCArray.cpp in Sources */,
503DD8E31926736A00CD74DD /* CCDevice.mm in Sources */,
50ABBEB41925AB6F00A911A9 /* CCUserDefault.mm in Sources */,
@ -7342,10 +7450,6 @@
50ABBE7A1925AB6F00A911A9 /* CCEventMouse.cpp in Sources */,
15EFA212198A2BB5000C57D3 /* CCProtectedNode.cpp in Sources */,
50ABBD981925AB4100A911A9 /* CCGLProgramStateCache.cpp in Sources */,
B6B26344193884D60088FE25 /* CCAnimation3D.cpp in Sources */,
B6ACD898193D6693005E0B8A /* CCMeshSkin.cpp in Sources */,
B6ACD89F193DC0CC005E0B8A /* CCAnimate3D.cpp in Sources */,
B6AAF84219404E0D0069DE01 /* CCBundle3D.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -7810,6 +7914,16 @@
/* End PBXSourcesBuildPhase section */
/* Begin PBXTargetDependency section */
1516202F199E76D9006099B8 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 15161E42199E7362006099B8 /* libcocos3d Mac */;
targetProxy = 1516202E199E76D9006099B8 /* PBXContainerItemProxy */;
};
15162225199E7B9E006099B8 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 15162030199E7810006099B8 /* libcocos3d iOS */;
targetProxy = 15162224199E7B9E006099B8 /* PBXContainerItemProxy */;
};
460E44F41807E241000CDD6D /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = A03F2B781780BD04006731B9 /* libchipmunk Mac */;
@ -7923,6 +8037,106 @@
/* End PBXTargetDependency section */
/* Begin XCBuildConfiguration section */
15162009199E7363006099B8 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = YES;
ARCHS = "$(ARCHS_STANDARD)";
EXECUTABLE_EXTENSION = a;
EXECUTABLE_PREFIX = "";
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "../cocos/cocos2d-prefix.pch";
GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)",
CC_TARGET_OS_MAC,
CC_KEYBOARD_SUPPORT,
_USRDLL,
);
GCC_TREAT_WARNINGS_AS_ERRORS = NO;
HEADER_SEARCH_PATHS = "";
LD_DYLIB_INSTALL_NAME = "";
LIBRARY_SEARCH_PATHS = "$(inherited)";
MACH_O_TYPE = staticlib;
PRODUCT_NAME = "libcocos3d Mac";
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../cocos/platform/desktop $(SRCROOT)/../external/glfw3/include/mac";
};
name = Debug;
};
1516200A199E7363006099B8 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = YES;
ARCHS = "$(ARCHS_STANDARD)";
EXECUTABLE_EXTENSION = a;
EXECUTABLE_PREFIX = "";
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "../cocos/cocos2d-prefix.pch";
GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)",
CC_KEYBOARD_SUPPORT,
CC_TARGET_OS_MAC,
_USRDLL,
);
GCC_TREAT_WARNINGS_AS_ERRORS = NO;
HEADER_SEARCH_PATHS = "";
LD_DYLIB_INSTALL_NAME = "";
LIBRARY_SEARCH_PATHS = "$(inherited)";
MACH_O_TYPE = staticlib;
PRODUCT_NAME = "libcocos3d Mac";
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../cocos/platform/desktop $(SRCROOT)/../external/glfw3/include/mac";
};
name = Release;
};
151621FF199E7810006099B8 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = YES;
ARCHS = "$(ARCHS_STANDARD)";
EXECUTABLE_PREFIX = "";
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "../cocos/cocos2d-prefix.pch";
GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)",
CC_TARGET_OS_IPHONE,
);
GCC_TREAT_WARNINGS_AS_ERRORS = NO;
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
HEADER_SEARCH_PATHS = "";
IPHONEOS_DEPLOYMENT_TARGET = 5.1.1;
LIBRARY_SEARCH_PATHS = "";
PRODUCT_NAME = "libcocos3d iOS";
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../external/freetype2/include/ios $(SRCROOT)/../external/curl/include/ios $(SRCROOT)/../external/webp/include/ios $(SRCROOT)/../external/tiff/include/ios $(SRCROOT)/../external/jpeg/include/ios $(SRCROOT)/../external/png/include/ios";
};
name = Debug;
};
15162200199E7810006099B8 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = YES;
ARCHS = "$(ARCHS_STANDARD)";
EXECUTABLE_PREFIX = "";
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "../cocos/cocos2d-prefix.pch";
GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)",
CC_TARGET_OS_IPHONE,
);
GCC_TREAT_WARNINGS_AS_ERRORS = NO;
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
HEADER_SEARCH_PATHS = "";
IPHONEOS_DEPLOYMENT_TARGET = 5.1.1;
LIBRARY_SEARCH_PATHS = "";
PRODUCT_NAME = "libcocos3d iOS";
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../external/freetype2/include/ios $(SRCROOT)/../external/curl/include/ios $(SRCROOT)/../external/webp/include/ios $(SRCROOT)/../external/tiff/include/ios $(SRCROOT)/../external/jpeg/include/ios $(SRCROOT)/../external/png/include/ios";
};
name = Release;
};
1551A34A158F2AB200E66CFE /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
@ -8873,6 +9087,24 @@
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
15162008199E7363006099B8 /* Build configuration list for PBXNativeTarget "libcocos3d Mac" */ = {
isa = XCConfigurationList;
buildConfigurations = (
15162009199E7363006099B8 /* Debug */,
1516200A199E7363006099B8 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
151621FE199E7810006099B8 /* Build configuration list for PBXNativeTarget "libcocos3d iOS" */ = {
isa = XCConfigurationList;
buildConfigurations = (
151621FF199E7810006099B8 /* Debug */,
15162200199E7810006099B8 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
1551A339158F2AB200E66CFE /* Build configuration list for PBXProject "cocos2d_libs" */ = {
isa = XCConfigurationList;
buildConfigurations = (

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

@ -58,11 +58,17 @@
1503FAC418DA8B6C00F6518C /* tp.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAB118DA8B6C00F6518C /* tp.lua */; };
1503FAC518DA8B6C00F6518C /* url.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAB218DA8B6C00F6518C /* url.lua */; };
1503FAC618DA8B6C00F6518C /* url.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAB218DA8B6C00F6518C /* url.lua */; };
15162232199F95C6006099B8 /* libcocos3d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1516222D199F95B2006099B8 /* libcocos3d Mac.a */; };
15162235199F97E1006099B8 /* libcocos3d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1516222F199F95B2006099B8 /* libcocos3d iOS.a */; };
151622C819A0F689006099B8 /* libluacocos3d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 151622C319A0F66B006099B8 /* libluacocos3d Mac.a */; };
151622C919A0F692006099B8 /* libcocos3d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1516222D199F95B2006099B8 /* libcocos3d Mac.a */; };
15427B79198B879900DC375D /* libluacocos2d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15EFA665198B33EE000C57D3 /* libluacocos2d iOS.a */; };
15427B7A198B87AA00DC375D /* libcocos2d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FBE1807A4F9005B8026 /* libcocos2d iOS.a */; };
15427B7D198B880100DC375D /* lua_cocos2dx_controller_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15427B7B198B880100DC375D /* lua_cocos2dx_controller_manual.cpp */; };
15427B7E198B896D00DC375D /* libcocosdenshion iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FC61807A4F9005B8026 /* libcocosdenshion iOS.a */; };
156EAE071977D0BD00F53709 /* ActionTimeline in Resources */ = {isa = PBXBuildFile; fileRef = 38FA2E75194AECF800FF2BE4 /* ActionTimeline */; };
158C129419A0FC6400781A76 /* libcocos3d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1516222F199F95B2006099B8 /* libcocos3d iOS.a */; };
158C129519A0FC6400781A76 /* libluacocos3d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 151622C519A0F66B006099B8 /* libluacocos3d iOS.a */; };
15AECE0B195C0F8A00907DB0 /* MediaPlayer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3EA0FB65191B933000B170C8 /* MediaPlayer.framework */; };
15AECE0F195C1FDD00907DB0 /* cocosvideo.mp4 in Resources */ = {isa = PBXBuildFile; fileRef = 3EA0FB5D191B92F100B170C8 /* cocosvideo.mp4 */; };
15AECE25195D467D00907DB0 /* MediaPlayer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3EA0FB65191B933000B170C8 /* MediaPlayer.framework */; };
@ -1002,6 +1008,62 @@
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
15162226199F95B2006099B8 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 15161E42199E7362006099B8;
remoteInfo = "libcocos3d Mac";
};
1516222C199F95B2006099B8 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 1516200B199E7363006099B8;
remoteInfo = "libcocos3d Mac";
};
1516222E199F95B2006099B8 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 15162201199E7810006099B8;
remoteInfo = "libcocos3d iOS";
};
15162233199F97D1006099B8 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 15162030199E7810006099B8;
remoteInfo = "libcocos3d iOS";
};
151622BE19A0F66B006099B8 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1ABCA27618CD90A40087CE3A /* cocos2d_lua_bindings.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 1516224519A0F32D006099B8;
remoteInfo = "libluacocos3d Mac";
};
151622C219A0F66B006099B8 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1ABCA27618CD90A40087CE3A /* cocos2d_lua_bindings.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 1516227C19A0F32D006099B8;
remoteInfo = "libluacocos3d Mac";
};
151622C419A0F66B006099B8 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1ABCA27618CD90A40087CE3A /* cocos2d_lua_bindings.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 151622BB19A0F45E006099B8;
remoteInfo = "libluacocos3d iOS";
};
151622C619A0F679006099B8 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 15161E42199E7362006099B8;
remoteInfo = "libcocos3d Mac";
};
15427B80198B8ACB00DC375D /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1ABCA27618CD90A40087CE3A /* cocos2d_lua_bindings.xcodeproj */;
@ -1191,6 +1253,20 @@
remoteGlobalIDString = 15C1C255198748D200A46ACC;
remoteInfo = "libluacocos2d Mac";
};
158C128B19A0FC4700781A76 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 15162030199E7810006099B8;
remoteInfo = "libcocos3d iOS";
};
158C129219A0FC5300781A76 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1ABCA27618CD90A40087CE3A /* cocos2d_lua_bindings.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 1516228319A0F45E006099B8;
remoteInfo = "libluacocos3d iOS";
};
15CBA017196EE56C005877BB /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */;
@ -3786,6 +3862,8 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
151622C919A0F692006099B8 /* libcocos3d Mac.a in Frameworks */,
151622C819A0F689006099B8 /* libluacocos3d Mac.a in Frameworks */,
15EFA27A198B269E000C57D3 /* libluaextension Mac.a in Frameworks */,
15EFA279198B268A000C57D3 /* libluanetwork Mac.a in Frameworks */,
15EFA278198B2673000C57D3 /* libluaspine Mac.a in Frameworks */,
@ -3820,6 +3898,8 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
158C129419A0FC6400781A76 /* libcocos3d iOS.a in Frameworks */,
158C129519A0FC6400781A76 /* libluacocos3d iOS.a in Frameworks */,
15EFA66F198B356E000C57D3 /* libluacocos2d iOS.a in Frameworks */,
15EFA670198B356E000C57D3 /* libluacocosbuilder iOS.a in Frameworks */,
15EFA671198B356E000C57D3 /* libluacocosdenshion iOS.a in Frameworks */,
@ -3855,6 +3935,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
15162232199F95C6006099B8 /* libcocos3d Mac.a in Frameworks */,
B244F3171976878E00ED1926 /* libnetwork Mac.a in Frameworks */,
B2DB493A197681E500411E16 /* libspine Mac.a in Frameworks */,
B2DB48C619767DAC00411E16 /* libcocostudio Mac.a in Frameworks */,
@ -3902,6 +3983,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
15162235199F97E1006099B8 /* libcocos3d iOS.a in Frameworks */,
B2C59AC8197782B900B452DF /* libcocosbuilder iOS.a in Frameworks */,
B2C59AC9197782B900B452DF /* libui iOS.a in Frameworks */,
B2C59ACA197782B900B452DF /* libcocostudio iOS.a in Frameworks */,
@ -6046,6 +6128,7 @@
15EFA252198A4A24000C57D3 /* libluaspine Mac.a */,
15EFA254198A4A24000C57D3 /* libluanetwork Mac.a */,
15EFA256198A4A24000C57D3 /* libluacocosdenshion Mac.a */,
151622C319A0F66B006099B8 /* libluacocos3d Mac.a */,
15EFA258198A4A24000C57D3 /* libluacocos2d Mac.a */,
15EFA25A198A4A24000C57D3 /* libluaextension iOS.a */,
15EFA659198B33EE000C57D3 /* libluaui iOS.a */,
@ -6054,6 +6137,7 @@
15EFA65F198B33EE000C57D3 /* libluaspine iOS.a */,
15EFA661198B33EE000C57D3 /* libluanetwork iOS.a */,
15EFA663198B33EE000C57D3 /* libluacocosdenshion iOS.a */,
151622C519A0F66B006099B8 /* libluacocos3d iOS.a */,
15EFA665198B33EE000C57D3 /* libluacocos2d iOS.a */,
);
name = Products;
@ -7925,6 +8009,7 @@
46A15FB41807A4F9005B8026 /* libchipmunk Mac.a */,
46A15FB61807A4F9005B8026 /* libbox2d Mac.a */,
46A15FB81807A4F9005B8026 /* libcocosdenshion Mac.a */,
1516222D199F95B2006099B8 /* libcocos3d Mac.a */,
46A15FBE1807A4F9005B8026 /* libcocos2d iOS.a */,
46A15FC01807A4F9005B8026 /* libextension iOS.a */,
46A15FC21807A4F9005B8026 /* libchipmunk iOS.a */,
@ -7935,6 +8020,7 @@
B2CC503D197763A20041958E /* libcocosbuilder iOS.a */,
B2CC503F197763A20041958E /* libspine iOS.a */,
B2CC5041197763A20041958E /* libnetwork iOS.a */,
1516222F199F95B2006099B8 /* libcocos3d iOS.a */,
);
name = Products;
sourceTree = "<group>";
@ -8059,6 +8145,8 @@
buildRules = (
);
dependencies = (
151622C719A0F679006099B8 /* PBXTargetDependency */,
151622BF19A0F66B006099B8 /* PBXTargetDependency */,
15427BA7198B8C5000DC375D /* PBXTargetDependency */,
15427BA9198B8C5000DC375D /* PBXTargetDependency */,
15427BAB198B8C5000DC375D /* PBXTargetDependency */,
@ -8093,6 +8181,8 @@
buildRules = (
);
dependencies = (
158C129319A0FC5300781A76 /* PBXTargetDependency */,
158C128C19A0FC4700781A76 /* PBXTargetDependency */,
15427B87198B8BB400DC375D /* PBXTargetDependency */,
15427B89198B8BB400DC375D /* PBXTargetDependency */,
15427B8B198B8BB400DC375D /* PBXTargetDependency */,
@ -8127,6 +8217,7 @@
buildRules = (
);
dependencies = (
15162227199F95B2006099B8 /* PBXTargetDependency */,
B244F3111976878700ED1926 /* PBXTargetDependency */,
B2DB49361976819900411E16 /* PBXTargetDependency */,
B2DB48C519767DA500411E16 /* PBXTargetDependency */,
@ -8173,6 +8264,7 @@
buildRules = (
);
dependencies = (
15162234199F97D1006099B8 /* PBXTargetDependency */,
B2C59ABE197782AC00B452DF /* PBXTargetDependency */,
B2C59AC0197782AC00B452DF /* PBXTargetDependency */,
B2C59AC2197782AC00B452DF /* PBXTargetDependency */,
@ -8240,6 +8332,34 @@
/* End PBXProject section */
/* Begin PBXReferenceProxy section */
1516222D199F95B2006099B8 /* libcocos3d Mac.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = "libcocos3d Mac.a";
remoteRef = 1516222C199F95B2006099B8 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
1516222F199F95B2006099B8 /* libcocos3d iOS.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = "libcocos3d iOS.a";
remoteRef = 1516222E199F95B2006099B8 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
151622C319A0F66B006099B8 /* libluacocos3d Mac.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = "libluacocos3d Mac.a";
remoteRef = 151622C219A0F66B006099B8 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
151622C519A0F66B006099B8 /* libluacocos3d iOS.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = "libluacocos3d iOS.a";
remoteRef = 151622C419A0F66B006099B8 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
15EFA24A198A4A24000C57D3 /* libluaextension Mac.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
@ -9418,6 +9538,26 @@
/* End PBXSourcesBuildPhase section */
/* Begin PBXTargetDependency section */
15162227199F95B2006099B8 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = "libcocos3d Mac";
targetProxy = 15162226199F95B2006099B8 /* PBXContainerItemProxy */;
};
15162234199F97D1006099B8 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = "libcocos3d iOS";
targetProxy = 15162233199F97D1006099B8 /* PBXContainerItemProxy */;
};
151622BF19A0F66B006099B8 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = "libluacocos3d Mac";
targetProxy = 151622BE19A0F66B006099B8 /* PBXContainerItemProxy */;
};
151622C719A0F679006099B8 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = "libcocos3d Mac";
targetProxy = 151622C619A0F679006099B8 /* PBXContainerItemProxy */;
};
15427B81198B8ACB00DC375D /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = "libluanetwork iOS";
@ -9553,6 +9693,16 @@
name = "libluacocos2d Mac";
targetProxy = 15427BB4198B8C5000DC375D /* PBXContainerItemProxy */;
};
158C128C19A0FC4700781A76 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = "libcocos3d iOS";
targetProxy = 158C128B19A0FC4700781A76 /* PBXContainerItemProxy */;
};
158C129319A0FC5300781A76 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = "libluacocos3d iOS";
targetProxy = 158C129219A0FC5300781A76 /* PBXContainerItemProxy */;
};
15CBA016196EE56C005877BB /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = "cocos2dx iOS";

3
cocos/2d/cocos2d.def
View File

@ -1,2 +1,3 @@
LIBRARY
EXPORTS
XXH32

2
cocos/2d/cocos2d_wp8.vcxproj
View File

@ -277,6 +277,7 @@
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="..\base\CCIMEDispatcher.cpp" />
<ClCompile Include="..\base\CCModuleManager.cpp" />
<ClCompile Include="..\base\CCNS.cpp" />
<ClCompile Include="..\base\CCProfiling.cpp" />
<ClCompile Include="..\base\CCRef.cpp" />
@ -488,6 +489,7 @@
<ClInclude Include="..\base\CCIMEDispatcher.h" />
<ClInclude Include="..\base\ccMacros.h" />
<ClInclude Include="..\base\CCMap.h" />
<ClInclude Include="..\base\CCModuleManager.h" />
<ClInclude Include="..\base\CCNS.h" />
<ClInclude Include="..\base\CCPlatformConfig.h" />
<ClInclude Include="..\base\CCPlatformMacros.h" />

6
cocos/2d/cocos2d_wp8.vcxproj.filters
View File

@ -647,6 +647,9 @@
<ClCompile Include="..\renderer\CCVertexIndexData.cpp">
<Filter>renderer</Filter>
</ClCompile>
<ClCompile Include="..\base\CCModuleManager.cpp">
<Filter>base</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\physics\CCPhysicsBody.h">
@ -1322,6 +1325,9 @@
<ClInclude Include="..\renderer\CCVertexIndexData.h">
<Filter>renderer</Filter>
</ClInclude>
<ClInclude Include="..\base\CCModuleManager.h">
<Filter>base</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\math\Mat4.inl">

35
cocos/2d/libcocos2d.vcxproj
View File

@ -183,22 +183,6 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou
<ClCompile Include="..\..\external\unzip\ioapi.cpp" />
<ClCompile Include="..\..\external\unzip\unzip.cpp" />
<ClCompile Include="..\..\external\xxhash\xxhash.c" />
<ClCompile Include="..\3d\CCAABB.cpp" />
<ClCompile Include="..\3d\CCAnimate3D.cpp" />
<ClCompile Include="..\3d\CCAnimation3D.cpp" />
<ClCompile Include="..\3d\CCAttachNode.cpp" />
<ClCompile Include="..\3d\CCBundle3D.cpp" />
<ClCompile Include="..\3d\CCBundleReader.cpp" />
<ClCompile Include="..\3d\CCMesh.cpp" />
<ClCompile Include="..\3d\CCMeshSkin.cpp" />
<ClCompile Include="..\3d\CCOBB.cpp" />
<ClCompile Include="..\3d\CCObjLoader.cpp" />
<ClCompile Include="..\3d\CCRay.cpp" />
<ClCompile Include="..\3d\CCSkeleton3D.cpp" />
<ClCompile Include="..\3d\CCSprite3D.cpp" />
<ClCompile Include="..\3d\CCSprite3DMaterial.cpp" />
<ClCompile Include="..\3d\CCSubMesh.cpp" />
<ClCompile Include="..\3d\CCSubMeshState.cpp" />
<ClCompile Include="..\base\atitc.cpp" />
<ClCompile Include="..\base\base64.cpp" />
<ClCompile Include="..\base\CCAutoreleasePool.cpp" />
@ -377,24 +361,6 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou
<ClInclude Include="..\..\external\unzip\ioapi.h" />
<ClInclude Include="..\..\external\unzip\unzip.h" />
<ClInclude Include="..\..\external\xxhash\xxhash.h" />
<ClInclude Include="..\3d\CCAABB.h" />
<ClInclude Include="..\3d\CCAnimate3D.h" />
<ClInclude Include="..\3d\CCAnimation3D.h" />
<ClInclude Include="..\3d\CCAnimationCurve.h" />
<ClInclude Include="..\3d\CCAttachNode.h" />
<ClInclude Include="..\3d\CCBundle3D.h" />
<ClInclude Include="..\3d\CCBundle3DData.h" />
<ClInclude Include="..\3d\CCBundleReader.h" />
<ClInclude Include="..\3d\CCMesh.h" />
<ClInclude Include="..\3d\CCMeshSkin.h" />
<ClInclude Include="..\3d\CCOBB.h" />
<ClInclude Include="..\3d\CCObjLoader.h" />
<ClInclude Include="..\3d\CCRay.h" />
<ClInclude Include="..\3d\CCSkeleton3D.h" />
<ClInclude Include="..\3d\CCSprite3D.h" />
<ClInclude Include="..\3d\CCSprite3DMaterial.h" />
<ClInclude Include="..\3d\CCSubMesh.h" />
<ClInclude Include="..\3d\CCSubMeshState.h" />
<ClInclude Include="..\base\atitc.h" />
<ClInclude Include="..\base\base64.h" />
<ClInclude Include="..\base\CCAutoreleasePool.h" />
@ -592,7 +558,6 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou
<ClInclude Include="CCTweenFunction.h" />
</ItemGroup>
<ItemGroup>
<None Include="..\3d\CCAnimationCurve.inl" />
<None Include="..\math\Mat4.inl" />
<None Include="..\math\MathUtil.inl" />
<None Include="..\math\MathUtilNeon.inl" />

110
cocos/2d/libcocos2d.vcxproj.filters
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="physics">
@ -52,9 +52,6 @@
<Filter Include="external\xxhash">
<UniqueIdentifier>{b4e2b1e5-2d79-44a3-af45-728d47b7bdb2}</UniqueIdentifier>
</Filter>
<Filter Include="3d">
<UniqueIdentifier>{a20c4bdc-bd4c-40c1-a78a-fe31cd3ec76a}</UniqueIdentifier>
</Filter>
<Filter Include="storage">
<UniqueIdentifier>{44bdf58f-4af2-433c-b4af-58dc05ef96b5}</UniqueIdentifier>
</Filter>
@ -550,36 +547,9 @@
<ClCompile Include="..\renderer\CCMeshCommand.cpp">
<Filter>renderer</Filter>
</ClCompile>
<ClCompile Include="..\3d\CCMesh.cpp">
<Filter>3d</Filter>
</ClCompile>
<ClCompile Include="..\3d\CCObjLoader.cpp">
<Filter>3d</Filter>
</ClCompile>
<ClCompile Include="..\3d\CCSprite3D.cpp">
<Filter>3d</Filter>
</ClCompile>
<ClCompile Include="..\base\ObjectFactory.cpp">
<Filter>base</Filter>
</ClCompile>
<ClCompile Include="..\3d\CCBundle3D.cpp">
<Filter>3d</Filter>
</ClCompile>
<ClCompile Include="..\3d\CCAnimate3D.cpp">
<Filter>3d</Filter>
</ClCompile>
<ClCompile Include="..\3d\CCMeshSkin.cpp">
<Filter>3d</Filter>
</ClCompile>
<ClCompile Include="..\3d\CCAnimation3D.cpp">
<Filter>3d</Filter>
</ClCompile>
<ClCompile Include="..\3d\CCSprite3DMaterial.cpp">
<Filter>3d</Filter>
</ClCompile>
<ClCompile Include="..\3d\CCBundleReader.cpp">
<Filter>3d</Filter>
</ClCompile>
<ClCompile Include="CCFastTMXLayer.cpp">
<Filter>2d</Filter>
</ClCompile>
@ -589,18 +559,6 @@
<ClCompile Include="..\storage\local-storage\LocalStorage.cpp">
<Filter>storage</Filter>
</ClCompile>
<ClCompile Include="..\3d\CCAttachNode.cpp">
<Filter>3d</Filter>
</ClCompile>
<ClCompile Include="..\3d\CCSkeleton3D.cpp">
<Filter>3d</Filter>
</ClCompile>
<ClCompile Include="..\3d\CCSubMesh.cpp">
<Filter>3d</Filter>
</ClCompile>
<ClCompile Include="..\3d\CCSubMeshState.cpp">
<Filter>3d</Filter>
</ClCompile>
<ClCompile Include="..\platform\desktop\CCGLViewImpl.cpp">
<Filter>platform\desktop</Filter>
</ClCompile>
@ -613,15 +571,6 @@
<ClCompile Include="..\base\CCCamera.cpp">
<Filter>base</Filter>
</ClCompile>
<ClCompile Include="..\3d\CCAABB.cpp">
<Filter>3d</Filter>
</ClCompile>
<ClCompile Include="..\3d\CCOBB.cpp">
<Filter>3d</Filter>
</ClCompile>
<ClCompile Include="..\3d\CCRay.cpp">
<Filter>3d</Filter>
</ClCompile>
<ClCompile Include="..\renderer\CCPrimitive.cpp">
<Filter>renderer</Filter>
</ClCompile>
@ -1201,42 +1150,9 @@
<ClInclude Include="..\renderer\CCMeshCommand.h">
<Filter>renderer</Filter>
</ClInclude>
<ClInclude Include="..\3d\CCMesh.h">
<Filter>3d</Filter>
</ClInclude>
<ClInclude Include="..\3d\CCObjLoader.h">
<Filter>3d</Filter>
</ClInclude>
<ClInclude Include="..\3d\CCSprite3D.h">
<Filter>3d</Filter>
</ClInclude>
<ClInclude Include="..\base\ObjectFactory.h">
<Filter>base</Filter>
</ClInclude>
<ClInclude Include="..\3d\CCBundle3D.h">
<Filter>3d</Filter>
</ClInclude>
<ClInclude Include="..\3d\CCAnimate3D.h">
<Filter>3d</Filter>
</ClInclude>
<ClInclude Include="..\3d\CCAnimationCurve.h">
<Filter>3d</Filter>
</ClInclude>
<ClInclude Include="..\3d\CCMeshSkin.h">
<Filter>3d</Filter>
</ClInclude>
<ClInclude Include="..\3d\CCAnimation3D.h">
<Filter>3d</Filter>
</ClInclude>
<ClInclude Include="..\3d\CCBundle3DData.h">
<Filter>3d</Filter>
</ClInclude>
<ClInclude Include="..\3d\CCSprite3DMaterial.h">
<Filter>3d</Filter>
</ClInclude>
<ClInclude Include="..\3d\CCBundleReader.h">
<Filter>3d</Filter>
</ClInclude>
<ClInclude Include="CCFastTMXTiledMap.h">
<Filter>2d</Filter>
</ClInclude>
@ -1246,18 +1162,6 @@
<ClInclude Include="..\storage\local-storage\LocalStorage.h">
<Filter>storage</Filter>
</ClInclude>
<ClInclude Include="..\3d\CCAttachNode.h">
<Filter>3d</Filter>
</ClInclude>
<ClInclude Include="..\3d\CCSkeleton3D.h">
<Filter>3d</Filter>
</ClInclude>
<ClInclude Include="..\3d\CCSubMesh.h">
<Filter>3d</Filter>
</ClInclude>
<ClInclude Include="..\3d\CCSubMeshState.h">
<Filter>3d</Filter>
</ClInclude>
<ClInclude Include="..\platform\desktop\CCGLViewImpl.h">
<Filter>platform\desktop</Filter>
</ClInclude>
@ -1270,15 +1174,6 @@
<ClInclude Include="..\base\CCCamera.h">
<Filter>base</Filter>
</ClInclude>
<ClInclude Include="..\3d\CCAABB.h">
<Filter>3d</Filter>
</ClInclude>
<ClInclude Include="..\3d\CCOBB.h">
<Filter>3d</Filter>
</ClInclude>
<ClInclude Include="..\3d\CCRay.h">
<Filter>3d</Filter>
</ClInclude>
<ClInclude Include="..\renderer\CCPrimitive.h">
<Filter>renderer</Filter>
</ClInclude>
@ -1317,9 +1212,6 @@
<None Include="..\math\Vec4.inl">
<Filter>math</Filter>
</None>
<None Include="..\3d\CCAnimationCurve.inl">
<Filter>3d</Filter>
</None>
<None Include="cocos2d.def" />
</ItemGroup>
</Project>

28
cocos/3d/3dExport.h Normal file
View File

@ -0,0 +1,28 @@
#ifndef __COCOS_3D_3DEXPORT_H__
#define __COCOS_3D_3DEXPORT_H__
#if defined(WIN32) && defined(_WINDOWS)
#ifdef __MINGW32__
#include <string.h>
#endif
#if defined(_USE3DDLL)
#define CC_3D_DLL __declspec(dllexport)
#else /* use a DLL library */
#define CC_3D_DLL __declspec(dllimport)
#endif
/* Define NULL pointer value */
#ifndef NULL
#ifdef __cplusplus
#define NULL 0
#else
#define NULL ((void *)0)
#endif
#endif
#else
#define CC_3D_DLL
#endif
#endif // __COCOS_3D_3DEXPORT_H__

33
cocos/3d/Android.mk Normal file
View File

@ -0,0 +1,33 @@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := cocos3d_static
LOCAL_MODULE_FILENAME := libcocos3d
LOCAL_SRC_FILES := \
CCRay.cpp \
CCAABB.cpp \
CCOBB.cpp \
CCAnimate3D.cpp \
CCAnimation3D.cpp \
CCAttachNode.cpp \
CCBundle3D.cpp \
CCBundleReader.cpp \
CCMesh.cpp \
CCMeshSkin.cpp \
CCSprite3DMaterial.cpp \
CCObjLoader.cpp \
CCSkeleton3D.cpp \
CCSprite3D.cpp \
CCSubMesh.cpp \
CCSubMeshState.cpp \
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/..
LOCAL_C_INCLUDES := $(LOCAL_PATH)/.. \
$(LOCAL_PATH)/../../external \
LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dx_static
include $(BUILD_STATIC_LIBRARY)

3
cocos/3d/CCAABB.h Executable file → Normal file
View File

@ -27,10 +27,11 @@
#include "base/ccMacros.h"
#include "math/CCMath.h"
#include "3d/3dExport.h"
NS_CC_BEGIN
class CC_DLL AABB
class CC_3D_DLL AABB
{
public:

3
cocos/3d/CCAnimate3D.h
View File

@ -34,6 +34,7 @@
#include "base/ccTypes.h"
#include "base/CCPlatformMacros.h"
#include "2d/CCActionInterval.h"
#include "3d/3dExport.h"
NS_CC_BEGIN
@ -42,7 +43,7 @@ class Bone3D;
/**
* Animate3D, Animates a Sprite3D given with an Animation3D
*/
class CC_DLL Animate3D: public ActionInterval
class CC_3D_DLL Animate3D: public ActionInterval
{
public:

3
cocos/3d/CCAnimation3D.h
View File

@ -33,13 +33,14 @@
#include "base/CCRef.h"
#include "base/ccTypes.h"
#include "CCBundle3DData.h"
#include "3d/3dExport.h"
NS_CC_BEGIN
/**
* static animation data, shared
*/
class CC_DLL Animation3D: public Ref
class CC_3D_DLL Animation3D: public Ref
{
friend class Bundle3D;
public:

3
cocos/3d/CCAttachNode.h
View File

@ -33,6 +33,7 @@
#include "math/CCMath.h"
#include "2d/CCNode.h"
#include "renderer/CCMeshCommand.h"
#include "3d/3dExport.h"
NS_CC_BEGIN
@ -45,7 +46,7 @@ class Bone3D;
* auto attachNode = sprite->getAttachNode("left hand");
* attachNode->addChild(weapon);
*/
class CC_DLL AttachNode : public Node
class CC_3D_DLL AttachNode : public Node
{
public:
/**

8
cocos/3d/CCBundle3D.cpp
View File

@ -368,14 +368,6 @@ bool Bundle3D::loadAnimationData(const std::string& id, Animation3DData* animati
}
}
bool Bundle3D::loadSkeletonData(const std::string& id, Skeleton3DData* skeletondata)
{
skeletondata->resetData();
//TODO
return true;
}
//since 3.3, to support reskin
bool Bundle3D::loadMeshDatas(MeshDatas& meshdatas)
{

9
cocos/3d/CCBundle3D.h
View File

@ -36,6 +36,7 @@
#include "json/document.h"
#include "CCBundleReader.h"
#include "3d/3dExport.h"
NS_CC_BEGIN
class Animation3D;
@ -47,7 +48,7 @@ class Data;
* c3t text file
* c3b binary file
*/
class CC_DLL Bundle3D
class CC_3D_DLL Bundle3D
{
public:
/**you can define yourself bundle and set it, use default bundle otherwise*/
@ -90,12 +91,6 @@ public:
*/
virtual bool loadAnimationData(const std::string& id, Animation3DData* animationdata);
/**
* load skeleton data from bundle
*
*/
virtual bool loadSkeletonData(const std::string& id, Skeleton3DData* skeletondata);
//since 3.3, to support reskin
virtual bool loadMeshDatas(MeshDatas& meshdatas);
//since 3.3, to support reskin

40
cocos/3d/CCBundle3DData.h
View File

@ -244,46 +244,6 @@ struct SkinData
};
/**skin data*/
struct Skeleton3DData
{
std::vector<std::string> boneNames; //bone names
std::vector<Mat4> inverseBindPoseMatrices; //bind pose of skin bone
std::vector<Mat4> boneOriginMatrices; // original bone transform
//bone child info, both skinbone and node bone
std::map<int, std::vector<int> > boneChild;//key parent, value child
int rootBoneIndex;
void resetData()
{
boneNames.clear();
inverseBindPoseMatrices.clear();
boneOriginMatrices.clear();
boneChild.clear();
rootBoneIndex = -1;
}
void addBoneNames(const std::string& name)
{
auto it = std::find(boneNames.begin(), boneNames.end(), name);
if (it == boneNames.end())
boneNames.push_back(name);
}
int getBoneNameIndex(const std::string& name)const
{
int i = 0;
for (auto iter : boneNames)
{
if ((iter) == name)
return i;
i++;
}
return -1;
}
};
/**material data, */
struct MaterialData
{

5
cocos/3d/CCMesh.h
View File

@ -38,6 +38,7 @@
#include "renderer/CCGLProgram.h"
#include "CCAABB.h"
#include "3d/3dExport.h"
NS_CC_BEGIN
@ -45,7 +46,7 @@ NS_CC_BEGIN
class EventListenerCustom;
class EventCustom;
class CC_DLL RenderMeshData
class CC_3D_DLL RenderMeshData
{
typedef std::vector<unsigned short> IndexArray;
friend class Mesh;
@ -72,7 +73,7 @@ protected:
* Mesh: Geometry with a collection of vertex.
* Supporting various vertex formats.
*/
class CC_DLL Mesh : public Ref
class CC_3D_DLL Mesh : public Ref
{
typedef std::vector<unsigned short> IndexArray;
public:

50
cocos/3d/CCMeshSkin.cpp
View File

@ -149,54 +149,4 @@ Bone3D* MeshSkin::getRootBone() const
return root;
}
////////////////////////////////////////////////////////////////////////
MeshSkinDataCache* MeshSkinDataCache::_cacheInstance = nullptr;
MeshSkinDataCache* MeshSkinDataCache::getInstance()
{
if (_cacheInstance == nullptr)
_cacheInstance = new MeshSkinDataCache();
return _cacheInstance;
}
void MeshSkinDataCache::destroyInstance()
{
if (_cacheInstance)
{
CC_SAFE_DELETE(_cacheInstance);
}
}
const SkinData* MeshSkinDataCache::getMeshSkinData(const std::string& key) const
{
auto it = _skinDatas.find(key);
if (it != _skinDatas.end())
return &it->second;
return nullptr;
}
bool MeshSkinDataCache::addMeshSkinData(const std::string& key, const SkinData& skin)
{
if (_skinDatas.find(key) != _skinDatas.end())
return false; // already have this key
_skinDatas[key] = skin;
return true;
}
void MeshSkinDataCache::removeAllMeshSkinData()
{
_skinDatas.clear();
}
MeshSkinDataCache::MeshSkinDataCache()
{
}
MeshSkinDataCache::~MeshSkinDataCache()
{
}
NS_CC_END

31
cocos/3d/CCMeshSkin.h
View File

@ -35,6 +35,7 @@
#include "base/CCVector.h"
#include "base/ccTypes.h"
#include "math/CCMath.h"
#include "3d/3dExport.h"
NS_CC_BEGIN
@ -45,7 +46,7 @@ class Skeleton3D;
* MeshSkin, A class maintain a collection of bones that affect Mesh vertex.
* And it is responsible for computing matrix palletes that used by skin mesh rendering.
*/
class CC_DLL MeshSkin: public Ref
class CC_3D_DLL MeshSkin: public Ref
{
public:
@ -100,34 +101,6 @@ protected:
Vec4* _matrixPalette;
};
/**
* MeshSkinData Cache
*/
class MeshSkinDataCache
{
public:
/**get & destroy*/
static MeshSkinDataCache* getInstance();
static void destroyInstance();
/**get mesh skin data from cache*/
const SkinData* getMeshSkinData(const std::string& key) const;
/**add mesh skin data to cache*/
bool addMeshSkinData(const std::string& key, const SkinData& skinData);
/**remove all mesh skin data*/
void removeAllMeshSkinData();
protected:
MeshSkinDataCache();
~MeshSkinDataCache();
static MeshSkinDataCache* _cacheInstance; // instance
std::unordered_map<std::string, SkinData> _skinDatas; //cached skindatas
};
NS_CC_END
#endif // __CCSKIN_H__

3
cocos/3d/CCOBB.h Executable file → Normal file
View File

@ -26,10 +26,11 @@
#define __CC_OBB_H__
#include "CCAABB.h"
#include "3d/3dExport.h"
NS_CC_BEGIN
class CC_DLL OBB
class CC_3D_DLL OBB
{
public:
OBB();

3
cocos/3d/CCRay.h Executable file → Normal file
View File

@ -29,10 +29,11 @@
#include "math/CCMath.h"
#include "CCAABB.h"
#include "CCOBB.h"
#include "3d/3dExport.h"
NS_CC_BEGIN
class CC_DLL Ray
class CC_3D_DLL Ray
{
public:
/**

52
cocos/3d/CCSkeleton3D.cpp
View File

@ -318,8 +318,6 @@ int Skeleton3D::getBoneIndex(Bone3D* bone) const
//refresh bone world matrix
void Skeleton3D::updateBoneMatrix()
{
//_rootBone->setWorldMatDirty(true);
//_rootBone->updateWorldMat();
for (const auto& it : _rootBones) {
it->setWorldMatDirty(true);
it->updateWorldMat();
@ -350,54 +348,4 @@ Bone3D* Skeleton3D::createBone3D(const NodeData& nodedata)
return bone;
}
////////////////////////////////////////////////////////////////////////
Skeleton3DDataCache* Skeleton3DDataCache::_cacheInstance = nullptr;
Skeleton3DDataCache* Skeleton3DDataCache::getInstance()
{
if (_cacheInstance == nullptr)
_cacheInstance = new Skeleton3DDataCache();
return _cacheInstance;
}
void Skeleton3DDataCache::destroyInstance()
{
if (_cacheInstance)
{
CC_SAFE_DELETE(_cacheInstance);
}
}
const Skeleton3DData* Skeleton3DDataCache::getSkeletonData(const std::string& key) const
{
auto it = _skeletonDatas.find(key);
if (it != _skeletonDatas.end())
return &it->second;
return nullptr;
}
bool Skeleton3DDataCache::addSkeletonData(const std::string& key, const Skeleton3DData& data)
{
if (_skeletonDatas.find(key) != _skeletonDatas.end())
return false; // already have this key
_skeletonDatas[key] = data;
return true;
}
void Skeleton3DDataCache::removeAllSkeletonData()
{
_skeletonDatas.clear();
}
Skeleton3DDataCache::Skeleton3DDataCache()
{
}
Skeleton3DDataCache::~Skeleton3DDataCache()
{
}
NS_CC_END

33
cocos/3d/CCSkeleton3D.h
View File

@ -34,13 +34,14 @@
#include "base/CCVector.h"
#include "base/ccTypes.h"
#include "math/CCMath.h"
#include "3d/3dExport.h"
NS_CC_BEGIN
/**
* Defines a basic hierachial structure of transformation spaces.
*/
class CC_DLL Bone3D : public Ref
class CC_3D_DLL Bone3D : public Ref
{
friend class Skeleton3D;
friend class MeshSkin;
@ -183,7 +184,7 @@ protected:
* Skeleton
*
*/
class CC_DLL Skeleton3D: public Ref
class CC_3D_DLL Skeleton3D: public Ref
{
public:
@ -228,34 +229,6 @@ protected:
Vector<Bone3D*> _rootBones;
};
/**
* Skeleton3DData Cache
*/
class Skeleton3DDataCache
{
public:
/**get & destroy*/
static Skeleton3DDataCache* getInstance();
static void destroyInstance();
/**get mesh skin data from cache*/
const Skeleton3DData* getSkeletonData(const std::string& key) const;
/**add skeleton data to cache*/
bool addSkeletonData(const std::string& key, const Skeleton3DData& skeletonData);
/**remove all skeleton data*/
void removeAllSkeletonData();
CC_CONSTRUCTOR_ACCESS:
Skeleton3DDataCache();
~Skeleton3DDataCache();
static Skeleton3DDataCache* _cacheInstance; // instance
std::unordered_map<std::string, Skeleton3DData> _skeletonDatas; //cached skeleton datas
};
NS_CC_END
#endif // __CCSKELETON3D_H__

130
cocos/3d/CCSprite3D.cpp
View File

@ -75,7 +75,26 @@ Sprite3D* Sprite3D::create(const std::string &modelPath, const std::string &text
bool Sprite3D::loadFromCache(const std::string& path)
{
//FIX ME, TODO
auto spritedata = Sprite3DCache::getInstance()->getSpriteData(path);
if (spritedata)
{
for (auto it : spritedata->meshes) {
_meshes.pushBack(it);
}
_skeleton = Skeleton3D::create(spritedata->nodedatas->skeleton);
CC_SAFE_RETAIN(_skeleton);
for(const auto& it : spritedata->nodedatas->nodes)
{
if(it)
{
createNode(it, this, *(spritedata->materialdatas), spritedata->nodedatas->nodes.size() == 1);
}
}
genGLProgramState();
return true;
}
return false;
}
@ -84,25 +103,29 @@ bool Sprite3D::loadFromCache(const std::string& path)
bool Sprite3D::loadFromObj(const std::string& path)
{
std::string fullPath = FileUtils::getInstance()->fullPathForFilename(path);
std::string key = fullPath + "#";
MeshDatas meshdatas;
MaterialDatas materialdatas;
NodeDatas nodeDatas;
bool ret = Bundle3D::loadObj(meshdatas, materialdatas, nodeDatas, fullPath);
if (ret)
MaterialDatas* materialdatas = new MaterialDatas();
NodeDatas* nodeDatas = new NodeDatas();
bool ret = Bundle3D::loadObj(meshdatas, *materialdatas, *nodeDatas, fullPath);
if (ret && initFrom(*nodeDatas, meshdatas, *materialdatas))
{
return initFrom(nodeDatas, meshdatas, materialdatas);
//add to cache
auto data = new Sprite3DCache::Sprite3DData();
data->materialdatas = materialdatas;
data->nodedatas = nodeDatas;
data->meshes = _meshes;
Sprite3DCache::getInstance()->addSprite3DData(path, data);
return true;
}
// //add mesh to cache
// MeshCache::getInstance()->addMesh(key, _mesh);
delete materialdatas;
delete nodeDatas;
return false;
}
bool Sprite3D::loadFromC3x(const std::string& path)
{
std::string fullPath = FileUtils::getInstance()->fullPathForFilename(path);
std::string key = fullPath + "#";
//load from .c3b or .c3t
auto bundle = Bundle3D::getInstance();
@ -110,15 +133,25 @@ bool Sprite3D::loadFromC3x(const std::string& path)
return false;
MeshDatas meshdatas;
MaterialDatas materialdatas;
NodeDatas nodeDatas;
MaterialDatas* materialdatas = new MaterialDatas();
NodeDatas* nodeDatas = new NodeDatas();
if (bundle->loadMeshDatas(meshdatas)
&& bundle->loadMaterials(materialdatas)
&& bundle->loadNodes(nodeDatas))
&& bundle->loadMaterials(*materialdatas)
&& bundle->loadNodes(*nodeDatas)
&& initFrom(*nodeDatas, meshdatas, *materialdatas))
{
return initFrom(nodeDatas, meshdatas, materialdatas);
//add to cache
auto data = new Sprite3DCache::Sprite3DData();
data->materialdatas = materialdatas;
data->nodedatas = nodeDatas;
data->meshes = _meshes;
Sprite3DCache::getInstance()->addSprite3DData(path, data);
return true;
}
delete materialdatas;
delete nodeDatas;
return false;
}
@ -439,7 +472,11 @@ void Sprite3D::draw(Renderer *renderer, const Mat4 &transform, uint32_t flags)
int i = 0;
for (auto& submeshstate : _subMeshStates) {
if (!submeshstate->isVisible())
{
i++;
continue;
}
auto& meshCommand = _meshCommands[i++];
GLuint textureID = submeshstate->getTexture() ? submeshstate->getTexture()->getName() : 0;
@ -544,4 +581,67 @@ MeshSkin* Sprite3D::getSkin() const
return nullptr;
}
///////////////////////////////////////////////////////////////////////////////////
Sprite3DCache* Sprite3DCache::_cacheInstance = nullptr;
Sprite3DCache* Sprite3DCache::getInstance()
{
if (_cacheInstance == nullptr)
_cacheInstance = new Sprite3DCache();
return _cacheInstance;
}
void Sprite3DCache::destroyInstance()
{
if (_cacheInstance)
{
delete _cacheInstance;
_cacheInstance = nullptr;
}
}
Sprite3DCache::Sprite3DData* Sprite3DCache::getSpriteData(const std::string& key) const
{
auto it = _spriteDatas.find(key);
if (it != _spriteDatas.end())
return it->second;
return nullptr;
}
bool Sprite3DCache::addSprite3DData(const std::string& key, Sprite3DCache::Sprite3DData* spritedata)
{
auto it = _spriteDatas.find(key);
if (it == _spriteDatas.end())
{
_spriteDatas[key] = spritedata;
return true;
}
return false;
}
void Sprite3DCache::removeSprite3DData(const std::string& key)
{
auto it = _spriteDatas.find(key);
if (it != _spriteDatas.end())
{
delete it->second;
}
_spriteDatas.erase(it);
}
void Sprite3DCache::removeAllSprite3DData()
{
for (auto& it : _spriteDatas) {
delete it.second;
}
_spriteDatas.clear();
}
Sprite3DCache::Sprite3DCache()
{
}
Sprite3DCache::~Sprite3DCache()
{
removeAllSprite3DData();
}
NS_CC_END

49
cocos/3d/CCSprite3D.h
View File

@ -35,6 +35,9 @@
#include "renderer/CCMeshCommand.h"
#include "3d/CCAABB.h"
#include "3d/CCBundle3DData.h"
#include "3d/CCMesh.h"
#include "3d/3dExport.h"
NS_CC_BEGIN
@ -48,7 +51,7 @@ class Skeleton3D;
struct NodeData;
class SubMesh;
/** Sprite3D: A sprite can be loaded from 3D model files, .obj, .c3t, .c3b, then can be drawed as sprite */
class CC_DLL Sprite3D : public Node, public BlendProtocol
class CC_3D_DLL Sprite3D : public Node, public BlendProtocol
{
public:
/** creates a Sprite3D*/
@ -160,7 +163,49 @@ protected:
bool _aabbDirty;
};
extern std::string CC_DLL s_attributeNames[];//attribute names array
///////////////////////////////////////////////////////
class Sprite3DCache
{
public:
struct Sprite3DData
{
Vector<Mesh*> meshes;
NodeDatas* nodedatas;
MaterialDatas* materialdatas;
~Sprite3DData()
{
if (nodedatas)
delete nodedatas;
if (materialdatas)
delete materialdatas;
meshes.clear();
}
};
/**get & destroy*/
static Sprite3DCache* getInstance();
static void destroyInstance();
Sprite3DData* getSpriteData(const std::string& key) const;
bool addSprite3DData(const std::string& key, Sprite3DData* spritedata);
void removeSprite3DData(const std::string& key);
void removeAllSprite3DData();
CC_CONSTRUCTOR_ACCESS:
Sprite3DCache();
~Sprite3DCache();
protected:
static Sprite3DCache* _cacheInstance;
std::unordered_map<std::string, Sprite3DData*> _spriteDatas; //cached sprite datas
};
extern std::string CC_3D_DLL s_attributeNames[];//attribute names array
NS_CC_END
#endif // __SPRITE3D_H_

3
cocos/3d/CCSubMesh.h
View File

@ -35,6 +35,7 @@
#include "base/ccTypes.h"
#include "math/CCMath.h"
#include "renderer/CCGLProgram.h"
#include "3d/3dExport.h"
NS_CC_BEGIN
@ -60,7 +61,7 @@ class Mesh;
/**
* SubMesh: Defines the way the mesh's vertices how to be connected together.
*/
class CC_DLL SubMesh : public Ref
class CC_3D_DLL SubMesh : public Ref
{
friend class Mesh;
friend class SubMeshState;

3
cocos/3d/CCSubMeshState.h
View File

@ -35,6 +35,7 @@
#include "base/ccTypes.h"
#include "math/CCMath.h"
#include "renderer/CCGLProgram.h"
#include "3d/3dExport.h"
NS_CC_BEGIN
@ -44,7 +45,7 @@ class SubMesh;
/**
* SubMeshState: visibility and apperence of submesh
*/
class CC_DLL SubMeshState : public Ref
class CC_3D_DLL SubMeshState : public Ref
{
friend class Sprite3D;
public:

51
cocos/3d/CMakeLists.txt
View File

@ -1,18 +1,37 @@
set(COCOS_3D_SRC
3d/CCAABB.cpp
3d/CCOBB.cpp
3d/CCRay.cpp
3d/CCSkeleton3D.cpp
3d/CCAttachNode.cpp
3d/CCSubMesh.cpp
3d/CCSubMeshState.cpp
3d/CCMesh.cpp
3d/CCObjLoader.cpp
3d/CCSprite3D.cpp
3d/CCSprite3DMaterial.cpp
3d/CCAnimate3D.cpp
3d/CCAnimation3D.cpp
3d/CCBundle3D.cpp
3d/CCMeshSkin.cpp
3d/CCBundleReader.cpp
CCRay.cpp
CCAABB.cpp
CCOBB.cpp
CCAnimate3D.cpp
CCAnimation3D.cpp
CCAttachNode.cpp
CCBundle3D.cpp
CCBundleReader.cpp
CCMesh.cpp
CCMeshSkin.cpp
CCSprite3DMaterial.cpp
CCObjLoader.cpp
CCSkeleton3D.cpp
CCSprite3D.cpp
CCSubMesh.cpp
CCSubMeshState.cpp
)
include_directories(
3d
)
add_library(cocos3d STATIC
${COCOS_3D_SRC}
)
target_link_libraries(cocos3d
cocos2d
)
set_target_properties(cocos3d
PROPERTIES
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
)

41
cocos/3d/cocos3d.h Executable file
View File

@ -0,0 +1,41 @@
/****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc.
http://www.cocos2d-x.org
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
#ifndef __COCOS_3D_COCOS3D_H__
#define __COCOS_3D_COCOS3D_H__
//3d
#include "3d/CCAABB.h"
#include "3d/CCOBB.h"
#include "3d/CCRay.h"
#include "3d/CCSprite3D.h"
#include "3d/CCMesh.h"
#include "3d/CCMeshSkin.h"
#include "3d/CCAnimate3D.h"
#include "3d/CCAnimation3D.h"
#include "3d/CCSprite3DMaterial.h"
#include "3d/CCSubMeshState.h"
#include "3d/CCAttachNode.h"
#endif

148
cocos/3d/proj.win32/libcocos3d.vcxproj Normal file
View File

@ -0,0 +1,148 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\2d\libcocos2d.vcxproj">
<Project>{98a51ba8-fc3a-415b-ac8f-8c7bd464e93e}</Project>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\CCAABB.cpp" />
<ClCompile Include="..\CCAnimate3D.cpp" />
<ClCompile Include="..\CCAnimation3D.cpp" />
<ClCompile Include="..\CCAttachNode.cpp" />
<ClCompile Include="..\CCBundle3D.cpp" />
<ClCompile Include="..\CCBundleReader.cpp" />
<ClCompile Include="..\CCMesh.cpp" />
<ClCompile Include="..\CCMeshSkin.cpp" />
<ClCompile Include="..\CCOBB.cpp" />
<ClCompile Include="..\CCObjLoader.cpp" />
<ClCompile Include="..\CCRay.cpp" />
<ClCompile Include="..\CCSkeleton3D.cpp" />
<ClCompile Include="..\CCSprite3D.cpp" />
<ClCompile Include="..\CCSprite3DMaterial.cpp" />
<ClCompile Include="..\CCSubMesh.cpp" />
<ClCompile Include="..\CCSubMeshState.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\3dExport.h" />
<ClInclude Include="..\CCAABB.h" />
<ClInclude Include="..\CCAnimate3D.h" />
<ClInclude Include="..\CCAnimation3D.h" />
<ClInclude Include="..\CCAnimationCurve.h" />
<ClInclude Include="..\CCAttachNode.h" />
<ClInclude Include="..\CCBundle3D.h" />
<ClInclude Include="..\CCBundle3DData.h" />
<ClInclude Include="..\CCBundleReader.h" />
<ClInclude Include="..\CCMesh.h" />
<ClInclude Include="..\CCMeshSkin.h" />
<ClInclude Include="..\CCOBB.h" />
<ClInclude Include="..\CCObjLoader.h" />
<ClInclude Include="..\CCRay.h" />
<ClInclude Include="..\CCSkeleton3D.h" />
<ClInclude Include="..\CCSprite3D.h" />
<ClInclude Include="..\CCSprite3DMaterial.h" />
<ClInclude Include="..\CCSubMesh.h" />
<ClInclude Include="..\CCSubMeshState.h" />
<ClInclude Include="..\cocos3d.h" />
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{E24950FA-5BC1-4AEE-A900-4F0259354BF0}</ProjectGuid>
<RootNamespace>libcocos3d</RootNamespace>
<ProjectName>libcocos3d</ProjectName>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v110_xp</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0'">v120</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v120_xp</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v110_xp</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0'">v120</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v120_xp</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\..\2d\cocos2d_headers.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\..\2d\cocos2d_headers.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<OutDir>$(SolutionDir)$(Configuration).win32\</OutDir>
<IntDir>$(Configuration).win32\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>$(SolutionDir)$(Configuration).win32\</OutDir>
<IntDir>$(Configuration).win32\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<SDLCheck>
</SDLCheck>
<AdditionalIncludeDirectories>$(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)external;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_USE3DDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<DisableSpecificWarnings>4267;4251;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<MinimalRebuild>false</MinimalRebuild>
<DebugInformationFormat>OldStyle</DebugInformationFormat>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>opengl32.lib;glew32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>MinSpace</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>
</SDLCheck>
<PreprocessorDefinitions>WIN32;_WINDOWS;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_USE3DDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)external;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DebugInformationFormat>None</DebugInformationFormat>
<WholeProgramOptimization>false</WholeProgramOptimization>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>opengl32.lib;glew32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

120
cocos/3d/proj.win32/libcocos3d.vcxproj.filters Normal file
View File

@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="3d">
<UniqueIdentifier>{6107c94d-579b-488f-86b7-c191d4c3b9aa}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\CCAABB.cpp">
<Filter>3d</Filter>
</ClCompile>
<ClCompile Include="..\CCAnimate3D.cpp">
<Filter>3d</Filter>
</ClCompile>
<ClCompile Include="..\CCAnimation3D.cpp">
<Filter>3d</Filter>
</ClCompile>
<ClCompile Include="..\CCAttachNode.cpp">
<Filter>3d</Filter>
</ClCompile>
<ClCompile Include="..\CCBundle3D.cpp">
<Filter>3d</Filter>
</ClCompile>
<ClCompile Include="..\CCBundleReader.cpp">
<Filter>3d</Filter>
</ClCompile>
<ClCompile Include="..\CCMesh.cpp">
<Filter>3d</Filter>
</ClCompile>
<ClCompile Include="..\CCMeshSkin.cpp">
<Filter>3d</Filter>
</ClCompile>
<ClCompile Include="..\CCOBB.cpp">
<Filter>3d</Filter>
</ClCompile>
<ClCompile Include="..\CCObjLoader.cpp">
<Filter>3d</Filter>
</ClCompile>
<ClCompile Include="..\CCRay.cpp">
<Filter>3d</Filter>
</ClCompile>
<ClCompile Include="..\CCSkeleton3D.cpp">
<Filter>3d</Filter>
</ClCompile>
<ClCompile Include="..\CCSprite3D.cpp">
<Filter>3d</Filter>
</ClCompile>
<ClCompile Include="..\CCSprite3DMaterial.cpp">
<Filter>3d</Filter>
</ClCompile>
<ClCompile Include="..\CCSubMesh.cpp">
<Filter>3d</Filter>
</ClCompile>
<ClCompile Include="..\CCSubMeshState.cpp">
<Filter>3d</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\CCAABB.h">
<Filter>3d</Filter>
</ClInclude>
<ClInclude Include="..\CCAnimate3D.h">
<Filter>3d</Filter>
</ClInclude>
<ClInclude Include="..\CCAnimation3D.h">
<Filter>3d</Filter>
</ClInclude>
<ClInclude Include="..\CCAnimationCurve.h">
<Filter>3d</Filter>
</ClInclude>
<ClInclude Include="..\CCAttachNode.h">
<Filter>3d</Filter>
</ClInclude>
<ClInclude Include="..\CCBundle3D.h">
<Filter>3d</Filter>
</ClInclude>
<ClInclude Include="..\CCBundle3DData.h">
<Filter>3d</Filter>
</ClInclude>
<ClInclude Include="..\CCBundleReader.h">
<Filter>3d</Filter>
</ClInclude>
<ClInclude Include="..\CCMesh.h">
<Filter>3d</Filter>
</ClInclude>
<ClInclude Include="..\CCMeshSkin.h">
<Filter>3d</Filter>
</ClInclude>
<ClInclude Include="..\CCOBB.h">
<Filter>3d</Filter>
</ClInclude>
<ClInclude Include="..\CCObjLoader.h">
<Filter>3d</Filter>
</ClInclude>
<ClInclude Include="..\CCRay.h">
<Filter>3d</Filter>
</ClInclude>
<ClInclude Include="..\CCSkeleton3D.h">
<Filter>3d</Filter>
</ClInclude>
<ClInclude Include="..\CCSprite3D.h">
<Filter>3d</Filter>
</ClInclude>
<ClInclude Include="..\CCSprite3DMaterial.h">
<Filter>3d</Filter>
</ClInclude>
<ClInclude Include="..\CCSubMesh.h">
<Filter>3d</Filter>
</ClInclude>
<ClInclude Include="..\CCSubMeshState.h">
<Filter>3d</Filter>
</ClInclude>
<ClInclude Include="..\cocos3d.h">
<Filter>3d</Filter>
</ClInclude>
<ClInclude Include="..\3dExport.h">
<Filter>3d</Filter>
</ClInclude>
</ItemGroup>
</Project>

4
cocos/3d/proj.win32/libcocos3d.vcxproj.user Normal file
View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup />
</Project>

16
cocos/Android.mk
View File

@ -74,22 +74,6 @@ cocos2d.cpp \
2d/CCTransitionPageTurn.cpp \
2d/CCTransitionProgress.cpp \
2d/CCTweenFunction.cpp \
3d/CCRay.cpp\
3d/CCAABB.cpp \
3d/CCOBB.cpp \
3d/CCAnimate3D.cpp \
3d/CCAnimation3D.cpp \
3d/CCAttachNode.cpp \
3d/CCBundle3D.cpp \
3d/CCBundleReader.cpp \
3d/CCMesh.cpp \
3d/CCMeshSkin.cpp \
3d/CCSprite3DMaterial.cpp \
3d/CCObjLoader.cpp \
3d/CCSkeleton3D.cpp \
3d/CCSprite3D.cpp \
3d/CCSubMesh.cpp \
3d/CCSubMeshState.cpp \
platform/CCGLView.cpp \
platform/CCFileUtils.cpp \
platform/CCSAXParser.cpp \

2
cocos/CMakeLists.txt
View File

@ -5,7 +5,6 @@ endif()
set(COCOS_SRC cocos2d.cpp)
include(2d/CMakeLists.txt)
include(3d/CMakeLists.txt)
include(platform/CMakeLists.txt)
include(physics/CMakeLists.txt)
include(math/CMakeLists.txt)
@ -16,7 +15,6 @@ include(deprecated/CMakeLists.txt)
add_library(cocos2d STATIC
${COCOS_SRC}
${COCOS_2D_SRC}
${COCOS_3D_SRC}
${COCOS_PLATFORM_SRC}
${COCOS_BASE_SRC}
${COCOS_RENDERER_SRC}

2
cocos/base/CCPlatformMacros.h
View File

@ -104,10 +104,12 @@ It's new in cocos2d-x since v0.99.5
#define NS_CC_BEGIN namespace cocos2d {
#define NS_CC_END }
#define USING_NS_CC using namespace cocos2d
#define NS_CC ::cocos2d
#else
#define NS_CC_BEGIN
#define NS_CC_END
#define USING_NS_CC
#define NS_CC
#endif
/** CC_PROPERTY_READONLY is used to declare a protected variable.

1
cocos/base/CCTouch.h
View File

@ -77,6 +77,7 @@ public:
{
_startPoint = _point;
_startPointCaptured = true;
_prevPoint = _point;
}
}
/**

2
cocos/base/ZipUtils.h
View File

@ -223,7 +223,7 @@ namespace cocos2d
*
* @since v2.0.5
*/
class ZipFile
class CC_DLL ZipFile
{
public:
/**

22
cocos/base/ccMacros.h
View File

@ -203,20 +203,20 @@ It should work same as apples CFSwapInt32LittleToHost(..)
/**********************/
#if CC_ENABLE_PROFILERS
#define CC_PROFILER_DISPLAY_TIMERS() Profiler::getInstance()->displayTimers()
#define CC_PROFILER_PURGE_ALL() Profiler::getInstance()->releaseAllTimers()
#define CC_PROFILER_DISPLAY_TIMERS() NS_CC::Profiler::getInstance()->displayTimers()
#define CC_PROFILER_PURGE_ALL() NS_CC::Profiler::getInstance()->releaseAllTimers()
#define CC_PROFILER_START(__name__) ProfilingBeginTimingBlock(__name__)
#define CC_PROFILER_STOP(__name__) ProfilingEndTimingBlock(__name__)
#define CC_PROFILER_RESET(__name__) ProfilingResetTimingBlock(__name__)
#define CC_PROFILER_START(__name__) NS_CC::ProfilingBeginTimingBlock(__name__)
#define CC_PROFILER_STOP(__name__) NS_CC::ProfilingEndTimingBlock(__name__)
#define CC_PROFILER_RESET(__name__) NS_CC::ProfilingResetTimingBlock(__name__)
#define CC_PROFILER_START_CATEGORY(__cat__, __name__) do{ if(__cat__) ProfilingBeginTimingBlock(__name__); } while(0)
#define CC_PROFILER_STOP_CATEGORY(__cat__, __name__) do{ if(__cat__) ProfilingEndTimingBlock(__name__); } while(0)
#define CC_PROFILER_RESET_CATEGORY(__cat__, __name__) do{ if(__cat__) ProfilingResetTimingBlock(__name__); } while(0)
#define CC_PROFILER_START_CATEGORY(__cat__, __name__) do{ if(__cat__) NS_CC::ProfilingBeginTimingBlock(__name__); } while(0)
#define CC_PROFILER_STOP_CATEGORY(__cat__, __name__) do{ if(__cat__) NS_CC::ProfilingEndTimingBlock(__name__); } while(0)
#define CC_PROFILER_RESET_CATEGORY(__cat__, __name__) do{ if(__cat__) NS_CC::ProfilingResetTimingBlock(__name__); } while(0)
#define CC_PROFILER_START_INSTANCE(__id__, __name__) do{ ProfilingBeginTimingBlock( String::createWithFormat("%08X - %s", __id__, __name__)->getCString() ); } while(0)
#define CC_PROFILER_STOP_INSTANCE(__id__, __name__) do{ ProfilingEndTimingBlock( String::createWithFormat("%08X - %s", __id__, __name__)->getCString() ); } while(0)
#define CC_PROFILER_RESET_INSTANCE(__id__, __name__) do{ ProfilingResetTimingBlock( String::createWithFormat("%08X - %s", __id__, __name__)->getCString() ); } while(0)
#define CC_PROFILER_START_INSTANCE(__id__, __name__) do{ NS_CC::ProfilingBeginTimingBlock( NS_CC::String::createWithFormat("%08X - %s", __id__, __name__)->getCString() ); } while(0)
#define CC_PROFILER_STOP_INSTANCE(__id__, __name__) do{ NS_CC::ProfilingEndTimingBlock( NS_CC::String::createWithFormat("%08X - %s", __id__, __name__)->getCString() ); } while(0)
#define CC_PROFILER_RESET_INSTANCE(__id__, __name__) do{ NS_CC::ProfilingResetTimingBlock( NS_CC::String::createWithFormat("%08X - %s", __id__, __name__)->getCString() ); } while(0)
#else

13
cocos/cocos2d.h
View File

@ -261,19 +261,6 @@ THE SOFTWARE.
#include "2d/CCComponent.h"
#include "2d/CCComponentContainer.h"
//3d
#include "3d/CCAABB.h"
#include "3d/CCOBB.h"
#include "3d/CCRay.h"
#include "3d/CCSprite3D.h"
#include "3d/CCMesh.h"
#include "3d/CCMeshSkin.h"
#include "3d/CCAnimate3D.h"
#include "3d/CCAnimation3D.h"
#include "3d/CCSprite3DMaterial.h"
#include "3d/CCSubMeshState.h"
#include "3d/CCAttachNode.h"
// Deprecated include
#include "deprecated/CCDictionary.h"
#include "deprecated/CCArray.h"

4
cocos/editor-support/cocostudio/CCArmatureAnimation.cpp
View File

@ -153,7 +153,7 @@ void ArmatureAnimation::setSpeedScale(float speedScale)
bone->getTween()->setProcessScale(_processScale);
if (bone->getChildArmature())
{
bone->getChildArmature()->getAnimation()->setProcessScale(_processScale);
bone->getChildArmature()->getAnimation()->setSpeedScale(_processScale);
}
}
}
@ -228,7 +228,7 @@ void ArmatureAnimation::play(const std::string& animationName, int durationTo,
if (bone->getChildArmature())
{
bone->getChildArmature()->getAnimation()->setProcessScale(_processScale);
bone->getChildArmature()->getAnimation()->setSpeedScale(_processScale);
}
}
else

5
cocos/math/TransformUtils.h
View File

@ -30,13 +30,14 @@ THE SOFTWARE.
// todo:
// when in MAC or windows, it includes <OpenGL/gl.h>
#include "CCGL.h"
#include "base/ccMacros.h"
namespace cocos2d {
struct AffineTransform;
void CGAffineToGL(const AffineTransform &t, GLfloat *m);
void GLToCGAffine(const GLfloat *m, AffineTransform *t);
CC_DLL void CGAffineToGL(const AffineTransform &t, GLfloat *m);
CC_DLL void GLToCGAffine(const GLfloat *m, AffineTransform *t);
}//namespace cocos2d
#endif // __SUPPORT_TRANSFORM_UTILS_H__

22
cocos/scripting/lua-bindings/CMakeLists.txt
View File

@ -205,3 +205,25 @@ set_target_properties(luaui
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
)
#luacocos3d
set(LIBLUA3D_SRC
auto/lua_cocos2dx_3d_auto.cpp
manual/3d/lua_cocos2dx_3d_manual.cpp
)
include_directories(
auto
manual/3d
../../../3d
)
add_library(luacocos3d STATIC
${LIBLUA3D_SRC}
)
set_target_properties(luacocos3d
PROPERTIES
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
)

20
cocos/scripting/lua-bindings/auto/api/CheckBox.lua
View File

@ -4,11 +4,6 @@
-- @extend Widget
-- @parent_module ccui
--------------------------------
-- @function [parent=#CheckBox] getSelectedState
-- @param self
-- @return bool#bool ret (return value: bool)
--------------------------------
-- @function [parent=#CheckBox] loadTextureBackGroundSelected
-- @param self
@ -21,6 +16,11 @@
-- @param #string str
-- @param #int texturerestype
--------------------------------
-- @function [parent=#CheckBox] setSelected
-- @param self
-- @param #bool bool
--------------------------------
-- @function [parent=#CheckBox] addEventListener
-- @param self
@ -32,6 +32,11 @@
-- @param #string str
-- @param #int texturerestype
--------------------------------
-- @function [parent=#CheckBox] isSelected
-- @param self
-- @return bool#bool ret (return value: bool)
--------------------------------
-- @function [parent=#CheckBox] loadTextures
-- @param self
@ -48,11 +53,6 @@
-- @param #string str
-- @param #int texturerestype
--------------------------------
-- @function [parent=#CheckBox] setSelectedState
-- @param self
-- @param #bool bool
--------------------------------
-- @function [parent=#CheckBox] loadTextureFrontCrossDisabled
-- @param self

5
cocos/scripting/lua-bindings/auto/api/Sprite3D.lua
View File

@ -60,4 +60,9 @@
-- @param #string str
-- @return Sprite3D#Sprite3D ret (retunr value: cc.Sprite3D)
--------------------------------
-- @function [parent=#Sprite3D] getBoundingBox
-- @param self
-- @return rect_table#rect_table ret (return value: rect_table)
return nil

22
cocos/scripting/lua-bindings/auto/api/Widget.lua
View File

@ -29,6 +29,11 @@
-- @param self
-- @return Node#Node ret (return value: cc.Node)
--------------------------------
-- @function [parent=#Widget] setPropagateTouchEvents
-- @param self
-- @param #bool bool
--------------------------------
-- @function [parent=#Widget] getSizePercent
-- @param self
@ -39,6 +44,11 @@
-- @param self
-- @param #vec2_table vec2
--------------------------------
-- @function [parent=#Widget] setSwallowTouches
-- @param self
-- @param #bool bool
--------------------------------
-- @function [parent=#Widget] getLayoutSize
-- @param self
@ -126,6 +136,11 @@
-- @param self
-- @return vec2_table#vec2_table ret (return value: vec2_table)
--------------------------------
-- @function [parent=#Widget] isFocusEnabled
-- @param self
-- @return bool#bool ret (return value: bool)
--------------------------------
-- @function [parent=#Widget] setFocused
-- @param self
@ -186,6 +201,11 @@
-- @param self
-- @return bool#bool ret (return value: bool)
--------------------------------
-- @function [parent=#Widget] isPropagateTouchEvents
-- @param self
-- @return bool#bool ret (return value: bool)
--------------------------------
-- @function [parent=#Widget] getCurrentFocusedWidget
-- @param self
@ -260,7 +280,7 @@
-- @param #bool bool
--------------------------------
-- @function [parent=#Widget] isFocusEnabled
-- @function [parent=#Widget] isSwallowTouches
-- @param self
-- @return bool#bool ret (return value: bool)

39
cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_3d_auto_api.lua Normal file
View File

@ -0,0 +1,39 @@
--------------------------------
-- @module cc
--------------------------------------------------------
-- the cc Sprite3D
-- @field [parent=#cc] Sprite3D#Sprite3D Sprite3D preloaded module
--------------------------------------------------------
-- the cc Mesh
-- @field [parent=#cc] Mesh#Mesh Mesh preloaded module
--------------------------------------------------------
-- the cc Skeleton3D
-- @field [parent=#cc] Skeleton3D#Skeleton3D Skeleton3D preloaded module
--------------------------------------------------------
-- the cc Animation3D
-- @field [parent=#cc] Animation3D#Animation3D Animation3D preloaded module
--------------------------------------------------------
-- the cc Animate3D
-- @field [parent=#cc] Animate3D#Animate3D Animate3D preloaded module
--------------------------------------------------------
-- the cc SubMeshState
-- @field [parent=#cc] SubMeshState#SubMeshState SubMeshState preloaded module
--------------------------------------------------------
-- the cc AttachNode
-- @field [parent=#cc] AttachNode#AttachNode AttachNode preloaded module
return nil

35
cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_auto_api.lua
View File

@ -1206,41 +1206,6 @@
-- @field [parent=#cc] Component#Component Component preloaded module
--------------------------------------------------------
-- the cc Sprite3D
-- @field [parent=#cc] Sprite3D#Sprite3D Sprite3D preloaded module
--------------------------------------------------------
-- the cc Mesh
-- @field [parent=#cc] Mesh#Mesh Mesh preloaded module
--------------------------------------------------------
-- the cc Skeleton3D
-- @field [parent=#cc] Skeleton3D#Skeleton3D Skeleton3D preloaded module
--------------------------------------------------------
-- the cc Animation3D
-- @field [parent=#cc] Animation3D#Animation3D Animation3D preloaded module
--------------------------------------------------------
-- the cc Animate3D
-- @field [parent=#cc] Animate3D#Animate3D Animate3D preloaded module
--------------------------------------------------------
-- the cc SubMeshState
-- @field [parent=#cc] SubMeshState#SubMeshState SubMeshState preloaded module
--------------------------------------------------------
-- the cc AttachNode
-- @field [parent=#cc] AttachNode#AttachNode AttachNode preloaded module
--------------------------------------------------------
-- the cc ProtectedNode
-- @field [parent=#cc] ProtectedNode#ProtectedNode ProtectedNode preloaded module

1911
cocos/scripting/lua-bindings/auto/lua_cocos2dx_3d_auto.cpp Normal file
View File

File diff suppressed because it is too large Load Diff

60
cocos/scripting/lua-bindings/auto/lua_cocos2dx_3d_auto.hpp Normal file
View File

@ -0,0 +1,60 @@
#include "base/ccConfig.h"
#ifndef __cocos2dx_3d_h__
#define __cocos2dx_3d_h__
#ifdef __cplusplus
extern "C" {
#endif
#include "tolua++.h"
#ifdef __cplusplus
}
#endif
int register_all_cocos2dx_3d(lua_State* tolua_S);
#endif // __cocos2dx_3d_h__

1895
cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp
View File

File diff suppressed because it is too large Load Diff

45
cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp
View File

@ -1537,51 +1537,6 @@ int register_all_cocos2dx(lua_State* tolua_S);

380
cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.cpp
View File

@ -1039,6 +1039,52 @@ int lua_cocos2dx_ui_Widget_getVirtualRenderer(lua_State* tolua_S)
return 0;
}
int lua_cocos2dx_ui_Widget_setPropagateTouchEvents(lua_State* tolua_S)
{
int argc = 0;
cocos2d::ui::Widget* cobj = nullptr;
bool ok = true;
#if COCOS2D_DEBUG >= 1
tolua_Error tolua_err;
#endif
#if COCOS2D_DEBUG >= 1
if (!tolua_isusertype(tolua_S,1,"ccui.Widget",0,&tolua_err)) goto tolua_lerror;
#endif
cobj = (cocos2d::ui::Widget*)tolua_tousertype(tolua_S,1,0);
#if COCOS2D_DEBUG >= 1
if (!cobj)
{
tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Widget_setPropagateTouchEvents'", nullptr);
return 0;
}
#endif
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
bool arg0;
ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccui.Widget:setPropagateTouchEvents");
if(!ok)
return 0;
cobj->setPropagateTouchEvents(arg0);
return 0;
}
CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:setPropagateTouchEvents",argc, 1);
return 0;
#if COCOS2D_DEBUG >= 1
tolua_lerror:
tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Widget_setPropagateTouchEvents'.",&tolua_err);
#endif
return 0;
}
int lua_cocos2dx_ui_Widget_getSizePercent(lua_State* tolua_S)
{
int argc = 0;
@ -1129,6 +1175,52 @@ int lua_cocos2dx_ui_Widget_setPositionPercent(lua_State* tolua_S)
return 0;
}
int lua_cocos2dx_ui_Widget_setSwallowTouches(lua_State* tolua_S)
{
int argc = 0;
cocos2d::ui::Widget* cobj = nullptr;
bool ok = true;
#if COCOS2D_DEBUG >= 1
tolua_Error tolua_err;
#endif
#if COCOS2D_DEBUG >= 1
if (!tolua_isusertype(tolua_S,1,"ccui.Widget",0,&tolua_err)) goto tolua_lerror;
#endif
cobj = (cocos2d::ui::Widget*)tolua_tousertype(tolua_S,1,0);
#if COCOS2D_DEBUG >= 1
if (!cobj)
{
tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Widget_setSwallowTouches'", nullptr);
return 0;
}
#endif
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
bool arg0;
ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccui.Widget:setSwallowTouches");
if(!ok)
return 0;
cobj->setSwallowTouches(arg0);
return 0;
}
CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:setSwallowTouches",argc, 1);
return 0;
#if COCOS2D_DEBUG >= 1
tolua_lerror:
tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Widget_setSwallowTouches'.",&tolua_err);
#endif
return 0;
}
int lua_cocos2dx_ui_Widget_getLayoutSize(lua_State* tolua_S)
{
int argc = 0;
@ -1889,6 +1981,50 @@ int lua_cocos2dx_ui_Widget_getWorldPosition(lua_State* tolua_S)
return 0;
}
int lua_cocos2dx_ui_Widget_isFocusEnabled(lua_State* tolua_S)
{
int argc = 0;
cocos2d::ui::Widget* cobj = nullptr;
bool ok = true;
#if COCOS2D_DEBUG >= 1
tolua_Error tolua_err;
#endif
#if COCOS2D_DEBUG >= 1
if (!tolua_isusertype(tolua_S,1,"ccui.Widget",0,&tolua_err)) goto tolua_lerror;
#endif
cobj = (cocos2d::ui::Widget*)tolua_tousertype(tolua_S,1,0);
#if COCOS2D_DEBUG >= 1
if (!cobj)
{
tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Widget_isFocusEnabled'", nullptr);
return 0;
}
#endif
argc = lua_gettop(tolua_S)-1;
if (argc == 0)
{
if(!ok)
return 0;
bool ret = cobj->isFocusEnabled();
tolua_pushboolean(tolua_S,(bool)ret);
return 1;
}
CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:isFocusEnabled",argc, 0);
return 0;
#if COCOS2D_DEBUG >= 1
tolua_lerror:
tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Widget_isFocusEnabled'.",&tolua_err);
#endif
return 0;
}
int lua_cocos2dx_ui_Widget_setFocused(lua_State* tolua_S)
{
int argc = 0;
@ -2431,6 +2567,50 @@ int lua_cocos2dx_ui_Widget_isBright(lua_State* tolua_S)
return 0;
}
int lua_cocos2dx_ui_Widget_isPropagateTouchEvents(lua_State* tolua_S)
{
int argc = 0;
cocos2d::ui::Widget* cobj = nullptr;
bool ok = true;
#if COCOS2D_DEBUG >= 1
tolua_Error tolua_err;
#endif
#if COCOS2D_DEBUG >= 1
if (!tolua_isusertype(tolua_S,1,"ccui.Widget",0,&tolua_err)) goto tolua_lerror;
#endif
cobj = (cocos2d::ui::Widget*)tolua_tousertype(tolua_S,1,0);
#if COCOS2D_DEBUG >= 1
if (!cobj)
{
tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Widget_isPropagateTouchEvents'", nullptr);
return 0;
}
#endif
argc = lua_gettop(tolua_S)-1;
if (argc == 0)
{
if(!ok)
return 0;
bool ret = cobj->isPropagateTouchEvents();
tolua_pushboolean(tolua_S,(bool)ret);
return 1;
}
CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:isPropagateTouchEvents",argc, 0);
return 0;
#if COCOS2D_DEBUG >= 1
tolua_lerror:
tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Widget_isPropagateTouchEvents'.",&tolua_err);
#endif
return 0;
}
int lua_cocos2dx_ui_Widget_getCurrentFocusedWidget(lua_State* tolua_S)
{
int argc = 0;
@ -3067,7 +3247,7 @@ int lua_cocos2dx_ui_Widget_setBright(lua_State* tolua_S)
return 0;
}
int lua_cocos2dx_ui_Widget_isFocusEnabled(lua_State* tolua_S)
int lua_cocos2dx_ui_Widget_isSwallowTouches(lua_State* tolua_S)
{
int argc = 0;
cocos2d::ui::Widget* cobj = nullptr;
@ -3087,7 +3267,7 @@ int lua_cocos2dx_ui_Widget_isFocusEnabled(lua_State* tolua_S)
#if COCOS2D_DEBUG >= 1
if (!cobj)
{
tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Widget_isFocusEnabled'", nullptr);
tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Widget_isSwallowTouches'", nullptr);
return 0;
}
#endif
@ -3097,16 +3277,16 @@ int lua_cocos2dx_ui_Widget_isFocusEnabled(lua_State* tolua_S)
{
if(!ok)
return 0;
bool ret = cobj->isFocusEnabled();
bool ret = cobj->isSwallowTouches();
tolua_pushboolean(tolua_S,(bool)ret);
return 1;
}
CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:isFocusEnabled",argc, 0);
CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:isSwallowTouches",argc, 0);
return 0;
#if COCOS2D_DEBUG >= 1
tolua_lerror:
tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Widget_isFocusEnabled'.",&tolua_err);
tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Widget_isSwallowTouches'.",&tolua_err);
#endif
return 0;
@ -3226,8 +3406,10 @@ int lua_register_cocos2dx_ui_Widget(lua_State* tolua_S)
tolua_function(tolua_S,"setFlippedY",lua_cocos2dx_ui_Widget_setFlippedY);
tolua_function(tolua_S,"setFlippedX",lua_cocos2dx_ui_Widget_setFlippedX);
tolua_function(tolua_S,"getVirtualRenderer",lua_cocos2dx_ui_Widget_getVirtualRenderer);
tolua_function(tolua_S,"setPropagateTouchEvents",lua_cocos2dx_ui_Widget_setPropagateTouchEvents);
tolua_function(tolua_S,"getSizePercent",lua_cocos2dx_ui_Widget_getSizePercent);
tolua_function(tolua_S,"setPositionPercent",lua_cocos2dx_ui_Widget_setPositionPercent);
tolua_function(tolua_S,"setSwallowTouches",lua_cocos2dx_ui_Widget_setSwallowTouches);
tolua_function(tolua_S,"getLayoutSize",lua_cocos2dx_ui_Widget_getLayoutSize);
tolua_function(tolua_S,"setHighlighted",lua_cocos2dx_ui_Widget_setHighlighted);
tolua_function(tolua_S,"setPositionType",lua_cocos2dx_ui_Widget_setPositionType);
@ -3245,6 +3427,7 @@ int lua_register_cocos2dx_ui_Widget(lua_State* tolua_S)
tolua_function(tolua_S,"isTouchEnabled",lua_cocos2dx_ui_Widget_isTouchEnabled);
tolua_function(tolua_S,"getActionTag",lua_cocos2dx_ui_Widget_getActionTag);
tolua_function(tolua_S,"getWorldPosition",lua_cocos2dx_ui_Widget_getWorldPosition);
tolua_function(tolua_S,"isFocusEnabled",lua_cocos2dx_ui_Widget_isFocusEnabled);
tolua_function(tolua_S,"setFocused",lua_cocos2dx_ui_Widget_setFocused);
tolua_function(tolua_S,"setActionTag",lua_cocos2dx_ui_Widget_setActionTag);
tolua_function(tolua_S,"setTouchEnabled",lua_cocos2dx_ui_Widget_setTouchEnabled);
@ -3257,6 +3440,7 @@ int lua_register_cocos2dx_ui_Widget(lua_State* tolua_S)
tolua_function(tolua_S,"setFocusEnabled",lua_cocos2dx_ui_Widget_setFocusEnabled);
tolua_function(tolua_S,"getBottomBoundary",lua_cocos2dx_ui_Widget_getBottomBoundary);
tolua_function(tolua_S,"isBright",lua_cocos2dx_ui_Widget_isBright);
tolua_function(tolua_S,"isPropagateTouchEvents",lua_cocos2dx_ui_Widget_isPropagateTouchEvents);
tolua_function(tolua_S,"getCurrentFocusedWidget",lua_cocos2dx_ui_Widget_getCurrentFocusedWidget);
tolua_function(tolua_S,"requestFocus",lua_cocos2dx_ui_Widget_requestFocus);
tolua_function(tolua_S,"updateSizeAndPosition",lua_cocos2dx_ui_Widget_updateSizeAndPosition);
@ -3271,7 +3455,7 @@ int lua_register_cocos2dx_ui_Widget(lua_State* tolua_S)
tolua_function(tolua_S,"isClippingParentContainsPoint",lua_cocos2dx_ui_Widget_isClippingParentContainsPoint);
tolua_function(tolua_S,"setSizeType",lua_cocos2dx_ui_Widget_setSizeType);
tolua_function(tolua_S,"setBright",lua_cocos2dx_ui_Widget_setBright);
tolua_function(tolua_S,"isFocusEnabled",lua_cocos2dx_ui_Widget_isFocusEnabled);
tolua_function(tolua_S,"isSwallowTouches",lua_cocos2dx_ui_Widget_isSwallowTouches);
tolua_function(tolua_S,"enableDpadNavigation", lua_cocos2dx_ui_Widget_enableDpadNavigation);
tolua_function(tolua_S,"create", lua_cocos2dx_ui_Widget_create);
tolua_endmodule(tolua_S);
@ -6309,50 +6493,6 @@ int lua_register_cocos2dx_ui_Button(lua_State* tolua_S)
return 1;
}
int lua_cocos2dx_ui_CheckBox_getSelectedState(lua_State* tolua_S)
{
int argc = 0;
cocos2d::ui::CheckBox* cobj = nullptr;
bool ok = true;
#if COCOS2D_DEBUG >= 1
tolua_Error tolua_err;
#endif
#if COCOS2D_DEBUG >= 1
if (!tolua_isusertype(tolua_S,1,"ccui.CheckBox",0,&tolua_err)) goto tolua_lerror;
#endif
cobj = (cocos2d::ui::CheckBox*)tolua_tousertype(tolua_S,1,0);
#if COCOS2D_DEBUG >= 1
if (!cobj)
{
tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_CheckBox_getSelectedState'", nullptr);
return 0;
}
#endif
argc = lua_gettop(tolua_S)-1;
if (argc == 0)
{
if(!ok)
return 0;
bool ret = cobj->getSelectedState();
tolua_pushboolean(tolua_S,(bool)ret);
return 1;
}
CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.CheckBox:getSelectedState",argc, 0);
return 0;
#if COCOS2D_DEBUG >= 1
tolua_lerror:
tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_CheckBox_getSelectedState'.",&tolua_err);
#endif
return 0;
}
int lua_cocos2dx_ui_CheckBox_loadTextureBackGroundSelected(lua_State* tolua_S)
{
int argc = 0;
@ -6471,6 +6611,52 @@ int lua_cocos2dx_ui_CheckBox_loadTextureBackGroundDisabled(lua_State* tolua_S)
return 0;
}
int lua_cocos2dx_ui_CheckBox_setSelected(lua_State* tolua_S)
{
int argc = 0;
cocos2d::ui::CheckBox* cobj = nullptr;
bool ok = true;
#if COCOS2D_DEBUG >= 1
tolua_Error tolua_err;
#endif
#if COCOS2D_DEBUG >= 1
if (!tolua_isusertype(tolua_S,1,"ccui.CheckBox",0,&tolua_err)) goto tolua_lerror;
#endif
cobj = (cocos2d::ui::CheckBox*)tolua_tousertype(tolua_S,1,0);
#if COCOS2D_DEBUG >= 1
if (!cobj)
{
tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_CheckBox_setSelected'", nullptr);
return 0;
}
#endif
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
bool arg0;
ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccui.CheckBox:setSelected");
if(!ok)
return 0;
cobj->setSelected(arg0);
return 0;
}
CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.CheckBox:setSelected",argc, 1);
return 0;
#if COCOS2D_DEBUG >= 1
tolua_lerror:
tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_CheckBox_setSelected'.",&tolua_err);
#endif
return 0;
}
int lua_cocos2dx_ui_CheckBox_addEventListener(lua_State* tolua_S)
{
int argc = 0;
@ -6580,6 +6766,50 @@ int lua_cocos2dx_ui_CheckBox_loadTextureFrontCross(lua_State* tolua_S)
return 0;
}
int lua_cocos2dx_ui_CheckBox_isSelected(lua_State* tolua_S)
{
int argc = 0;
cocos2d::ui::CheckBox* cobj = nullptr;
bool ok = true;
#if COCOS2D_DEBUG >= 1
tolua_Error tolua_err;
#endif
#if COCOS2D_DEBUG >= 1
if (!tolua_isusertype(tolua_S,1,"ccui.CheckBox",0,&tolua_err)) goto tolua_lerror;
#endif
cobj = (cocos2d::ui::CheckBox*)tolua_tousertype(tolua_S,1,0);
#if COCOS2D_DEBUG >= 1
if (!cobj)
{
tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_CheckBox_isSelected'", nullptr);
return 0;
}
#endif
argc = lua_gettop(tolua_S)-1;
if (argc == 0)
{
if(!ok)
return 0;
bool ret = cobj->isSelected();
tolua_pushboolean(tolua_S,(bool)ret);
return 1;
}
CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.CheckBox:isSelected",argc, 0);
return 0;
#if COCOS2D_DEBUG >= 1
tolua_lerror:
tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_CheckBox_isSelected'.",&tolua_err);
#endif
return 0;
}
int lua_cocos2dx_ui_CheckBox_loadTextures(lua_State* tolua_S)
{
int argc = 0;
@ -6722,52 +6952,6 @@ int lua_cocos2dx_ui_CheckBox_loadTextureBackGround(lua_State* tolua_S)
return 0;
}
int lua_cocos2dx_ui_CheckBox_setSelectedState(lua_State* tolua_S)
{
int argc = 0;
cocos2d::ui::CheckBox* cobj = nullptr;
bool ok = true;
#if COCOS2D_DEBUG >= 1
tolua_Error tolua_err;
#endif
#if COCOS2D_DEBUG >= 1
if (!tolua_isusertype(tolua_S,1,"ccui.CheckBox",0,&tolua_err)) goto tolua_lerror;
#endif
cobj = (cocos2d::ui::CheckBox*)tolua_tousertype(tolua_S,1,0);
#if COCOS2D_DEBUG >= 1
if (!cobj)
{
tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_CheckBox_setSelectedState'", nullptr);
return 0;
}
#endif
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
bool arg0;
ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccui.CheckBox:setSelectedState");
if(!ok)
return 0;
cobj->setSelectedState(arg0);
return 0;
}
CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.CheckBox:setSelectedState",argc, 1);
return 0;
#if COCOS2D_DEBUG >= 1
tolua_lerror:
tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_CheckBox_setSelectedState'.",&tolua_err);
#endif
return 0;
}
int lua_cocos2dx_ui_CheckBox_loadTextureFrontCrossDisabled(lua_State* tolua_S)
{
int argc = 0;
@ -6990,14 +7174,14 @@ int lua_register_cocos2dx_ui_CheckBox(lua_State* tolua_S)
tolua_beginmodule(tolua_S,"CheckBox");
tolua_function(tolua_S,"new",lua_cocos2dx_ui_CheckBox_constructor);
tolua_function(tolua_S,"getSelectedState",lua_cocos2dx_ui_CheckBox_getSelectedState);
tolua_function(tolua_S,"loadTextureBackGroundSelected",lua_cocos2dx_ui_CheckBox_loadTextureBackGroundSelected);
tolua_function(tolua_S,"loadTextureBackGroundDisabled",lua_cocos2dx_ui_CheckBox_loadTextureBackGroundDisabled);
tolua_function(tolua_S,"setSelected",lua_cocos2dx_ui_CheckBox_setSelected);
tolua_function(tolua_S,"addEventListener",lua_cocos2dx_ui_CheckBox_addEventListener);
tolua_function(tolua_S,"loadTextureFrontCross",lua_cocos2dx_ui_CheckBox_loadTextureFrontCross);
tolua_function(tolua_S,"isSelected",lua_cocos2dx_ui_CheckBox_isSelected);
tolua_function(tolua_S,"loadTextures",lua_cocos2dx_ui_CheckBox_loadTextures);
tolua_function(tolua_S,"loadTextureBackGround",lua_cocos2dx_ui_CheckBox_loadTextureBackGround);
tolua_function(tolua_S,"setSelectedState",lua_cocos2dx_ui_CheckBox_setSelectedState);
tolua_function(tolua_S,"loadTextureFrontCrossDisabled",lua_cocos2dx_ui_CheckBox_loadTextureFrontCrossDisabled);
tolua_function(tolua_S,"create", lua_cocos2dx_ui_CheckBox_create);
tolua_function(tolua_S,"createInstance", lua_cocos2dx_ui_CheckBox_createInstance);

4
cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.hpp
View File

@ -406,6 +406,10 @@ int register_all_cocos2dx_ui(lua_State* tolua_S);

38
cocos/scripting/lua-bindings/manual/3d/lua_cocos2dx_3d_manual.cpp Normal file
View File

@ -0,0 +1,38 @@
/****************************************************************************
Copyright (c) 2013-2014 Chukong Technologies Inc.
http://www.cocos2d-x.org
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
#include "lua_cocos2dx_3d_manual.h"
#include "lua_cocos2dx_3d_auto.hpp"
#include "CCLuaEngine.h"
int register_cocos3d_module(lua_State* L)
{
lua_getglobal(L, "_G");
if (lua_istable(L,-1))//stack:...,_G,
{
register_all_cocos2dx_3d(L);
}
lua_pop(L, 1);
return 1;
}

38
cocos/scripting/lua-bindings/manual/3d/lua_cocos2dx_3d_manual.h Normal file
View File

@ -0,0 +1,38 @@
/****************************************************************************
Copyright (c) 2013-2014 Chukong Technologies Inc.
http://www.cocos2d-x.org
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
#ifndef COCOS_SCRIPTING_LUA_BINDINGS_MANUAL_COCOS3D_LUA_COCOS2DX_3D_MANUAL_H__
#define COCOS_SCRIPTING_LUA_BINDINGS_MANUAL_COCOS3D_LUA_COCOS2DX_3D_MANUAL_H__
#ifdef __cplusplus
extern "C" {
#endif
#include "tolua++.h"
#ifdef __cplusplus
}
#endif
TOLUA_API int register_cocos3d_module(lua_State* L);
#endif // #ifndef COCOS_SCRIPTING_LUA_BINDINGS_MANUAL_3D_LUA_COCOS2DX_COCOSDENSHION_MANUAL_H__

1
cocos/scripting/lua-bindings/manual/LuaBasicConversions.h
View File

@ -30,6 +30,7 @@ extern "C" {
}
#include "tolua_fix.h"
#include "cocos2d.h"
#include "3d/cocos3d.h"
using namespace cocos2d;

23
cocos/scripting/lua-bindings/proj.android/Android.mk
View File

@ -60,6 +60,28 @@ LOCAL_WHOLE_STATIC_LIBRARIES += cocos2dx_static
include $(BUILD_STATIC_LIBRARY)
#libluacocos3d
include $(CLEAR_VARS)
LOCAL_MODULE := cocos3d_lua_static
LOCAL_MODULE_FILENAME := libluacocos3d
LOCAL_SRC_FILES := ../manual/3d/lua_cocos2dx_3d_manual.cpp \
../auto/lua_cocos2dx_3d_auto.cpp
LOCAL_C_INCLUDES := $(LOCAL_PATH)/../auto \
$(LOCAL_PATH)/../manual/3d \
$(LOCAL_PATH)/../../../3d \
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../manual/3d
LOCAL_WHOLE_STATIC_LIBRARIES := cocos2d_lua_static
LOCAL_WHOLE_STATIC_LIBRARIES += cocos3d_static
include $(BUILD_STATIC_LIBRARY)
#libluacocosdenshion
include $(CLEAR_VARS)
LOCAL_MODULE := cocosdenshion_lua_static
@ -238,5 +260,6 @@ $(call import-module,editor-support/cocostudio)
$(call import-module,editor-support/spine)
$(call import-module,ui)
$(call import-module,extensions)
$(call import-module,3d)

222
cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/project.pbxproj
View File

@ -46,12 +46,20 @@
/* End PBXAggregateTarget section */
/* Begin PBXBuildFile section */
1516228119A0F3E3006099B8 /* lua_cocos2dx_3d_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1516227F19A0F3E3006099B8 /* lua_cocos2dx_3d_auto.cpp */; };
1516228219A0F3E3006099B8 /* lua_cocos2dx_3d_auto.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1516228019A0F3E3006099B8 /* lua_cocos2dx_3d_auto.hpp */; };
151622BC19A0F4E3006099B8 /* lua_cocos2dx_3d_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1516227F19A0F3E3006099B8 /* lua_cocos2dx_3d_auto.cpp */; };
151622BD19A0F4EC006099B8 /* lua_cocos2dx_3d_auto.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1516228019A0F3E3006099B8 /* lua_cocos2dx_3d_auto.hpp */; };
15427D44198F73F700DC375D /* lua_cocos2dx_cocosdenshion_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15427D42198F73F700DC375D /* lua_cocos2dx_cocosdenshion_manual.cpp */; };
15427D45198F73F700DC375D /* lua_cocos2dx_cocosdenshion_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15427D42198F73F700DC375D /* lua_cocos2dx_cocosdenshion_manual.cpp */; };
15427D46198F73F700DC375D /* lua_cocos2dx_cocosdenshion_manual.h in Headers */ = {isa = PBXBuildFile; fileRef = 15427D43198F73F700DC375D /* lua_cocos2dx_cocosdenshion_manual.h */; };
15427D47198F73F700DC375D /* lua_cocos2dx_cocosdenshion_manual.h in Headers */ = {isa = PBXBuildFile; fileRef = 15427D43198F73F700DC375D /* lua_cocos2dx_cocosdenshion_manual.h */; };
155CA35F1988E261006E0A08 /* usocket.c in Sources */ = {isa = PBXBuildFile; fileRef = 1ABCA22D18CD8F7D0087CE3A /* usocket.c */; };
155CA3601988E26D006E0A08 /* usocket.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA22E18CD8F7D0087CE3A /* usocket.h */; };
158C128719A0FA1300781A76 /* lua_cocos2dx_3d_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 158C128519A0FA1300781A76 /* lua_cocos2dx_3d_manual.cpp */; };
158C128819A0FA1300781A76 /* lua_cocos2dx_3d_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 158C128519A0FA1300781A76 /* lua_cocos2dx_3d_manual.cpp */; };
158C128919A0FA1300781A76 /* lua_cocos2dx_3d_manual.h in Headers */ = {isa = PBXBuildFile; fileRef = 158C128619A0FA1300781A76 /* lua_cocos2dx_3d_manual.h */; };
158C128A19A0FA1300781A76 /* lua_cocos2dx_3d_manual.h in Headers */ = {isa = PBXBuildFile; fileRef = 158C128619A0FA1300781A76 /* lua_cocos2dx_3d_manual.h */; };
15AC69D519876E9300D17520 /* lua_cocos2dx_physics_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE75218BC45C200215002 /* lua_cocos2dx_physics_auto.cpp */; };
15AC69D619876EA200D17520 /* lua_cocos2dx_physics_auto.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE75318BC45C200215002 /* lua_cocos2dx_physics_auto.hpp */; };
15AC69D91987710400D17520 /* tolua_event.c in Sources */ = {isa = PBXBuildFile; fileRef = 1ABCA1F918CD8F6E0087CE3A /* tolua_event.c */; };
@ -405,6 +413,10 @@
1503FA9E18DA8A1C00F6518C /* buffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = buffer.h; sourceTree = "<group>"; };
1503FA9F18DA8A1C00F6518C /* io.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = io.c; sourceTree = "<group>"; };
1503FAA018DA8A1C00F6518C /* io.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = io.h; sourceTree = "<group>"; };
1516227C19A0F32D006099B8 /* libluacocos3d Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libluacocos3d Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; };
1516227F19A0F3E3006099B8 /* lua_cocos2dx_3d_auto.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_cocos2dx_3d_auto.cpp; sourceTree = "<group>"; };
1516228019A0F3E3006099B8 /* lua_cocos2dx_3d_auto.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = lua_cocos2dx_3d_auto.hpp; sourceTree = "<group>"; };
151622BB19A0F45E006099B8 /* libluacocos3d iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libluacocos3d iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; };
1540AF55193EC30500717D8E /* xxtea.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = xxtea.cpp; sourceTree = "<group>"; };
1540AF56193EC30500717D8E /* xxtea.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = xxtea.h; sourceTree = "<group>"; };
15427D42198F73F700DC375D /* lua_cocos2dx_cocosdenshion_manual.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_cocos2dx_cocosdenshion_manual.cpp; sourceTree = "<group>"; };
@ -414,6 +426,8 @@
15622968197780DE009C9067 /* lua_cocos2dx_experimental_auto.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = lua_cocos2dx_experimental_auto.hpp; sourceTree = "<group>"; };
156EADF11977A2BA00F53709 /* lua_cocos2dx_experimental_video_auto.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_cocos2dx_experimental_video_auto.cpp; sourceTree = "<group>"; };
156EADF21977A2BA00F53709 /* lua_cocos2dx_experimental_video_auto.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = lua_cocos2dx_experimental_video_auto.hpp; sourceTree = "<group>"; };
158C128519A0FA1300781A76 /* lua_cocos2dx_3d_manual.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_cocos2dx_3d_manual.cpp; sourceTree = "<group>"; };
158C128619A0FA1300781A76 /* lua_cocos2dx_3d_manual.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lua_cocos2dx_3d_manual.h; sourceTree = "<group>"; };
15C1BCC019864D8700A46ACC /* lua_cocos2dx_cocosbuilder_auto.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_cocos2dx_cocosbuilder_auto.cpp; sourceTree = "<group>"; };
15C1BCC119864D8700A46ACC /* lua_cocos2dx_cocosbuilder_auto.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = lua_cocos2dx_cocosbuilder_auto.hpp; sourceTree = "<group>"; };
15C1BCC219864D8700A46ACC /* lua_cocos2dx_cocosdenshion_auto.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_cocos2dx_cocosdenshion_auto.cpp; sourceTree = "<group>"; };
@ -540,6 +554,20 @@
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
1516225E19A0F32D006099B8 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
1516229C19A0F45E006099B8 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
155CA3021988C494006E0A08 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
@ -700,9 +728,20 @@
15EFA4FE198B2B9B000C57D3 /* libluanetwork iOS.a */,
15EFA59B198B2D13000C57D3 /* libluacocosdenshion iOS.a */,
15EFA616198B2DAA000C57D3 /* libluacocos2d iOS.a */,
1516227C19A0F32D006099B8 /* libluacocos3d Mac.a */,
151622BB19A0F45E006099B8 /* libluacocos3d iOS.a */,
);
sourceTree = "<group>";
};
158C128419A0FA1300781A76 /* 3d */ = {
isa = PBXGroup;
children = (
158C128519A0FA1300781A76 /* lua_cocos2dx_3d_manual.cpp */,
158C128619A0FA1300781A76 /* lua_cocos2dx_3d_manual.h */,
);
path = 3d;
sourceTree = "<group>";
};
15C1BCD21986525900A46ACC /* cocos2d */ = {
isa = PBXGroup;
children = (
@ -791,6 +830,8 @@
1AACE74818BC45C200215002 /* auto */ = {
isa = PBXGroup;
children = (
1516227F19A0F3E3006099B8 /* lua_cocos2dx_3d_auto.cpp */,
1516228019A0F3E3006099B8 /* lua_cocos2dx_3d_auto.hpp */,
15C1BCC019864D8700A46ACC /* lua_cocos2dx_cocosbuilder_auto.cpp */,
15C1BCC119864D8700A46ACC /* lua_cocos2dx_cocosbuilder_auto.hpp */,
15C1BCC219864D8700A46ACC /* lua_cocos2dx_cocosdenshion_auto.cpp */,
@ -819,6 +860,7 @@
1AACE75B18BC45C200215002 /* manual */ = {
isa = PBXGroup;
children = (
158C128419A0FA1300781A76 /* 3d */,
15427D41198F73F700DC375D /* cocosdenshion */,
15EFA400198B2AB2000C57D3 /* cocostudio */,
15C1BCF11986526C00A46ACC /* cocosbuilder */,
@ -970,6 +1012,24 @@
/* End PBXGroup section */
/* Begin PBXHeadersBuildPhase section */
1516226019A0F32D006099B8 /* Headers */ = {
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
1516228219A0F3E3006099B8 /* lua_cocos2dx_3d_auto.hpp in Headers */,
158C128919A0FA1300781A76 /* lua_cocos2dx_3d_manual.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
1516229F19A0F45E006099B8 /* Headers */ = {
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
151622BD19A0F4EC006099B8 /* lua_cocos2dx_3d_auto.hpp in Headers */,
158C128A19A0FA1300781A76 /* lua_cocos2dx_3d_manual.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
155CA3051988C494006E0A08 /* Headers */ = {
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
@ -1203,6 +1263,40 @@
/* End PBXHeadersBuildPhase section */
/* Begin PBXNativeTarget section */
1516224519A0F32D006099B8 /* libluacocos3d Mac */ = {
isa = PBXNativeTarget;
buildConfigurationList = 1516227919A0F32D006099B8 /* Build configuration list for PBXNativeTarget "libluacocos3d Mac" */;
buildPhases = (
1516224619A0F32D006099B8 /* Sources */,
1516225E19A0F32D006099B8 /* Frameworks */,
1516226019A0F32D006099B8 /* Headers */,
);
buildRules = (
);
dependencies = (
);
name = "libluacocos3d Mac";
productName = cocos2dx;
productReference = 1516227C19A0F32D006099B8 /* libluacocos3d Mac.a */;
productType = "com.apple.product-type.library.static";
};
1516228319A0F45E006099B8 /* libluacocos3d iOS */ = {
isa = PBXNativeTarget;
buildConfigurationList = 151622B819A0F45E006099B8 /* Build configuration list for PBXNativeTarget "libluacocos3d iOS" */;
buildPhases = (
1516228419A0F45E006099B8 /* Sources */,
1516229C19A0F45E006099B8 /* Frameworks */,
1516229F19A0F45E006099B8 /* Headers */,
);
buildRules = (
);
dependencies = (
);
name = "libluacocos3d iOS";
productName = cocos2dx;
productReference = 151622BB19A0F45E006099B8 /* libluacocos3d iOS.a */;
productType = "com.apple.product-type.library.static";
};
155CA2C71988C494006E0A08 /* libluaextension iOS */ = {
isa = PBXNativeTarget;
buildConfigurationList = 155CA3401988C494006E0A08 /* Build configuration list for PBXNativeTarget "libluaextension iOS" */;
@ -1504,6 +1598,7 @@
15C1BFF819865E5F00A46ACC /* libluaspine Mac */,
15C1C1061987340C00A46ACC /* libluanetwork Mac */,
15C1BEEE19865A0600A46ACC /* libluacocosdenshion Mac */,
1516224519A0F32D006099B8 /* libluacocos3d Mac */,
15C1C255198748D200A46ACC /* libluacocos2d Mac */,
15D1F2C01994B2DA00302043 /* build all lualibs iOS */,
155CA2C71988C494006E0A08 /* libluaextension iOS */,
@ -1513,12 +1608,31 @@
15EFA407198B2AFD000C57D3 /* libluaspine iOS */,
15EFA486198B2B9B000C57D3 /* libluanetwork iOS */,
15EFA523198B2D13000C57D3 /* libluacocosdenshion iOS */,
1516228319A0F45E006099B8 /* libluacocos3d iOS */,
15EFA59E198B2DAA000C57D3 /* libluacocos2d iOS */,
);
};
/* End PBXProject section */
/* Begin PBXSourcesBuildPhase section */
1516224619A0F32D006099B8 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
158C128719A0FA1300781A76 /* lua_cocos2dx_3d_manual.cpp in Sources */,
1516228119A0F3E3006099B8 /* lua_cocos2dx_3d_auto.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
1516228419A0F45E006099B8 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
158C128819A0FA1300781A76 /* lua_cocos2dx_3d_manual.cpp in Sources */,
151622BC19A0F4E3006099B8 /* lua_cocos2dx_3d_auto.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
155CA2C81988C494006E0A08 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
@ -1833,6 +1947,94 @@
/* End PBXTargetDependency section */
/* Begin XCBuildConfiguration section */
1516227A19A0F32D006099B8 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = YES;
ARCHS = "$(ARCHS_STANDARD_64_BIT)";
EXECUTABLE_PREFIX = "";
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "";
GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)",
CC_TARGET_OS_MAC,
CC_KEYBOARD_SUPPORT,
);
HEADER_SEARCH_PATHS = "";
IPHONEOS_DEPLOYMENT_TARGET = 5.0;
LIBRARY_SEARCH_PATHS = "";
PRODUCT_NAME = "libluacocos3d Mac";
TARGETED_DEVICE_FAMILY = "1,2";
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../../platform/mac $(SRCROOT)/../../../../external/glfw3/include/mac";
};
name = Debug;
};
1516227B19A0F32D006099B8 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = YES;
ARCHS = "$(ARCHS_STANDARD_64_BIT)";
EXECUTABLE_PREFIX = "";
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "";
GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)",
CC_TARGET_OS_MAC,
CC_KEYBOARD_SUPPORT,
);
HEADER_SEARCH_PATHS = "";
IPHONEOS_DEPLOYMENT_TARGET = 5.0;
LIBRARY_SEARCH_PATHS = "";
PRODUCT_NAME = "libluacocos3d Mac";
TARGETED_DEVICE_FAMILY = "1,2";
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../../platform/mac $(SRCROOT)/../../../../external/glfw3/include/mac";
};
name = Release;
};
151622B919A0F45E006099B8 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = YES;
EXECUTABLE_PREFIX = "";
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "";
GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)",
CC_TARGET_OS_IPHONE,
);
HEADER_SEARCH_PATHS = "";
IPHONEOS_DEPLOYMENT_TARGET = 5.1;
LIBRARY_SEARCH_PATHS = "";
PRODUCT_NAME = "libluacocos3d iOS";
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../../platform/ios";
};
name = Debug;
};
151622BA19A0F45E006099B8 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = YES;
EXECUTABLE_PREFIX = "";
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "";
GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)",
CC_TARGET_OS_IPHONE,
);
HEADER_SEARCH_PATHS = "";
IPHONEOS_DEPLOYMENT_TARGET = 5.1;
LIBRARY_SEARCH_PATHS = "";
PRODUCT_NAME = "libluacocos3d iOS";
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../../platform/ios";
};
name = Release;
};
1551A34A158F2AB200E66CFE /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
@ -2671,6 +2873,24 @@
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
1516227919A0F32D006099B8 /* Build configuration list for PBXNativeTarget "libluacocos3d Mac" */ = {
isa = XCConfigurationList;
buildConfigurations = (
1516227A19A0F32D006099B8 /* Debug */,
1516227B19A0F32D006099B8 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
151622B819A0F45E006099B8 /* Build configuration list for PBXNativeTarget "libluacocos3d iOS" */ = {
isa = XCConfigurationList;
buildConfigurations = (
151622B919A0F45E006099B8 /* Debug */,
151622BA19A0F45E006099B8 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
1551A339158F2AB200E66CFE /* Build configuration list for PBXProject "cocos2d_lua_bindings" */ = {
isa = XCConfigurationList;
buildConfigurations = (
@ -2768,6 +2988,7 @@
15D1F2AE1994B2AD00302043 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
15D1F2C11994B2DA00302043 /* Build configuration list for PBXAggregateTarget "build all lualibs iOS" */ = {
isa = XCConfigurationList;
@ -2776,6 +2997,7 @@
15D1F2C31994B2DA00302043 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
15EFA2F6198B2791000C57D3 /* Build configuration list for PBXNativeTarget "libluacocosbuilder iOS" */ = {
isa = XCConfigurationList;

147
cocos/scripting/lua-bindings/proj.win32/libluacocos3d.vcxproj Normal file
View File

@ -0,0 +1,147 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\auto\lua_cocos2dx_3d_auto.cpp" />
<ClCompile Include="..\manual\3d\lua_cocos2dx_3d_manual.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\auto\lua_cocos2dx_3d_auto.hpp" />
<ClInclude Include="..\manual\3d\lua_cocos2dx_3d_manual.h" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\3d\proj.win32\libcocos3d.vcxproj">
<Project>{e24950fa-5bc1-4aee-a900-4f0259354bf0}</Project>
</ProjectReference>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{06840490-14A4-43D6-88BC-AAFA44D043EB}</ProjectGuid>
<RootNamespace>libluacocos3d</RootNamespace>
<Keyword>Win32Proj</Keyword>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v110_xp</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0'">v120</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v120_xp</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v110_xp</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0'">v120</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v120_xp</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\..\..\2d\cocos2d_headers.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\..\..\2d\cocos2d_headers.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration).win32\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration).win32\$(ProjectName)\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration).win32\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration).win32\$(ProjectName)\</IntDir>
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LibraryPath>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LibraryPath>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(EngineRoot)cocos\3d;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\lua\luajit\include;$(EngineRoot)cocos\scripting\lua-bindings\auto;$(EngineRoot)cocos\scripting\lua-bindings\manual;$(EngineRoot)cocos\scripting\lua-bindings\manual\cocos2d;$(EngineRoot)cocos\scripting\lua-bindings\manual\3d;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<PrecompiledHeader>
</PrecompiledHeader>
<PrecompiledHeaderFile>
</PrecompiledHeaderFile>
<PrecompiledHeaderOutputFile>
</PrecompiledHeaderOutputFile>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>OldStyle</DebugInformationFormat>
<DisableSpecificWarnings>4800;4267;4251;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Lib>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Lib>
<PreLinkEvent>
<Command>
</Command>
</PreLinkEvent>
<PreBuildEvent>
<Command>
</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<Optimization>MinSpace</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>$(EngineRoot)cocos\3d;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\lua\luajit\include;$(EngineRoot)cocos\scripting\lua-bindings\auto;$(EngineRoot)cocos\scripting\lua-bindings\manual;$(EngineRoot)cocos\scripting\lua-bindings\manual\cocos2d;$(EngineRoot)cocos\scripting\lua-bindings\manual\3d;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;LIBLUA_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
</PrecompiledHeader>
<PrecompiledHeaderFile>
</PrecompiledHeaderFile>
<PrecompiledHeaderOutputFile>
</PrecompiledHeaderOutputFile>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>None</DebugInformationFormat>
<DisableSpecificWarnings>4800;4267;4251;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<WholeProgramOptimization>false</WholeProgramOptimization>
</ClCompile>
<Lib>
<AdditionalLibraryDirectories>libcocos2d.lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Lib>
<PreLinkEvent>
<Command>
</Command>
</PreLinkEvent>
<PreBuildEvent>
<Command>
</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

30
cocos/scripting/lua-bindings/proj.win32/libluacocos3d.vcxproj.filters Normal file
View File

@ -0,0 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="auto">
<UniqueIdentifier>{8d269c90-26ad-4ce8-b355-d8df01d59914}</UniqueIdentifier>
</Filter>
<Filter Include="manual">
<UniqueIdentifier>{25c7b94b-a9a1-4b93-b285-93c9b620e2ad}</UniqueIdentifier>
</Filter>
<Filter Include="script">
<UniqueIdentifier>{af4b7d5f-f563-4069-ade8-c1a954e6fe5e}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\auto\lua_cocos2dx_3d_auto.cpp">
<Filter>auto</Filter>
</ClCompile>
<ClCompile Include="..\manual\3d\lua_cocos2dx_3d_manual.cpp">
<Filter>manual</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\auto\lua_cocos2dx_3d_auto.hpp">
<Filter>auto</Filter>
</ClInclude>
<ClInclude Include="..\manual\3d\lua_cocos2dx_3d_manual.h">
<Filter>manual</Filter>
</ClInclude>
</ItemGroup>
</Project>

4
cocos/scripting/lua-bindings/proj.win32/libluacocos3d.vcxproj.user Normal file
View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup />
</Project>

4
cocos/ui/UICheckBox.cpp
View File

@ -339,7 +339,7 @@ void CheckBox::onPressStateChangedToDisabled()
}
}
void CheckBox::setSelectedState(bool selected)
void CheckBox::setSelected(bool selected)
{
if (selected == _isSelected)
{
@ -349,7 +349,7 @@ void CheckBox::setSelectedState(bool selected)
_frontCrossRenderer->setVisible(_isSelected);
}
bool CheckBox::getSelectedState()const
bool CheckBox::isSelected()const
{
return _isSelected;
}

7
cocos/ui/UICheckBox.h
View File

@ -166,14 +166,17 @@ public:
*
* @param selected true that checkbox is selected, false otherwise.
*/
void setSelectedState(bool selected);
CC_DEPRECATED_ATTRIBUTE void setSelectedState(bool selected){this->setSelected(selected);}
/**
* Gets selcted state of checkbox.
*
* @return selected true that checkbox is selected, false otherwise.
*/
bool getSelectedState()const;
CC_DEPRECATED_ATTRIBUTE bool getSelectedState()const{return this->isSelected();}
bool isSelected()const;
void setSelected(bool selected);
//add a call back function would called when checkbox is selected or unselected.
CC_DEPRECATED_ATTRIBUTE void addEventListenerCheckBox(Ref* target,SEL_SelectedStateEvent selector);

4
cocos/ui/UILayout.cpp
View File

@ -89,7 +89,8 @@ _backGroundImageColor(Color3B::WHITE),
_backGroundImageOpacity(255),
_passFocusToChild(true),
_loopFocus(false),
_isFocusPassing(false)
_isFocusPassing(false),
_isInterceptTouch(false)
{
//no-op
}
@ -1025,6 +1026,7 @@ void Layout::copySpecialProperties(Widget *widget)
setClippingType(layout->_clippingType);
_loopFocus = layout->_loopFocus;
_passFocusToChild = layout->_passFocusToChild;
_isInterceptTouch = layout->_isInterceptTouch;
}
}

16
cocos/ui/UILayout.h
View File

@ -463,7 +463,6 @@ protected:
bool checkFocusEnabledChild()const;
protected:
bool _clippingEnabled;
//background
bool _backGroundScale9Enabled;
@ -472,6 +471,10 @@ protected:
Rect _backGroundImageCapInsets;
BackGroundColorType _colorType;
TextureResType _bgImageTexType;
Size _backGroundImageTextureSize;
Color3B _backGroundImageColor;
GLubyte _backGroundImageOpacity;
LayerColor* _colorRender;
LayerGradient* _gradientRender;
Color3B _cColor;
@ -479,14 +482,15 @@ protected:
Color3B _gEndColor;
Vec2 _alongVector;
GLubyte _cOpacity;
Size _backGroundImageTextureSize;
//clipping
bool _clippingEnabled;
Type _layoutType;
ClippingType _clippingType;
DrawNode* _clippingStencil;
bool _scissorRectDirty;
Rect _clippingRect;
Layout* _clippingParent;
bool _doLayoutDirty;
bool _clippingRectDirty;
//clipping
@ -506,9 +510,6 @@ protected:
GLclampf _currentAlphaTestRef;
Color3B _backGroundImageColor;
GLubyte _backGroundImageOpacity;
GLint _mask_layer_le;
GroupCommand _groupCommand;
CustomCommand _beforeVisitCmdStencil;
@ -517,6 +518,9 @@ protected:
CustomCommand _beforeVisitCmdScissor;
CustomCommand _afterVisitCmdScissor;
bool _doLayoutDirty;
bool _isInterceptTouch;
//whether enable loop focus or not
bool _loopFocus;
//on default, it will pass the focus to the next nearest widget

26
cocos/ui/UIPageView.cpp
View File

@ -343,25 +343,31 @@ bool PageView::onTouchBegan(Touch *touch, Event *unusedEvent)
void PageView::onTouchMoved(Touch *touch, Event *unusedEvent)
{
handleMoveLogic(touch);
Widget* widgetParent = getWidgetParent();
if (widgetParent)
Layout::onTouchMoved(touch, unusedEvent);
if (!_isInterceptTouch)
{
widgetParent->interceptTouchEvent(TouchEventType::MOVED,this,touch);
handleMoveLogic(touch);
}
moveEvent();
}
void PageView::onTouchEnded(Touch *touch, Event *unusedEvent)
{
Layout::onTouchEnded(touch, unusedEvent);
if (!_isInterceptTouch)
{
handleReleaseLogic(touch);
}
_isInterceptTouch = false;
}
void PageView::onTouchCancelled(Touch *touch, Event *unusedEvent)
{
Layout::onTouchCancelled(touch, unusedEvent);
if (!_isInterceptTouch)
{
handleReleaseLogic(touch);
}
_isInterceptTouch = false;
}
void PageView::doLayout()
@ -526,7 +532,9 @@ void PageView::interceptTouchEvent(TouchEventType event, Widget *sender, Touch *
switch (event)
{
case TouchEventType::BEGAN:
//no-op
{
_isInterceptTouch = true;
}
break;
case TouchEventType::MOVED:
{
@ -541,7 +549,13 @@ void PageView::interceptTouchEvent(TouchEventType event, Widget *sender, Touch *
break;
case TouchEventType::CANCELED:
case TouchEventType::ENDED:
{
handleReleaseLogic(touch);
if (sender->isSwallowTouches())
{
_isInterceptTouch = false;
}
}
break;
}
}

24
cocos/ui/UIScrollView.cpp
View File

@ -1498,29 +1498,43 @@ void ScrollView::handleReleaseLogic(Touch *touch)
bool ScrollView::onTouchBegan(Touch *touch, Event *unusedEvent)
{
bool pass = Layout::onTouchBegan(touch, unusedEvent);
if (!_isInterceptTouch)
{
if (_hitted)
{
handlePressLogic(touch);
}
}
return pass;
}
void ScrollView::onTouchMoved(Touch *touch, Event *unusedEvent)
{
Layout::onTouchMoved(touch, unusedEvent);
if (!_isInterceptTouch)
{
handleMoveLogic(touch);
}
}
void ScrollView::onTouchEnded(Touch *touch, Event *unusedEvent)
{
Layout::onTouchEnded(touch, unusedEvent);
if (!_isInterceptTouch)
{
handleReleaseLogic(touch);
}
_isInterceptTouch = false;
}
void ScrollView::onTouchCancelled(Touch *touch, Event *unusedEvent)
{
Layout::onTouchCancelled(touch, unusedEvent);
if (!_isInterceptTouch)
{
handleReleaseLogic(touch);
}
_isInterceptTouch = false;
}
void ScrollView::update(float dt)
@ -1550,10 +1564,12 @@ void ScrollView::interceptTouchEvent(Widget::TouchEventType event, Widget *sende
switch (event)
{
case TouchEventType::BEGAN:
{
_isInterceptTouch = true;
_touchBeganPosition = touch->getLocation();
handlePressLogic(touch);
}
break;
case TouchEventType::MOVED:
{
float offset = (sender->getTouchBeganPosition() - touchPoint).getLength();
@ -1568,8 +1584,14 @@ void ScrollView::interceptTouchEvent(Widget::TouchEventType event, Widget *sende
case TouchEventType::CANCELED:
case TouchEventType::ENDED:
{
_touchEndPosition = touch->getLocation();
handleReleaseLogic(touch);
if (sender->isSwallowTouches())
{
_isInterceptTouch = false;
}
}
break;
}
}

79
cocos/ui/UIWidget.cpp
View File

@ -152,14 +152,14 @@ _sizeType(SizeType::ABSOLUTE),
_sizePercent(Vec2::ZERO),
_positionType(PositionType::ABSOLUTE),
_positionPercent(Vec2::ZERO),
_reorderWidgetChildDirty(true),
_hitted(false),
_touchListener(nullptr),
_flippedX(false),
_flippedY(false),
_focused(false),
_focusEnabled(true),
_layoutParameterType(LayoutParameter::Type::NONE)
_layoutParameterType(LayoutParameter::Type::NONE),
_propagateTouchEvents(true)
{
}
@ -652,6 +652,33 @@ bool Widget::isAncestorsEnabled()
return parentWidget->isAncestorsEnabled();
}
void Widget::setPropagateTouchEvents(bool isPropagate)
{
_propagateTouchEvents = isPropagate;
}
bool Widget::isPropagateTouchEvents()const
{
return _propagateTouchEvents;
}
void Widget::setSwallowTouches(bool swallow)
{
if (_touchListener)
{
_touchListener->setSwallowTouches(swallow);
}
}
bool Widget::isSwallowTouches()const
{
if (_touchListener)
{
return _touchListener->isSwallowTouches();
}
return false;
}
bool Widget::onTouchBegan(Touch *touch, Event *unusedEvent)
{
_hitted = false;
@ -668,24 +695,42 @@ bool Widget::onTouchBegan(Touch *touch, Event *unusedEvent)
return false;
}
setHighlighted(true);
/*
* Propagate touch events to its parents
*/
if (_propagateTouchEvents)
{
this->propagateTouchEvent(TouchEventType::BEGAN, this, touch);
}
pushDownEvent();
return true;
}
void Widget::propagateTouchEvent(cocos2d::ui::Widget::TouchEventType event, cocos2d::ui::Widget *sender, cocos2d::Touch *touch)
{
Widget* widgetParent = getWidgetParent();
if (widgetParent)
{
widgetParent->interceptTouchEvent(TouchEventType::BEGAN, this, touch);
widgetParent->interceptTouchEvent(event, sender, touch);
}
pushDownEvent();
return true;
}
void Widget::onTouchMoved(Touch *touch, Event *unusedEvent)
{
_touchMovePosition = touch->getLocation();
setHighlighted(hitTest(_touchMovePosition));
Widget* widgetParent = getWidgetParent();
if (widgetParent)
/*
* Propagate touch events to its parents
*/
if (_propagateTouchEvents)
{
widgetParent->interceptTouchEvent(TouchEventType::MOVED, this, touch);
this->propagateTouchEvent(TouchEventType::MOVED, this, touch);
}
moveEvent();
}
@ -693,10 +738,12 @@ void Widget::onTouchEnded(Touch *touch, Event *unusedEvent)
{
_touchEndPosition = touch->getLocation();
Widget* widgetParent = getWidgetParent();
if (widgetParent)
/*
* Propagate touch events to its parents
*/
if (_propagateTouchEvents)
{
widgetParent->interceptTouchEvent(TouchEventType::ENDED, this, touch);
this->propagateTouchEvent(TouchEventType::ENDED, this, touch);
}
bool highlight = _highlight;
@ -721,7 +768,8 @@ void Widget::onTouchCancelled(Touch *touch, Event *unusedEvent)
void Widget::pushDownEvent()
{
this->retain();
if (_touchEventCallback) {
if (_touchEventCallback)
{
_touchEventCallback(this, TouchEventType::BEGAN);
}
@ -735,7 +783,8 @@ void Widget::pushDownEvent()
void Widget::moveEvent()
{
this->retain();
if (_touchEventCallback) {
if (_touchEventCallback)
{
_touchEventCallback(this, TouchEventType::MOVED);
}
@ -749,7 +798,8 @@ void Widget::moveEvent()
void Widget::releaseUpEvent()
{
this->retain();
if (_touchEventCallback) {
if (_touchEventCallback)
{
_touchEventCallback(this, TouchEventType::ENDED);
}
@ -1035,6 +1085,7 @@ void Widget::copyProperties(Widget *widget)
_touchEventSelector = widget->_touchEventSelector;
_focused = widget->_focused;
_focusEnabled = widget->_focusEnabled;
_propagateTouchEvents = widget->_propagateTouchEvents;
copySpecialProperties(widget);

23
cocos/ui/UIWidget.h
View File

@ -502,10 +502,20 @@ public:
void updateSizeAndPosition(const Size& parentSize);
/*temp action*/
void setActionTag(int tag);
int getActionTag()const;
/**
*@brief Allow widget touch events to propagate to its parents. Set false will disable propagation
*/
void setPropagateTouchEvents(bool isPropagate);
bool isPropagateTouchEvents()const;
/**
*@brief Specify widget to swallow touches or not
*/
void setSwallowTouches(bool swallow);
bool isSwallowTouches()const;
/**
*@return whether the widget is focused or not
*/
@ -575,12 +585,19 @@ CC_CONSTRUCTOR_ACCESS:
virtual bool init() override;
/*
* Sends the touch event to widget's parent
* @brief Sends the touch event to widget's parent, if a widget wants to handle touch event under another widget,
* it must overide this function.
* @param event the touch event type, it could be BEGAN/MOVED/CANCELED/ENDED
* @param parent
* @param point
*/
virtual void interceptTouchEvent(TouchEventType event, Widget* sender, Touch *touch);
/**
*@brief Propagate touch events to its parents
*/
void propagateTouchEvent(TouchEventType event, Widget* sender, Touch *touch);
friend class PageView;
/**
* This method is called when a focus change event happens
@ -642,9 +659,9 @@ protected:
bool _bright;
bool _touchEnabled;
bool _highlight;
bool _reorderWidgetChildDirty;
bool _affectByClipping;
bool _ignoreSize;
bool _propagateTouchEvents;
BrightStyle _brightStyle;
SizeType _sizeType;

15
templates/cocos2dx_files.json
View File

@ -192,6 +192,8 @@
"cocos/2d/cocos2dx.props",
"cocos/2d/libcocos2d.vcxproj",
"cocos/2d/libcocos2d.vcxproj.filters",
"cocos/3d/3dExport.h",
"cocos/3d/Android.mk",
"cocos/3d/CCAABB.cpp",
"cocos/3d/CCAABB.h",
"cocos/3d/CCAnimate3D.cpp",
@ -228,6 +230,10 @@
"cocos/3d/CCSubMeshState.cpp",
"cocos/3d/CCSubMeshState.h",
"cocos/3d/CMakeLists.txt",
"cocos/3d/cocos3d.h",
"cocos/3d/proj.win32/libcocos3d.vcxproj",
"cocos/3d/proj.win32/libcocos3d.vcxproj.filters",
"cocos/3d/proj.win32/libcocos3d.vcxproj.user",
"cocos/Android.mk",
"cocos/CMakeLists.txt",
"cocos/audio/CMakeLists.txt",
@ -3977,6 +3983,7 @@
"cocos/scripting/lua-bindings/auto/api/WavesTiles3D.lua",
"cocos/scripting/lua-bindings/auto/api/Widget.lua",
"cocos/scripting/lua-bindings/auto/api/ZOrderFrame.lua",
"cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_3d_auto_api.lua",
"cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_auto_api.lua",
"cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_cocosbuilder_auto_api.lua",
"cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_cocosdenshion_auto_api.lua",
@ -3988,6 +3995,8 @@
"cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_spine_auto_api.lua",
"cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_studio_auto_api.lua",
"cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_ui_auto_api.lua",
"cocos/scripting/lua-bindings/auto/lua_cocos2dx_3d_auto.cpp",
"cocos/scripting/lua-bindings/auto/lua_cocos2dx_3d_auto.hpp",
"cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp",
"cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp",
"cocos/scripting/lua-bindings/auto/lua_cocos2dx_cocosbuilder_auto.cpp",
@ -4010,6 +4019,8 @@
"cocos/scripting/lua-bindings/auto/lua_cocos2dx_studio_auto.hpp",
"cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.cpp",
"cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.hpp",
"cocos/scripting/lua-bindings/manual/3d/lua_cocos2dx_3d_manual.cpp",
"cocos/scripting/lua-bindings/manual/3d/lua_cocos2dx_3d_manual.h",
"cocos/scripting/lua-bindings/manual/CCLuaBridge.cpp",
"cocos/scripting/lua-bindings/manual/CCLuaBridge.h",
"cocos/scripting/lua-bindings/manual/CCLuaEngine.cpp",
@ -4076,6 +4087,9 @@
"cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/project.pbxproj",
"cocos/scripting/lua-bindings/proj.win32/libluacocos2d.vcxproj",
"cocos/scripting/lua-bindings/proj.win32/libluacocos2d.vcxproj.filters",
"cocos/scripting/lua-bindings/proj.win32/libluacocos3d.vcxproj",
"cocos/scripting/lua-bindings/proj.win32/libluacocos3d.vcxproj.filters",
"cocos/scripting/lua-bindings/proj.win32/libluacocos3d.vcxproj.user",
"cocos/scripting/lua-bindings/proj.win32/libluacocosbuilder.vcxproj",
"cocos/scripting/lua-bindings/proj.win32/libluacocosbuilder.vcxproj.filters",
"cocos/scripting/lua-bindings/proj.win32/libluacocosdenshion.vcxproj",
@ -4506,6 +4520,7 @@
"tools/bindings-generator/tools/win32/cygwin1.dll",
"tools/tolua/README.mdown",
"tools/tolua/cocos2dx.ini",
"tools/tolua/cocos2dx_3d.ini",
"tools/tolua/cocos2dx_cocosbuilder.ini",
"tools/tolua/cocos2dx_cocosdenshion.ini",
"tools/tolua/cocos2dx_controller.ini",

3
templates/cpp-template-default/CMakeLists.txt
View File

@ -189,6 +189,9 @@ add_subdirectory(${COCOS2D_ROOT}/external/xxhash)
# cocos2d
add_subdirectory(${COCOS2D_ROOT}/cocos)
# cocos3d library
add_subdirectory(${COCOS2D_ROOT}/cocos/3d)
# network library
add_subdirectory(${COCOS2D_ROOT}/cocos/network)

2
templates/cpp-template-default/proj.android/jni/Android.mk
View File

@ -18,6 +18,7 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../src
LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dx_static
LOCAL_WHOLE_STATIC_LIBRARIES += cocosdenshion_static
LOCAL_WHOLE_STATIC_LIBRARIES += cocos3d_static
# LOCAL_WHOLE_STATIC_LIBRARIES += box2d_static
# LOCAL_WHOLE_STATIC_LIBRARIES += cocosbuilder_static
@ -31,6 +32,7 @@ include $(BUILD_SHARED_LIBRARY)
$(call import-module,.)
$(call import-module,audio/android)
$(call import-module,3d)
# $(call import-module,Box2D)
# $(call import-module,editor-support/cocosbuilder)

60
templates/cpp-template-default/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj
View File

@ -7,6 +7,8 @@
objects = {
/* Begin PBXBuildFile section */
158C12AB19A1E4DF00781A76 /* libcocos3d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 158C12AA19A1E4C800781A76 /* libcocos3d iOS.a */; };
158C12AE19A1E4FE00781A76 /* libcocos3d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 158C12A819A1E4C800781A76 /* libcocos3d Mac.a */; };
15A6DA93199CFB1100B56DBF /* AppDelegate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15A6DA8F199CFB1100B56DBF /* AppDelegate.cpp */; };
15A6DA94199CFB1100B56DBF /* AppDelegate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15A6DA8F199CFB1100B56DBF /* AppDelegate.cpp */; };
15A6DA95199CFB1100B56DBF /* HelloWorldScene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15A6DA91199CFB1100B56DBF /* HelloWorldScene.cpp */; };
@ -72,6 +74,34 @@
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
158C129719A1E4C800781A76 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 15162030199E7810006099B8;
remoteInfo = "libcocos3d iOS";
};
158C12A719A1E4C800781A76 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 1516200B199E7363006099B8;
remoteInfo = "libcocos3d Mac";
};
158C12A919A1E4C800781A76 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 15162201199E7810006099B8;
remoteInfo = "libcocos3d iOS";
};
158C12AC19A1E4EB00781A76 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 15161E42199E7362006099B8;
remoteInfo = "libcocos3d Mac";
};
15A6DA7A199CFAFD00B56DBF /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */;
@ -344,6 +374,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
158C12AB19A1E4DF00781A76 /* libcocos3d iOS.a in Frameworks */,
1AC6FB2E180E99EB004C840B /* libbox2d iOS.a in Frameworks */,
1AC6FB2F180E99EB004C840B /* libchipmunk iOS.a in Frameworks */,
1AC6FB30180E99EB004C840B /* libcocos2d iOS.a in Frameworks */,
@ -366,6 +397,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
158C12AE19A1E4FE00781A76 /* libcocos3d Mac.a in Frameworks */,
1AC6FB1F180E996B004C840B /* libbox2d Mac.a in Frameworks */,
1AC6FB20180E996B004C840B /* libchipmunk Mac.a in Frameworks */,
1AC6FB21180E996B004C840B /* libcocos2d Mac.a in Frameworks */,
@ -446,6 +478,7 @@
1AC6FAFD180E9839004C840B /* libchipmunk Mac.a */,
1AC6FAFF180E9839004C840B /* libbox2d Mac.a */,
1AC6FB01180E9839004C840B /* libcocosdenshion Mac.a */,
158C12A819A1E4C800781A76 /* libcocos3d Mac.a */,
1AC6FB07180E9839004C840B /* libcocos2d iOS.a */,
1AC6FB09180E9839004C840B /* libextension iOS.a */,
1AC6FB0B180E9839004C840B /* libchipmunk iOS.a */,
@ -456,6 +489,7 @@
15A6DA89199CFAFD00B56DBF /* libcocosbuilder iOS.a */,
15A6DA8B199CFAFD00B56DBF /* libspine iOS.a */,
15A6DA8D199CFAFD00B56DBF /* libnetwork iOS.a */,
158C12AA19A1E4C800781A76 /* libcocos3d iOS.a */,
);
name = Products;
sourceTree = "<group>";
@ -555,6 +589,7 @@
buildRules = (
);
dependencies = (
158C129819A1E4C800781A76 /* PBXTargetDependency */,
1AC6FB25180E99E1004C840B /* PBXTargetDependency */,
1AC6FB27180E99E1004C840B /* PBXTargetDependency */,
1AC6FB29180E99E1004C840B /* PBXTargetDependency */,
@ -577,6 +612,7 @@
buildRules = (
);
dependencies = (
158C12AD19A1E4EB00781A76 /* PBXTargetDependency */,
1AC6FB1E180E9963004C840B /* PBXTargetDependency */,
1AC6FB16180E9959004C840B /* PBXTargetDependency */,
1AC6FB18180E9959004C840B /* PBXTargetDependency */,
@ -628,6 +664,20 @@
/* End PBXProject section */
/* Begin PBXReferenceProxy section */
158C12A819A1E4C800781A76 /* libcocos3d Mac.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = "libcocos3d Mac.a";
remoteRef = 158C12A719A1E4C800781A76 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
158C12AA19A1E4C800781A76 /* libcocos3d iOS.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = "libcocos3d iOS.a";
remoteRef = 158C12A919A1E4C800781A76 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
15A6DA7B199CFAFD00B56DBF /* libui Mac.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
@ -836,6 +886,16 @@
/* End PBXSourcesBuildPhase section */
/* Begin PBXTargetDependency section */
158C129819A1E4C800781A76 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = "libcocos3d iOS";
targetProxy = 158C129719A1E4C800781A76 /* PBXContainerItemProxy */;
};
158C12AD19A1E4EB00781A76 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = "libcocos3d Mac";
targetProxy = 158C12AC19A1E4EB00781A76 /* PBXContainerItemProxy */;
};
1AC6FB16180E9959004C840B /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = "cocos2dx Mac";

6
templates/cpp-template-default/proj.win32/HelloCpp.sln
View File

@ -11,6 +11,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d", "..\cocos2d\co
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libchipmunk", "..\cocos2d\external\chipmunk\proj.win32\chipmunk.vcxproj", "{207BC7A9-CCF1-4F2F-A04D-45F72242AE25}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos3d", "..\cocos2d\cocos\3d\proj.win32\libcocos3d.vcxproj", "{E24950FA-5BC1-4AEE-A900-4F0259354BF0}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@ -29,6 +31,10 @@ Global
{207BC7A9-CCF1-4F2F-A04D-45F72242AE25}.Debug|Win32.Build.0 = Debug|Win32
{207BC7A9-CCF1-4F2F-A04D-45F72242AE25}.Release|Win32.ActiveCfg = Release|Win32
{207BC7A9-CCF1-4F2F-A04D-45F72242AE25}.Release|Win32.Build.0 = Release|Win32
{E24950FA-5BC1-4AEE-A900-4F0259354BF0}.Debug|Win32.ActiveCfg = Debug|Win32
{E24950FA-5BC1-4AEE-A900-4F0259354BF0}.Debug|Win32.Build.0 = Debug|Win32
{E24950FA-5BC1-4AEE-A900-4F0259354BF0}.Release|Win32.ActiveCfg = Release|Win32
{E24950FA-5BC1-4AEE-A900-4F0259354BF0}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

3
templates/cpp-template-default/proj.win32/HelloCpp.vcxproj
View File

@ -151,6 +151,9 @@ xcopy /Y /Q "$(EngineRoot)external\websockets\prebuilt\win32\*.*" "$(OutDir)"</C
<Project>{98a51ba8-fc3a-415b-ac8f-8c7bd464e93e}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="..\cocos2d\cocos\3d\proj.win32\libcocos3d.vcxproj">
<Project>{e24950fa-5bc1-4aee-a900-4f0259354bf0}</Project>
</ProjectReference>
<ProjectReference Include="..\cocos2d\external\chipmunk\proj.win32\chipmunk.vcxproj">
<Project>{207bc7a9-ccf1-4f2f-a04d-45f72242ae25}</Project>
</ProjectReference>

4
templates/cpp-template-default/proj.wp8-xaml/App/HelloCpp.csproj
View File

@ -156,8 +156,8 @@
</ItemGroup>
<ItemGroup>
<Content Include="..\..\Resources\**\*">
<Link>Assets\Resources\%(RecursiveDir)%(FileName)%(Extension)</Link>
<Content Include="..\..\res\**\*">
<Link>Assets\res\%(RecursiveDir)%(FileName)%(Extension)</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>

16
templates/cpp-template-default/proj.wp8-xaml/AppComponent/HelloCppComponent.vcxproj
View File

@ -90,7 +90,7 @@
<CompileAsWinRT>true</CompileAsWinRT>
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
<AdditionalOptions>/Zm200 %(AdditionalOptions)</AdditionalOptions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\Classes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
@ -110,7 +110,7 @@
<CompileAsWinRT>true</CompileAsWinRT>
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
<AdditionalOptions>/Zm200 %(AdditionalOptions)</AdditionalOptions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\Classes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
@ -130,7 +130,7 @@
<CompileAsWinRT>true</CompileAsWinRT>
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
<AdditionalOptions>/Zm200 %(AdditionalOptions)</AdditionalOptions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\Classes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
@ -150,7 +150,7 @@
<CompileAsWinRT>true</CompileAsWinRT>
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
<AdditionalOptions>/Zm200 %(AdditionalOptions)</AdditionalOptions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\Classes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
@ -203,8 +203,8 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\Classes\AppDelegate.cpp" />
<ClCompile Include="..\..\Classes\HelloWorldScene.cpp" />
<ClCompile Include="..\..\src\AppDelegate.cpp" />
<ClCompile Include="..\..\src\HelloWorldScene.cpp" />
<ClCompile Include="pch.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">Create</PrecompiledHeader>
@ -218,8 +218,8 @@
<ClCompile Include="src\EditBoxEvent.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\Classes\AppDelegate.h" />
<ClInclude Include="..\..\Classes\HelloWorldScene.h" />
<ClInclude Include="..\..\src\AppDelegate.h" />
<ClInclude Include="..\..\src\HelloWorldScene.h" />
<ClInclude Include="pch.h" />
<ClInclude Include="src\Cocos2dRenderer.h" />
<ClInclude Include="src\Direct3DContentProvider.h" />

48
templates/cpp-template-default/proj.wp8-xaml/AppComponent/HelloCppComponent.vcxproj.filters
View File

@ -2,61 +2,61 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ClCompile Include="pch.cpp" />
<ClCompile Include="..\..\Classes\AppDelegate.cpp">
<Filter>Classes</Filter>
</ClCompile>
<ClCompile Include="..\..\Classes\HelloWorldScene.cpp">
<Filter>Classes</Filter>
</ClCompile>
<ClCompile Include="src\Cocos2dRenderer.cpp">
<Filter>src</Filter>
<Filter>platform_src</Filter>
</ClCompile>
<ClCompile Include="src\Direct3DContentProvider.cpp">
<Filter>src</Filter>
<Filter>platform_src</Filter>
</ClCompile>
<ClCompile Include="src\Direct3DInterop.cpp">
<Filter>src</Filter>
<Filter>platform_src</Filter>
</ClCompile>
<ClCompile Include="src\DirectXBase.cpp">
<Filter>src</Filter>
<Filter>platform_src</Filter>
</ClCompile>
<ClCompile Include="src\EditBoxEvent.cpp">
<Filter>platform_src</Filter>
</ClCompile>
<ClCompile Include="..\..\src\HelloWorldScene.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\src\AppDelegate.cpp">
<Filter>src</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="pch.h" />
<ClInclude Include="..\..\Classes\AppDelegate.h">
<Filter>Classes</Filter>
</ClInclude>
<ClInclude Include="..\..\Classes\HelloWorldScene.h">
<Filter>Classes</Filter>
</ClInclude>
<ClInclude Include="src\Cocos2dRenderer.h">
<Filter>src</Filter>
<Filter>platform_src</Filter>
</ClInclude>
<ClInclude Include="src\Direct3DContentProvider.h">
<Filter>src</Filter>
<Filter>platform_src</Filter>
</ClInclude>
<ClInclude Include="src\Direct3DInterop.h">
<Filter>src</Filter>
<Filter>platform_src</Filter>
</ClInclude>
<ClInclude Include="src\DirectXBase.h">
<Filter>src</Filter>
<Filter>platform_src</Filter>
</ClInclude>
<ClInclude Include="src\DirectXHelper.h">
<Filter>src</Filter>
<Filter>platform_src</Filter>
</ClInclude>
<ClInclude Include="src\EditBoxEvent.h">
<Filter>platform_src</Filter>
</ClInclude>
<ClInclude Include="..\..\src\AppDelegate.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="..\..\src\HelloWorldScene.h">
<Filter>src</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Filter Include="Classes">
<UniqueIdentifier>{facbd0ff-d271-46ef-8324-beff0cbcb424}</UniqueIdentifier>
<Filter Include="platform_src">
<UniqueIdentifier>{6fcff44b-bb9f-4ed9-8553-558855bc91e3}</UniqueIdentifier>
</Filter>
<Filter Include="src">
<UniqueIdentifier>{6fcff44b-bb9f-4ed9-8553-558855bc91e3}</UniqueIdentifier>
<UniqueIdentifier>{6e41adf9-1cf5-4085-ae27-accb4c9eab3d}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>

5
templates/lua-template-default/frameworks/CMakeLists.txt
View File

@ -109,6 +109,9 @@ add_subdirectory(${COCOS2D_ROOT}/external/xxhash)
# cocos 2d library
add_subdirectory(${COCOS2D_ROOT}/cocos)
# cocos 3d library
add_subdirectory(${COCOS2D_ROOT}/cocos/3d)
# network library
add_subdirectory(${COCOS2D_ROOT}/cocos/network)
@ -158,6 +161,7 @@ endif()
target_link_libraries(${APP_NAME}
luacocos2d
luacocos3d
luacocosdenshion
luanetwork
luacocosbuilder
@ -166,6 +170,7 @@ target_link_libraries(${APP_NAME}
luaextension
luaui
cocos2d
cocos3d
audio
cocostudio
spine

2
templates/lua-template-default/frameworks/runtime-src/Classes/lua_module_register.h
View File

@ -8,6 +8,7 @@
#include "extension/lua_cocos2dx_extension_manual.h"
#include "ui/lua_cocos2dx_ui_manual.hpp"
#include "spine/lua_cocos2dx_spine_manual.hpp"
#include "3d/lua_cocos2dx_3d_manual.h"
int lua_module_register(lua_State* L)
@ -19,6 +20,7 @@ int lua_module_register(lua_State* L)
register_extension_module(L);
register_ui_moudle(L);
register_spine_module(L);
register_cocos3d_module(L);
return 1;
}

1
templates/lua-template-default/frameworks/runtime-src/proj.android/jni/Android.mk
View File

@ -20,6 +20,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES += cocostudio_lua_static
LOCAL_WHOLE_STATIC_LIBRARIES += spine_lua_static
LOCAL_WHOLE_STATIC_LIBRARIES += extension_lua_static
LOCAL_WHOLE_STATIC_LIBRARIES += ui_lua_static
LOCAL_WHOLE_STATIC_LIBRARIES += cocos3d_lua_static
include $(BUILD_SHARED_LIBRARY)

120
templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj
View File

@ -19,6 +19,10 @@
15427C7B198F1FC100DC375D /* libluacocosdenshion Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427C47198F1DE400DC375D /* libluacocosdenshion Mac.a */; };
15427C7C198F1FCB00DC375D /* libnetwork Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427C1F198F1DE400DC375D /* libnetwork Mac.a */; };
15427C7D198F1FD800DC375D /* libluanetwork Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427C45198F1DE400DC375D /* libluanetwork Mac.a */; };
156B43D419A1F224002CBF18 /* libcocos3d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 156B43C919A1F1EF002CBF18 /* libcocos3d iOS.a */; };
156B43D519A1F236002CBF18 /* libluacocos3d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 156B43D119A1F1EF002CBF18 /* libluacocos3d iOS.a */; };
156B43DA19A1F256002CBF18 /* libcocos3d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 156B43C719A1F1EF002CBF18 /* libcocos3d Mac.a */; };
156B43DB19A1F262002CBF18 /* libluacocos3d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 156B43CF19A1F1EF002CBF18 /* libluacocos3d Mac.a */; };
15A8A4491834C64F00142BE0 /* Icon-114.png in Resources */ = {isa = PBXBuildFile; fileRef = 5023810C17EBBCAC00990C9B /* Icon-114.png */; };
15A8A4881834C90F00142BE0 /* libcurl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A8A4871834C90E00142BE0 /* libcurl.dylib */; };
15AA968E199C627C00725633 /* libluaextension iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427C4B198F1DE400DC375D /* libluaextension iOS.a */; };
@ -567,6 +571,62 @@
remoteGlobalIDString = A03F2E9817814268006731B9;
remoteInfo = "libcocosdenshion Mac";
};
156B43BC19A1F1EF002CBF18 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 1516228319A0F45E006099B8;
remoteInfo = "libluacocos3d iOS";
};
156B43C619A1F1EF002CBF18 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 1516200B199E7363006099B8;
remoteInfo = "libcocos3d Mac";
};
156B43C819A1F1EF002CBF18 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 15162201199E7810006099B8;
remoteInfo = "libcocos3d iOS";
};
156B43CE19A1F1EF002CBF18 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 1516227C19A0F32D006099B8;
remoteInfo = "libluacocos3d Mac";
};
156B43D019A1F1EF002CBF18 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 151622BB19A0F45E006099B8;
remoteInfo = "libluacocos3d iOS";
};
156B43D219A1F1FD002CBF18 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 15162030199E7810006099B8;
remoteInfo = "libcocos3d iOS";
};
156B43D619A1F243002CBF18 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 1516224519A0F32D006099B8;
remoteInfo = "libluacocos3d Mac";
};
156B43D819A1F249002CBF18 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 15161E42199E7362006099B8;
remoteInfo = "libcocos3d Mac";
};
15A8A4161834BDA200142BE0 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */;
@ -736,6 +796,8 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
156B43DB19A1F262002CBF18 /* libluacocos3d Mac.a in Frameworks */,
156B43DA19A1F256002CBF18 /* libcocos3d Mac.a in Frameworks */,
15AA96B1199C655A00725633 /* libluaui Mac.a in Frameworks */,
15AA96B0199C655200725633 /* libui Mac.a in Frameworks */,
15AA96AF199C653300725633 /* libluaextension Mac.a in Frameworks */,
@ -770,6 +832,8 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
156B43D519A1F236002CBF18 /* libluacocos3d iOS.a in Frameworks */,
156B43D419A1F224002CBF18 /* libcocos3d iOS.a in Frameworks */,
15AA96A7199C62FE00725633 /* libui iOS.a in Frameworks */,
15AA96A6199C62F500725633 /* libluaui iOS.a in Frameworks */,
15AA96A5199C62CF00725633 /* libspine iOS.a in Frameworks */,
@ -816,6 +880,7 @@
15A8A41B1834BDA200142BE0 /* libchipmunk Mac.a */,
15A8A41D1834BDA200142BE0 /* libbox2d Mac.a */,
15A8A41F1834BDA200142BE0 /* libcocosdenshion Mac.a */,
156B43C719A1F1EF002CBF18 /* libcocos3d Mac.a */,
15A8A4251834BDA200142BE0 /* libcocos2d iOS.a */,
15A8A4271834BDA200142BE0 /* libextension iOS.a */,
15A8A4291834BDA200142BE0 /* libchipmunk iOS.a */,
@ -826,6 +891,7 @@
15427C25198F1DE400DC375D /* libcocosbuilder iOS.a */,
15427C27198F1DE400DC375D /* libspine iOS.a */,
15427C29198F1DE400DC375D /* libnetwork iOS.a */,
156B43C919A1F1EF002CBF18 /* libcocos3d iOS.a */,
);
name = Products;
sourceTree = "<group>";
@ -931,6 +997,7 @@
15427C43198F1DE400DC375D /* libluaspine Mac.a */,
15427C45198F1DE400DC375D /* libluanetwork Mac.a */,
15427C47198F1DE400DC375D /* libluacocosdenshion Mac.a */,
156B43CF19A1F1EF002CBF18 /* libluacocos3d Mac.a */,
15427C49198F1DE400DC375D /* libluacocos2d Mac.a */,
15427C4B198F1DE400DC375D /* libluaextension iOS.a */,
15427C4D198F1DE400DC375D /* libluaui iOS.a */,
@ -939,6 +1006,7 @@
15427C53198F1DE400DC375D /* libluaspine iOS.a */,
15427C55198F1DE400DC375D /* libluanetwork iOS.a */,
15427C57198F1DE400DC375D /* libluacocosdenshion iOS.a */,
156B43D119A1F1EF002CBF18 /* libluacocos3d iOS.a */,
15427C59198F1DE400DC375D /* libluacocos2d iOS.a */,
);
name = Products;
@ -1028,6 +1096,8 @@
buildRules = (
);
dependencies = (
156B43D919A1F249002CBF18 /* PBXTargetDependency */,
156B43D719A1F243002CBF18 /* PBXTargetDependency */,
152A3407199C93F4004B68DC /* PBXTargetDependency */,
152A3409199C93F4004B68DC /* PBXTargetDependency */,
152A340B199C93F4004B68DC /* PBXTargetDependency */,
@ -1062,6 +1132,8 @@
buildRules = (
);
dependencies = (
156B43D319A1F1FD002CBF18 /* PBXTargetDependency */,
156B43BD19A1F1EF002CBF18 /* PBXTargetDependency */,
152A33F3199C93CD004B68DC /* PBXTargetDependency */,
152A33F5199C93CD004B68DC /* PBXTargetDependency */,
152A33F7199C93CD004B68DC /* PBXTargetDependency */,
@ -1308,6 +1380,34 @@
remoteRef = 15427C58198F1DE400DC375D /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
156B43C719A1F1EF002CBF18 /* libcocos3d Mac.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = "libcocos3d Mac.a";
remoteRef = 156B43C619A1F1EF002CBF18 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
156B43C919A1F1EF002CBF18 /* libcocos3d iOS.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = "libcocos3d iOS.a";
remoteRef = 156B43C819A1F1EF002CBF18 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
156B43CF19A1F1EF002CBF18 /* libluacocos3d Mac.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = "libluacocos3d Mac.a";
remoteRef = 156B43CE19A1F1EF002CBF18 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
156B43D119A1F1EF002CBF18 /* libluacocos3d iOS.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = "libluacocos3d iOS.a";
remoteRef = 156B43D019A1F1EF002CBF18 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
15A8A4171834BDA200142BE0 /* libcocos2d Mac.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
@ -1701,6 +1801,26 @@
name = "libcocosdenshion Mac";
targetProxy = 15427C76198F1F4D00DC375D /* PBXContainerItemProxy */;
};
156B43BD19A1F1EF002CBF18 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = "libluacocos3d iOS";
targetProxy = 156B43BC19A1F1EF002CBF18 /* PBXContainerItemProxy */;
};
156B43D319A1F1FD002CBF18 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = "libcocos3d iOS";
targetProxy = 156B43D219A1F1FD002CBF18 /* PBXContainerItemProxy */;
};
156B43D719A1F243002CBF18 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = "libluacocos3d Mac";
targetProxy = 156B43D619A1F243002CBF18 /* PBXContainerItemProxy */;
};
156B43D919A1F249002CBF18 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = "libcocos3d Mac";
targetProxy = 156B43D819A1F249002CBF18 /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */
/* Begin XCBuildConfiguration section */

12
templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.sln
View File

@ -44,6 +44,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libluaui", "..\..\cocos2d-x
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbox2d", "..\..\cocos2d-x\external\Box2D\proj.win32\libbox2d.vcxproj", "{929480E7-23C0-4DF6-8456-096D71547116}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos3d", "..\..\cocos2d-x\cocos\3d\proj.win32\libcocos3d.vcxproj", "{E24950FA-5BC1-4AEE-A900-4F0259354BF0}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libluacocos3d", "..\..\cocos2d-x\cocos\scripting\lua-bindings\proj.win32\libluacocos3d.vcxproj", "{06840490-14A4-43D6-88BC-AAFA44D043EB}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@ -126,6 +130,14 @@ Global
{929480E7-23C0-4DF6-8456-096D71547116}.Debug|Win32.Build.0 = Debug|Win32
{929480E7-23C0-4DF6-8456-096D71547116}.Release|Win32.ActiveCfg = Release|Win32
{929480E7-23C0-4DF6-8456-096D71547116}.Release|Win32.Build.0 = Release|Win32
{E24950FA-5BC1-4AEE-A900-4F0259354BF0}.Debug|Win32.ActiveCfg = Debug|Win32
{E24950FA-5BC1-4AEE-A900-4F0259354BF0}.Debug|Win32.Build.0 = Debug|Win32
{E24950FA-5BC1-4AEE-A900-4F0259354BF0}.Release|Win32.ActiveCfg = Release|Win32
{E24950FA-5BC1-4AEE-A900-4F0259354BF0}.Release|Win32.Build.0 = Release|Win32
{06840490-14A4-43D6-88BC-AAFA44D043EB}.Debug|Win32.ActiveCfg = Debug|Win32
{06840490-14A4-43D6-88BC-AAFA44D043EB}.Debug|Win32.Build.0 = Debug|Win32
{06840490-14A4-43D6-88BC-AAFA44D043EB}.Release|Win32.ActiveCfg = Release|Win32
{06840490-14A4-43D6-88BC-AAFA44D043EB}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

3
templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj
View File

@ -190,6 +190,9 @@ xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script\ui" "$(P
<ProjectReference Include="..\..\cocos2d-x\cocos\scripting\lua-bindings\proj.win32\libluacocos2d.vcxproj">
<Project>{9f2d6ce6-c893-4400-b50c-6db70cc2562f}</Project>
</ProjectReference>
<ProjectReference Include="..\..\cocos2d-x\cocos\scripting\lua-bindings\proj.win32\libluacocos3d.vcxproj">
<Project>{06840490-14a4-43d6-88bc-aafa44d043eb}</Project>
</ProjectReference>
<ProjectReference Include="..\..\cocos2d-x\cocos\scripting\lua-bindings\proj.win32\libluacocosbuilder.vcxproj">
<Project>{f8198014-f4f3-49f0-88ab-c1969a5829af}</Project>
</ProjectReference>

2
templates/lua-template-runtime/frameworks/runtime-src/Classes/lua_module_register.h
View File

@ -8,6 +8,7 @@
#include "extension/lua_cocos2dx_extension_manual.h"
#include "ui/lua_cocos2dx_ui_manual.hpp"
#include "spine/lua_cocos2dx_spine_manual.hpp"
#include "3d/lua_cocos2dx_3d_manual.h"
int lua_module_register(lua_State* L)
@ -19,6 +20,7 @@ int lua_module_register(lua_State* L)
register_extension_module(L);
register_ui_moudle(L);
register_spine_module(L);
register_cocos3d_module(L);
return 1;
}

1
templates/lua-template-runtime/frameworks/runtime-src/proj.android/jni/Android.mk
View File

@ -48,6 +48,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES += cocostudio_lua_static
LOCAL_WHOLE_STATIC_LIBRARIES += spine_lua_static
LOCAL_WHOLE_STATIC_LIBRARIES += extension_lua_static
LOCAL_WHOLE_STATIC_LIBRARIES += ui_lua_static
LOCAL_WHOLE_STATIC_LIBRARIES += cocos3d_lua_static
include $(BUILD_SHARED_LIBRARY)

94
templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj
View File

@ -65,6 +65,10 @@
15427CEE198F24AF00DC375D /* libcocos2d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A8A4171834BDA200142BE0 /* libcocos2d Mac.a */; };
15427CEF198F24BD00DC375D /* libcocosdenshion Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A8A41F1834BDA200142BE0 /* libcocosdenshion Mac.a */; };
15427CF0198F24C400DC375D /* libnetwork Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427C98198F220600DC375D /* libnetwork Mac.a */; };
1571D9C219A1F733005A1DC2 /* libcocos3d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1571D9B919A1F714005A1DC2 /* libcocos3d iOS.a */; };
1571D9C319A1F733005A1DC2 /* libluacocos3d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1571D9C119A1F714005A1DC2 /* libluacocos3d iOS.a */; };
1571D9C419A1F74B005A1DC2 /* libcocos3d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1571D9B719A1F714005A1DC2 /* libcocos3d Mac.a */; };
1571D9C519A1F74B005A1DC2 /* libluacocos3d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1571D9BF19A1F714005A1DC2 /* libluacocos3d Mac.a */; };
15A8A4491834C64F00142BE0 /* Icon-114.png in Resources */ = {isa = PBXBuildFile; fileRef = 5023810C17EBBCAC00990C9B /* Icon-114.png */; };
15A8A4881834C90F00142BE0 /* libcurl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A8A4871834C90E00142BE0 /* libcurl.dylib */; };
15AA7D36199B513100725633 /* libluanetwork iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427CCE198F220600DC375D /* libluanetwork iOS.a */; };
@ -609,6 +613,48 @@
remoteGlobalIDString = B2DB498D197686CB00411E16;
remoteInfo = "libnetwork Mac";
};
1571D9AA19A1F714005A1DC2 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 1516228319A0F45E006099B8;
remoteInfo = "libluacocos3d iOS";
};
1571D9AC19A1F714005A1DC2 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 15162030199E7810006099B8;
remoteInfo = "libcocos3d iOS";
};
1571D9B619A1F714005A1DC2 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 1516200B199E7363006099B8;
remoteInfo = "libcocos3d Mac";
};
1571D9B819A1F714005A1DC2 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 15162201199E7810006099B8;
remoteInfo = "libcocos3d iOS";
};
1571D9BE19A1F714005A1DC2 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 1516227C19A0F32D006099B8;
remoteInfo = "libluacocos3d Mac";
};
1571D9C019A1F714005A1DC2 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 151622BB19A0F45E006099B8;
remoteInfo = "libluacocos3d iOS";
};
15A8A4161834BDA200142BE0 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */;
@ -875,6 +921,8 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
1571D9C419A1F74B005A1DC2 /* libcocos3d Mac.a in Frameworks */,
1571D9C519A1F74B005A1DC2 /* libluacocos3d Mac.a in Frameworks */,
152A3486199CE6B4004B68DC /* libcocosbuilder Mac.a in Frameworks */,
152A3487199CE6B4004B68DC /* libcocostudio Mac.a in Frameworks */,
152A3488199CE6B4004B68DC /* libextension Mac.a in Frameworks */,
@ -909,6 +957,8 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
1571D9C219A1F733005A1DC2 /* libcocos3d iOS.a in Frameworks */,
1571D9C319A1F733005A1DC2 /* libluacocos3d iOS.a in Frameworks */,
152A3484199CE64A004B68DC /* libspine iOS.a in Frameworks */,
152A3485199CE64A004B68DC /* libui iOS.a in Frameworks */,
152A3483199CE63A004B68DC /* libextension iOS.a in Frameworks */,
@ -955,6 +1005,7 @@
15A8A41B1834BDA200142BE0 /* libchipmunk Mac.a */,
15A8A41D1834BDA200142BE0 /* libbox2d Mac.a */,
15A8A41F1834BDA200142BE0 /* libcocosdenshion Mac.a */,
1571D9B719A1F714005A1DC2 /* libcocos3d Mac.a */,
15A8A4251834BDA200142BE0 /* libcocos2d iOS.a */,
15A8A4271834BDA200142BE0 /* libextension iOS.a */,
15A8A4291834BDA200142BE0 /* libchipmunk iOS.a */,
@ -965,6 +1016,7 @@
15427C9E198F220600DC375D /* libcocosbuilder iOS.a */,
15427CA0198F220600DC375D /* libspine iOS.a */,
15427CA2198F220600DC375D /* libnetwork iOS.a */,
1571D9B919A1F714005A1DC2 /* libcocos3d iOS.a */,
);
name = Products;
sourceTree = "<group>";
@ -1181,6 +1233,7 @@
15427CBC198F220600DC375D /* libluaspine Mac.a */,
15427CBE198F220600DC375D /* libluanetwork Mac.a */,
15427CC0198F220600DC375D /* libluacocosdenshion Mac.a */,
1571D9BF19A1F714005A1DC2 /* libluacocos3d Mac.a */,
15427CC2198F220600DC375D /* libluacocos2d Mac.a */,
15427CC4198F220600DC375D /* libluaextension iOS.a */,
15427CC6198F220600DC375D /* libluaui iOS.a */,
@ -1189,6 +1242,7 @@
15427CCC198F220600DC375D /* libluaspine iOS.a */,
15427CCE198F220600DC375D /* libluanetwork iOS.a */,
15427CD0198F220600DC375D /* libluacocosdenshion iOS.a */,
1571D9C119A1F714005A1DC2 /* libluacocos3d iOS.a */,
15427CD2198F220600DC375D /* libluacocos2d iOS.a */,
);
name = Products;
@ -1320,6 +1374,8 @@
buildRules = (
);
dependencies = (
1571D9AB19A1F714005A1DC2 /* PBXTargetDependency */,
1571D9AD19A1F714005A1DC2 /* PBXTargetDependency */,
152A349B199CE72E004B68DC /* PBXTargetDependency */,
152A349D199CE72E004B68DC /* PBXTargetDependency */,
152A349F199CE72E004B68DC /* PBXTargetDependency */,
@ -1566,6 +1622,34 @@
remoteRef = 15427CD1198F220600DC375D /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
1571D9B719A1F714005A1DC2 /* libcocos3d Mac.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = "libcocos3d Mac.a";
remoteRef = 1571D9B619A1F714005A1DC2 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
1571D9B919A1F714005A1DC2 /* libcocos3d iOS.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = "libcocos3d iOS.a";
remoteRef = 1571D9B819A1F714005A1DC2 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
1571D9BF19A1F714005A1DC2 /* libluacocos3d Mac.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = "libluacocos3d Mac.a";
remoteRef = 1571D9BE19A1F714005A1DC2 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
1571D9C119A1F714005A1DC2 /* libluacocos3d iOS.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = "libluacocos3d iOS.a";
remoteRef = 1571D9C019A1F714005A1DC2 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
15A8A4171834BDA200142BE0 /* libcocos2d Mac.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
@ -2009,6 +2093,16 @@
name = "libnetwork Mac";
targetProxy = 15427CE6198F23E600DC375D /* PBXContainerItemProxy */;
};
1571D9AB19A1F714005A1DC2 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = "libluacocos3d iOS";
targetProxy = 1571D9AA19A1F714005A1DC2 /* PBXContainerItemProxy */;
};
1571D9AD19A1F714005A1DC2 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = "libcocos3d iOS";
targetProxy = 1571D9AC19A1F714005A1DC2 /* PBXContainerItemProxy */;
};
15D1F3091994BBCA00302043 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = "libcocos2d iOS";

12
templates/lua-template-runtime/frameworks/runtime-src/proj.win32/HelloLua.sln
View File

@ -44,6 +44,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libluaspine", "..\..\cocos2
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libluaui", "..\..\cocos2d-x\cocos\scripting\lua-bindings\proj.win32\libluaui.vcxproj", "{FE78EEBB-3DBB-4713-8CBF-63D742C5BD82}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos3d", "..\..\cocos2d-x\cocos\3d\proj.win32\libcocos3d.vcxproj", "{E24950FA-5BC1-4AEE-A900-4F0259354BF0}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libluacocos3d", "..\..\cocos2d-x\cocos\scripting\lua-bindings\proj.win32\libluacocos3d.vcxproj", "{06840490-14A4-43D6-88BC-AAFA44D043EB}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@ -126,6 +130,14 @@ Global
{FE78EEBB-3DBB-4713-8CBF-63D742C5BD82}.Debug|Win32.Build.0 = Debug|Win32
{FE78EEBB-3DBB-4713-8CBF-63D742C5BD82}.Release|Win32.ActiveCfg = Release|Win32
{FE78EEBB-3DBB-4713-8CBF-63D742C5BD82}.Release|Win32.Build.0 = Release|Win32
{E24950FA-5BC1-4AEE-A900-4F0259354BF0}.Debug|Win32.ActiveCfg = Debug|Win32
{E24950FA-5BC1-4AEE-A900-4F0259354BF0}.Debug|Win32.Build.0 = Debug|Win32
{E24950FA-5BC1-4AEE-A900-4F0259354BF0}.Release|Win32.ActiveCfg = Release|Win32
{E24950FA-5BC1-4AEE-A900-4F0259354BF0}.Release|Win32.Build.0 = Release|Win32
{06840490-14A4-43D6-88BC-AAFA44D043EB}.Debug|Win32.ActiveCfg = Debug|Win32
{06840490-14A4-43D6-88BC-AAFA44D043EB}.Debug|Win32.Build.0 = Debug|Win32
{06840490-14A4-43D6-88BC-AAFA44D043EB}.Release|Win32.ActiveCfg = Release|Win32
{06840490-14A4-43D6-88BC-AAFA44D043EB}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

2
tests/cpp-tests/Android.mk
View File

@ -195,6 +195,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES += cocostudio_static
LOCAL_WHOLE_STATIC_LIBRARIES += cocos_network_static
LOCAL_WHOLE_STATIC_LIBRARIES += cocos_extension_static
LOCAL_WHOLE_STATIC_LIBRARIES += box2d_static
LOCAL_WHOLE_STATIC_LIBRARIES += cocos3d_static
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/Classes
@ -207,3 +208,4 @@ $(call import-module,editor-support/spine)
$(call import-module,editor-support/cocostudio)
$(call import-module,network)
$(call import-module,Box2D)
$(call import-module,3d)

1
tests/cpp-tests/CMakeLists.txt
View File

@ -207,6 +207,7 @@ target_link_libraries(${APP_NAME}
extensions
audio
cocos2d
cocos3d
box2d
ui
network

1
tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.cpp
View File

@ -28,6 +28,7 @@ THE SOFTWARE.
#include "../testResource.h"
#include "3d/CCAttachNode.h"
#include "3d/cocos3d.h"
////////////DrawLine/////////////////////

99
tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
View File

@ -29,6 +29,7 @@
#include "3d/CCSubMesh.h"
#include "3d/CCAttachNode.h"
#include "3d/CCRay.h"
#include "3d/CCSprite3D.h"
#include "DrawNode3D.h"
#include <algorithm>
@ -58,7 +59,7 @@ static std::function<Layer*()> createFunctions[] =
#endif
CL(Animate3DTest),
CL(AttachmentTest),
CL(ChangeClothTest),
CL(Sprite3DReskinTest),
CL(Sprite3DWithOBBPerfromanceTest),
CL(Sprite3DMirrorTest)
};
@ -998,39 +999,26 @@ void AttachmentTest::onTouchesEnded(const std::vector<Touch*>& touches, Event* e
}
_hasWeapon = !_hasWeapon;
}
ChangeClothTest::ChangeClothTest()
: _hasWeapon(false)
, _sprite(nullptr)
Sprite3DReskinTest::Sprite3DReskinTest()
: _sprite(nullptr)
{
_girlPants[0]= "Girl_Xiashen_01";
_girlPants[1]= "Girl_Xiashen_02";
_girlUpBody[0] = "Girl_Shangshen_01";
_girlUpBody[1] = "Girl_Shangshen_02";
_girlShoes[0] = "Girl_Xie_01";
_girlShoes[1] = "Girl_Xie_02";
_girlHair[0]= "Girl_Toufa_01";
_girlHair[1]= "Girl_Toufa_02";
_usePantsId = 0;
_useUpBodyId = 0;
_useShoesId =0;
_useHairId = 0;
auto s = Director::getInstance()->getWinSize();
addNewSpriteWithCoords( Vec2(s.width/2, s.height/2) );
auto listener = EventListenerTouchAllAtOnce::create();
listener->onTouchesEnded = CC_CALLBACK_2(ChangeClothTest::onTouchesEnded, this);
listener->onTouchesEnded = CC_CALLBACK_2(Sprite3DReskinTest::onTouchesEnded, this);
_eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this);
TTFConfig ttfConfig("fonts/arial.ttf", 20);
auto label1 = Label::createWithTTF(ttfConfig,"Hair");
auto item1 = MenuItemLabel::create(label1,CC_CALLBACK_1(ChangeClothTest::menuCallback_changeHair,this) );
auto item1 = MenuItemLabel::create(label1,CC_CALLBACK_1(Sprite3DReskinTest::menuCallback_switchHair,this) );
auto label2 = Label::createWithTTF(ttfConfig,"Glasses");
auto item2 = MenuItemLabel::create(label2, CC_CALLBACK_1(ChangeClothTest::menuCallback_changeGlasses,this) );
auto label3 = Label::createWithTTF(ttfConfig,"UpBody");
auto item3 = MenuItemLabel::create(label3,CC_CALLBACK_1(ChangeClothTest::menuCallback_changeUpBody,this) );
auto item2 = MenuItemLabel::create(label2, CC_CALLBACK_1(Sprite3DReskinTest::menuCallback_switchGlasses,this) );
auto label3 = Label::createWithTTF(ttfConfig,"Coat");
auto item3 = MenuItemLabel::create(label3,CC_CALLBACK_1(Sprite3DReskinTest::menuCallback_switchCoat,this) );
auto label4 = Label::createWithTTF(ttfConfig,"Pants");
auto item4 = MenuItemLabel::create(label4, CC_CALLBACK_1(ChangeClothTest::menuCallback_changeBottomBody,this) );
auto item4 = MenuItemLabel::create(label4, CC_CALLBACK_1(Sprite3DReskinTest::menuCallback_switchPants,this) );
auto label5 = Label::createWithTTF(ttfConfig,"Shoes");
auto item5 = MenuItemLabel::create(label5,CC_CALLBACK_1(ChangeClothTest::menuCallback_changeShoot,this) );
auto item5 = MenuItemLabel::create(label5,CC_CALLBACK_1(Sprite3DReskinTest::menuCallback_switchShoes,this) );
item1->setPosition( Vec2(VisibleRect::left().x+50, VisibleRect::bottom().y+item1->getContentSize().height*4 ) );
item2->setPosition( Vec2(VisibleRect::left().x+50, VisibleRect::bottom().y+item1->getContentSize().height *5 ) );
item3->setPosition( Vec2(VisibleRect::left().x+50, VisibleRect::bottom().y+item1->getContentSize().height*6 ) );
@ -1041,7 +1029,7 @@ ChangeClothTest::ChangeClothTest()
this->addChild(pMenu1, 10);
}
void ChangeClothTest::menuCallback_changeHair(Ref* sender)
void Sprite3DReskinTest::menuCallback_switchHair(Ref* sender)
{
_useHairId++;
if(_useHairId > 1 )
@ -1067,7 +1055,7 @@ void ChangeClothTest::menuCallback_changeHair(Ref* sender)
}
}
}
void ChangeClothTest::menuCallback_changeGlasses(Ref* sender)
void Sprite3DReskinTest::menuCallback_switchGlasses(Ref* sender)
{
SubMeshState* subMesh = _sprite->getSubMeshStateByName("Girl_Yanjing_01");
if(subMesh)
@ -1082,7 +1070,7 @@ void ChangeClothTest::menuCallback_changeGlasses(Ref* sender)
}
}
}
void ChangeClothTest::menuCallback_changeUpBody(Ref* sender)
void Sprite3DReskinTest::menuCallback_switchCoat(Ref* sender)
{
_useUpBodyId++;
if(_useUpBodyId > 1 )
@ -1093,7 +1081,7 @@ void ChangeClothTest::menuCallback_changeUpBody(Ref* sender)
{
for(int i = 0; i < 2; i++ )
{
SubMeshState* subMesh = _sprite->getSubMeshStateByName(_girlUpBody[i]);
SubMeshState* subMesh = _sprite->getSubMeshStateByName(_girlUpperBody[i]);
if(subMesh)
{
if(i == _useUpBodyId )
@ -1108,7 +1096,7 @@ void ChangeClothTest::menuCallback_changeUpBody(Ref* sender)
}
}
}
void ChangeClothTest::menuCallback_changeBottomBody(Ref* sender)
void Sprite3DReskinTest::menuCallback_switchPants(Ref* sender)
{
_usePantsId++;
if(_usePantsId > 1 )
@ -1134,7 +1122,7 @@ void ChangeClothTest::menuCallback_changeBottomBody(Ref* sender)
}
}
}
void ChangeClothTest::menuCallback_changeShoot(Ref* sender)
void Sprite3DReskinTest::menuCallback_switchShoes(Ref* sender)
{
_useShoesId++;
if(_useShoesId > 1 )
@ -1161,37 +1149,50 @@ void ChangeClothTest::menuCallback_changeShoot(Ref* sender)
}
}
std::string ChangeClothTest::title() const
std::string Sprite3DReskinTest::title() const
{
return "Testing Sprite3D ChangeCloth";
return "Testing Sprite3D Reskin";
}
std::string ChangeClothTest::subtitle() const
std::string Sprite3DReskinTest::subtitle() const
{
return "";
}
void ChangeClothTest::addNewSpriteWithCoords(Vec2 p)
void Sprite3DReskinTest::addNewSpriteWithCoords(Vec2 p)
{
_girlPants[0]= "Girl_Xiashen_01";
_girlPants[1]= "Girl_Xiashen_02";
_girlUpperBody[0] = "Girl_Shangshen_01";
_girlUpperBody[1] = "Girl_Shangshen_02";
_girlShoes[0] = "Girl_Xie_01";
_girlShoes[1] = "Girl_Xie_02";
_girlHair[0]= "Girl_Toufa_01";
_girlHair[1]= "Girl_Toufa_02";
_usePantsId = 0;
_useUpBodyId = 0;
_useShoesId =0;
_useHairId = 0;
std::string fileName = "Sprite3DTest/GirlTest.c3b";
auto sprite = Sprite3D::create(fileName);
sprite->setScale(4);
sprite->setRotation3D(Vec3(0,0,0));
SubMeshState* girlPants = sprite->getSubMeshStateByName(_girlPants[1]);
auto girlPants = sprite->getSubMeshStateByName(_girlPants[1]);
if(girlPants)
{
girlPants->setVisible(false);
}
SubMeshState* girlShoes = sprite->getSubMeshStateByName(_girlShoes[1]);
auto girlShoes = sprite->getSubMeshStateByName(_girlShoes[1]);
if(girlShoes)
{
girlShoes->setVisible(false);
}
SubMeshState* girlHair = sprite->getSubMeshStateByName(_girlHair[1]);
auto girlHair = sprite->getSubMeshStateByName(_girlHair[1]);
if(girlHair)
{
girlHair->setVisible(false);
}
SubMeshState* girlUpBody = sprite->getSubMeshStateByName( _girlUpBody[1]);
auto girlUpBody = sprite->getSubMeshStateByName( _girlUpperBody[1]);
if(girlUpBody)
{
girlUpBody->setVisible(false);
@ -1205,33 +1206,11 @@ void ChangeClothTest::addNewSpriteWithCoords(Vec2 p)
sprite->runAction(RepeatForever::create(animate));
}
//test attach
/*auto sp = Sprite3D::create("Sprite3DTest/axe.c3b");
sprite->getAttachNode("Bip001 R Hand")->addChild(sp);
auto animation = Animation3D::create(fileName);
if (animation)
{
auto animate = Animate3D::create(animation);
sprite->runAction(RepeatForever::create(animate));
}*/
_sprite = sprite;
_hasWeapon = true;
}
void ChangeClothTest::onTouchesEnded(const std::vector<Touch*>& touches, Event* event)
void Sprite3DReskinTest::onTouchesEnded(const std::vector<Touch*>& touches, Event* event)
{
/* if (_hasWeapon)
{
_sprite->removeAllAttachNode();
}
else
{
auto sp = Sprite3D::create("Sprite3DTest/axe.c3b");
_sprite->getAttachNode("Bip001 R Hand")->addChild(sp);
}
_hasWeapon = !_hasWeapon;*/
}
Sprite3DWithOBBPerfromanceTest::Sprite3DWithOBBPerfromanceTest()
{

20
tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.h
View File

@ -246,26 +246,24 @@ protected:
cocos2d::Sprite3D* _sprite;
};
class ChangeClothTest : public Sprite3DTestDemo
class Sprite3DReskinTest : public Sprite3DTestDemo
{
public:
CREATE_FUNC(ChangeClothTest);
ChangeClothTest();
CREATE_FUNC(Sprite3DReskinTest);
Sprite3DReskinTest();
virtual std::string title() const override;
virtual std::string subtitle() const override;
void onTouchesEnded(const std::vector<Touch*>& touches, Event* event);
void addNewSpriteWithCoords(Vec2 p);
// void menuCallback_changeCap(Ref* sender);
void menuCallback_changeHair(Ref* sender);
void menuCallback_changeGlasses(Ref* sender);
void menuCallback_changeUpBody(Ref* sender);
void menuCallback_changeBottomBody(Ref* sender);
void menuCallback_changeShoot(Ref* sender);
void menuCallback_switchHair(Ref* sender);
void menuCallback_switchGlasses(Ref* sender);
void menuCallback_switchCoat(Ref* sender);
void menuCallback_switchPants(Ref* sender);
void menuCallback_switchShoes(Ref* sender);
protected:
bool _hasWeapon;
std::string _girlPants[2];
int _usePantsId;
std::string _girlUpBody[2];
std::string _girlUpperBody[2];
int _useUpBodyId;
std::string _girlShoes[2];
int _useShoesId;

4
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocosGUIScene.cpp
View File

@ -183,7 +183,7 @@ g_guisTests[] =
UISceneManager* sceneManager = UISceneManager::sharedUISceneManager();
sceneManager->setCurrentUISceneId(kUIScrollViewTest_Vertical);
sceneManager->setMinUISceneId(kUIScrollViewTest_Vertical);
sceneManager->setMaxUISceneId(kUIScrollViewTest_ScrollToPercentBothDirection_Bounce);
sceneManager->setMaxUISceneId(kUIScrollViewNestTest);
Scene* scene = sceneManager->currentUIScene();
Director::getInstance()->replaceScene(scene);
}
@ -195,7 +195,7 @@ g_guisTests[] =
UISceneManager* sceneManager = UISceneManager::sharedUISceneManager();
sceneManager->setCurrentUISceneId(kUIPageViewTest);
sceneManager->setMinUISceneId(kUIPageViewTest);
sceneManager->setMaxUISceneId(kUIPageViewCustomScrollThreshold);
sceneManager->setMaxUISceneId(kUIPageViewTouchPropagationTest);
Scene* scene = sceneManager->currentUIScene();
Director::getInstance()->replaceScene(scene);
}

199
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.cpp
View File

@ -1,7 +1,7 @@
#include "UIPageViewTest.h"
#include "cocos2d.h"
// UIPageViewTest
UIPageViewTest::UIPageViewTest()
@ -308,3 +308,200 @@ void UIPageViewCustomScrollThreshold::sliderEvent(Ref *pSender, Slider::EventTyp
_displayValueLabel->setString(String::createWithFormat("Scroll Threshold: %f", pageView->getCustomScrollThreshold())->getCString());
}
}
// UIPageViewTouchPropagationTest
UIPageViewTouchPropagationTest::UIPageViewTouchPropagationTest()
: _displayValueLabel(nullptr)
{
}
UIPageViewTouchPropagationTest::~UIPageViewTouchPropagationTest()
{
}
bool UIPageViewTouchPropagationTest::init()
{
if (UIScene::init())
{
Size widgetSize = _widget->getContentSize();
// Add a label in which the dragpanel events will be displayed
_displayValueLabel = Text::create("Move by horizontal direction", "fonts/Marker Felt.ttf", 32);
_displayValueLabel->setAnchorPoint(Vec2(0.5f, -1.0f));
_displayValueLabel->setPosition(Vec2(widgetSize.width / 2.0f,
widgetSize.height / 2.0f +
_displayValueLabel->getContentSize().height * 1.5));
_uiLayer->addChild(_displayValueLabel);
// Add the black background
Text* alert = Text::create("PageView Touch Propagation", "fonts/Marker Felt.ttf", 30);
alert->setColor(Color3B(159, 168, 176));
alert->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.075f));
_uiLayer->addChild(alert);
Layout* root = static_cast<Layout*>(_uiLayer->getChildByTag(81));
Layout* background = dynamic_cast<Layout*>(root->getChildByName("background_Panel"));
// Create the page view
PageView* pageView = PageView::create();
pageView->setContentSize(Size(240.0f, 130.0f));
pageView->setAnchorPoint(Vec2(0.5,0.5));
Size backgroundSize = background->getContentSize();
pageView->setPosition(Vec2(widgetSize.width / 2.0f ,widgetSize.height / 2.0f));
pageView->setBackGroundColor(Color3B::GREEN);
pageView->setBackGroundColorType(Layout::BackGroundColorType::SOLID);
int pageCount = 4;
for (int i = 0; i < pageCount; ++i)
{
HBox* outerBox = HBox::create();
outerBox->setContentSize(Size(240.0f, 130.0f));
for (int k = 0; k < 2; ++k) {
VBox* innerBox = VBox::create();
for (int j = 0; j < 3; j++) {
Button *btn = Button::create("cocosui/animationbuttonnormal.png",
"cocosui/animationbuttonpressed.png");
btn->setName(StringUtils::format("button %d", j));
btn->addTouchEventListener( CC_CALLBACK_2(UIPageViewTouchPropagationTest::onButtonClicked, this));
innerBox->addChild(btn);
}
LinearLayoutParameter *parameter = LinearLayoutParameter::create();
parameter->setMargin(Margin(0,0,100,0));
innerBox->setLayoutParameter(parameter);
outerBox->addChild(innerBox);
}
pageView->insertPage(outerBox,i);
}
pageView->addEventListener(CC_CALLBACK_2(UIPageViewTouchPropagationTest::pageViewEvent, this));
pageView->setName("pageView");
pageView->addTouchEventListener([](Ref* sender, Widget::TouchEventType type){
if (type == Widget::TouchEventType::BEGAN)
{
CCLOG("page view touch began");
}
else if(type == Widget::TouchEventType::MOVED)
{
CCLOG("page view touch moved");
}
else if(type == Widget::TouchEventType::ENDED)
{
CCLOG("page view touch ended");
}
else
{
CCLOG("page view touch cancelled");
}
});
_uiLayer->addChild(pageView);
Text *propagationText = Text::create("Allow Propagation", "Arial", 10);
propagationText->setAnchorPoint(Vec2(0,0.5));
propagationText->setTextColor(Color4B::RED);
propagationText->setPosition(Vec2(0, pageView->getPosition().y + 50));
_uiLayer->addChild(propagationText);
Text *swallowTouchText = Text::create("Swallow Touches", "Arial", 10);
swallowTouchText->setAnchorPoint(Vec2(0,0.5));
swallowTouchText->setTextColor(Color4B::RED);
swallowTouchText->setPosition(Vec2(0, pageView->getPosition().y));
_uiLayer->addChild(swallowTouchText);
// Create the checkbox
CheckBox* checkBox1 = CheckBox::create("cocosui/check_box_normal.png",
"cocosui/check_box_normal_press.png",
"cocosui/check_box_active.png",
"cocosui/check_box_normal_disable.png",
"cocosui/check_box_active_disable.png");
checkBox1->setPosition(propagationText->getPosition() + Vec2(propagationText->getContentSize().width/2, -20));
checkBox1->setName("propagation");
_uiLayer->addChild(checkBox1);
// Create the checkbox
CheckBox* checkBox2 = CheckBox::create("cocosui/check_box_normal.png",
"cocosui/check_box_normal_press.png",
"cocosui/check_box_active.png",
"cocosui/check_box_normal_disable.png",
"cocosui/check_box_active_disable.png");
checkBox2->setPosition(swallowTouchText->getPosition() + Vec2(swallowTouchText->getContentSize().width/2, -20));
checkBox2->setName("swallow");
_uiLayer->addChild(checkBox2);
auto eventListener = EventListenerTouchOneByOne::create();
eventListener->onTouchBegan = [](Touch* touch, Event* event) -> bool{
CCLOG("layout recieves touches");
return true;
};
_eventDispatcher->addEventListenerWithSceneGraphPriority(eventListener, this);
return true;
}
return false;
}
void UIPageViewTouchPropagationTest::onButtonClicked(Ref* pSender, Widget::TouchEventType type)
{
Button *btn = (Button*)pSender;
CheckBox *ck1 = (CheckBox*)_uiLayer->getChildByName("propagation");
CheckBox *ck2 = (CheckBox*)_uiLayer->getChildByName("swallow");
auto pageView = (PageView*)_uiLayer->getChildByName("pageView");
if (type == Widget::TouchEventType::BEGAN)
{
if (ck1->isSelected())
{
btn->setPropagateTouchEvents(true);
pageView->setPropagateTouchEvents(true);
}else
{
btn->setPropagateTouchEvents(false);
pageView->setPropagateTouchEvents(false);
}
if (ck2->isSelected())
{
btn->setSwallowTouches(true);
pageView->setSwallowTouches(true);
}else
{
btn->setSwallowTouches(false);
pageView->setSwallowTouches(false);
}
}
if (type == Widget::TouchEventType::ENDED) {
CCLOG("button clicked");
}
}
void UIPageViewTouchPropagationTest::pageViewEvent(Ref *pSender, PageView::EventType type)
{
switch (type)
{
case PageView::EventType::TURNING:
{
PageView* pageView = dynamic_cast<PageView*>(pSender);
_displayValueLabel->setString(CCString::createWithFormat("page = %ld", pageView->getCurPageIndex() + 1)->getCString());
}
break;
default:
break;
}
}

15
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.h
View File

@ -70,4 +70,19 @@ protected:
Text* _displayValueLabel;
};
class UIPageViewTouchPropagationTest : public UIScene
{
public:
UIPageViewTouchPropagationTest();
~UIPageViewTouchPropagationTest();
bool init();
void pageViewEvent(Ref* pSender, PageView::EventType type);
void onButtonClicked(Ref* pSender, Widget::TouchEventType type);
protected:
UI_SCENE_CREATE_FUNC(UIPageViewTouchPropagationTest)
Text* _displayValueLabel;
};
#endif /* defined(__TestCpp__UIPageViewTest__) */

Some files were not shown because too many files have changed in this diff Show More