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

Merge pull request #19 from fusijie/fix_spritepolygon2 

fix conflicts.
This commit is contained in:
Hao Wu 2015-06-17 13:19:22 +08:00
parent 60cb852788 3c5ab4f518
commit e2178c30a0
57 changed files with 4760 additions and 189 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -37,6 +37,7 @@ ipch/
SubmissionInfo
Generated Files
AppPackages
.vs/
# Ignore files build by ndk and eclipse
libs/

15
build/cocos2d-win10.sln
View File

@ -17,6 +17,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cpp-tests", "..\tests\cpp-t
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbullet", "..\external\bullet\proj.win10\libbullet.vcxproj", "{ECEE1119-CE2E-4F7E-83A8-1932EA48E893}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "librecast", "..\external\recast\proj.win10\librecast.vcxproj", "{F551524D-8A70-4B2F-A7C2-28AE61150022}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|ARM = Debug|ARM
@ -111,6 +113,18 @@ Global
{ECEE1119-CE2E-4F7E-83A8-1932EA48E893}.Release|x64.Build.0 = Release|x64
{ECEE1119-CE2E-4F7E-83A8-1932EA48E893}.Release|x86.ActiveCfg = Release|Win32
{ECEE1119-CE2E-4F7E-83A8-1932EA48E893}.Release|x86.Build.0 = Release|Win32
{F551524D-8A70-4B2F-A7C2-28AE61150022}.Debug|ARM.ActiveCfg = Debug|ARM
{F551524D-8A70-4B2F-A7C2-28AE61150022}.Debug|ARM.Build.0 = Debug|ARM
{F551524D-8A70-4B2F-A7C2-28AE61150022}.Debug|x64.ActiveCfg = Debug|x64
{F551524D-8A70-4B2F-A7C2-28AE61150022}.Debug|x64.Build.0 = Debug|x64
{F551524D-8A70-4B2F-A7C2-28AE61150022}.Debug|x86.ActiveCfg = Debug|Win32
{F551524D-8A70-4B2F-A7C2-28AE61150022}.Debug|x86.Build.0 = Debug|Win32
{F551524D-8A70-4B2F-A7C2-28AE61150022}.Release|ARM.ActiveCfg = Release|ARM
{F551524D-8A70-4B2F-A7C2-28AE61150022}.Release|ARM.Build.0 = Release|ARM
{F551524D-8A70-4B2F-A7C2-28AE61150022}.Release|x64.ActiveCfg = Release|x64
{F551524D-8A70-4B2F-A7C2-28AE61150022}.Release|x64.Build.0 = Release|x64
{F551524D-8A70-4B2F-A7C2-28AE61150022}.Release|x86.ActiveCfg = Release|Win32
{F551524D-8A70-4B2F-A7C2-28AE61150022}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@ -119,5 +133,6 @@ Global
{4B3BA10A-941F-4E08-8A50-8A7FCB822BB8} = {17093B03-00CA-402F-981A-D8C84B2922B5}
{0C32D479-46D5-46C3-9AA9-0A8FF8320516} = {17093B03-00CA-402F-981A-D8C84B2922B5}
{ECEE1119-CE2E-4F7E-83A8-1932EA48E893} = {17093B03-00CA-402F-981A-D8C84B2922B5}
{F551524D-8A70-4B2F-A7C2-28AE61150022} = {17093B03-00CA-402F-981A-D8C84B2922B5}
EndGlobalSection
EndGlobal

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

@ -40,6 +40,7 @@
/* Begin PBXBuildFile section */
1502702D1AD3BDBC0089CD03 /* TerrainTest in Resources */ = {isa = PBXBuildFile; fileRef = B603F1B31AC8FBFB00A9579C /* TerrainTest */; };
1502702E1AD3BDC90089CD03 /* TerrainTest in Resources */ = {isa = PBXBuildFile; fileRef = B603F1B31AC8FBFB00A9579C /* TerrainTest */; };
150983E11B1C514B007F3818 /* NavMesh in Resources */ = {isa = PBXBuildFile; fileRef = B61E90CA1B12B74B00BE69EA /* NavMesh */; };
150F918819DA409E00B89F57 /* lua_test_bindings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 150F918619DA409E00B89F57 /* lua_test_bindings.cpp */; };
150F918919DA409F00B89F57 /* lua_test_bindings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 150F918619DA409E00B89F57 /* lua_test_bindings.cpp */; };
1531B2501AE013DE0075DB94 /* Test.html in Resources */ = {isa = PBXBuildFile; fileRef = 29AFEF6619ACCAA000F6B10A /* Test.html */; };
@ -64,6 +65,7 @@
15B914491B15721400C6B95B /* Shaders3D in Resources */ = {isa = PBXBuildFile; fileRef = B2507B6A192589AF00FA4972 /* Shaders3D */; };
15B9144A1B15A18C00C6B95B /* Materials in Resources */ = {isa = PBXBuildFile; fileRef = 5046AB5A1AF2C4180060550B /* Materials */; };
15B9144B1B15A18C00C6B95B /* Shaders3D in Resources */ = {isa = PBXBuildFile; fileRef = B2507B6A192589AF00FA4972 /* Shaders3D */; };
15BF83C71B1D9E8900D518FA /* NavMesh in Resources */ = {isa = PBXBuildFile; fileRef = B61E90CA1B12B74B00BE69EA /* NavMesh */; };
15C64825165F3934007D4F18 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C64824165F3934007D4F18 /* OpenGL.framework */; };
15C64827165F394E007D4F18 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C64826165F394E007D4F18 /* QuartzCore.framework */; };
15C64829165F396B007D4F18 /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C64828165F396B007D4F18 /* OpenAL.framework */; };
@ -4465,6 +4467,7 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
150983E11B1C514B007F3818 /* NavMesh in Resources */,
15B914491B15721400C6B95B /* Shaders3D in Resources */,
15B914481B156A3700C6B95B /* Materials in Resources */,
1531B2501AE013DE0075DB94 /* Test.html in Resources */,
@ -4514,6 +4517,7 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
15BF83C71B1D9E8900D518FA /* NavMesh in Resources */,
15B9144A1B15A18C00C6B95B /* Materials in Resources */,
15B9144B1B15A18C00C6B95B /* Shaders3D in Resources */,
1531B2511AE013F00075DB94 /* Test.html in Resources */,

2
cocos/2d/CCActionInterval.cpp
View File

@ -1464,7 +1464,7 @@ JumpTo* JumpTo::clone() const
{
// no copy constructor
auto a = new (std::nothrow) JumpTo();
a->initWithDuration(_duration, _delta, _height, _jumps);
a->initWithDuration(_duration, _endPosition, _height, _jumps);
a->autorelease();
return a;
}

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

@ -1257,7 +1257,4 @@
<None Include="$(MSBuildThisFileDirectory)..\..\..\libcocos2d.vcxproj.filters" />
<None Include="$(MSBuildThisFileDirectory)..\..\..\libcocos2d_wp8.vcxproj.filters" />
</ItemGroup>
<ItemGroup>
<Text Include="$(MSBuildThisFileDirectory)..\..\..\..\physics3d\CMakeLists.txt" />
</ItemGroup>
</Project>

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

@ -1782,36 +1782,66 @@
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\renderer\CCVertexAttribBinding.h">
<Filter>renderer</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\base\CCNinePatchImageParser.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\navmesh\CCNavMesh.h">
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\navmesh\CCNavMeshAgent.h">
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\navmesh\CCNavMeshDebugDraw.h">
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\navmesh\CCNavMeshObstacle.h">
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\navmesh\CCNavMeshUtils.h">
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\audio\winrt\AudioCachePlayer.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\audio\winrt\AudioEngine-winrt.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\audio\winrt\AudioSourceReader.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\physics3d\CCPhysics3D.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\physics3d\CCPhysics3DComponent.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\physics3d\CCPhysics3DConstraint.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\physics3d\CCPhysics3DDebugDrawer.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\physics3d\CCPhysics3DObject.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\physics3d\CCPhysics3DShape.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\physics3d\CCPhysics3DWorld.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\physics3d\CCPhysicsSprite3D.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\renderer\CCFrameBuffer.h">
<Filter>renderer</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\audio\winrt\AudioCachePlayer.h">
<Filter>audio</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\audio\winrt\AudioEngine-winrt.h">
<Filter>audio</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\audio\winrt\AudioSourceReader.h">
<Filter>audio</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\physics3d\CCPhysics3D.h">
<Filter>physics3d</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\physics3d\CCPhysics3DComponent.h">
<Filter>physics3d</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\navmesh\CCNavMesh.h">
<Filter>navmesh</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\navmesh\CCNavMeshAgent.h">
<Filter>navmesh</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\navmesh\CCNavMeshDebugDraw.h">
<Filter>navmesh</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\navmesh\CCNavMeshObstacle.h">
<Filter>navmesh</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\navmesh\CCNavMeshUtils.h">
<Filter>navmesh</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\base\CCNinePatchImageParser.h">
<Filter>base</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\physics3d\CCPhysics3DConstraint.h">
<Filter>physics3d</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\physics3d\CCPhysics3DDebugDrawer.h">
<Filter>physics3d</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\physics3d\CCPhysics3DObject.h">
<Filter>physics3d</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\physics3d\CCPhysics3DShape.h">
<Filter>physics3d</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\physics3d\CCPhysics3DWorld.h">
<Filter>physics3d</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\physics3d\CCPhysicsSprite3D.h">
<Filter>physics3d</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\..\external\clipper\clipper.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\CCAutoPolygon.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\cocos2d.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\cocos2d.cpp">
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\3d\CCAABB.cpp">
<Filter>3d</Filter>
</ClCompile>
@ -3411,34 +3441,66 @@
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\renderer\CCVertexAttribBinding.cpp">
<Filter>renderer</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\base\CCNinePatchImageParser.cpp" />
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\navmesh\CCNavMesh.cpp">
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\navmesh\CCNavMeshAgent.cpp">
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\navmesh\CCNavMeshDebugDraw.cpp">
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\navmesh\CCNavMeshObstacle.cpp">
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\navmesh\CCNavMeshUtils.cpp">
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\audio\AudioEngine.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\audio\winrt\AudioCachePlayer.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\audio\winrt\AudioEngine-winrt.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\audio\winrt\AudioSourceReader.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\base\CCUserDefault-winrt.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\physics3d\CCPhysics3D.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\physics3d\CCPhysics3DComponent.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\physics3d\CCPhysics3DConstraint.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\physics3d\CCPhysics3DDebugDrawer.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\physics3d\CCPhysics3DObject.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\physics3d\CCPhysics3DShape.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\physics3d\CCPhysics3DWorld.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\physics3d\CCPhysicsSprite3D.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\renderer\CCFrameBuffer.cpp">
<Filter>renderer</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\audio\winrt\AudioCachePlayer.cpp">
<Filter>audio</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\audio\AudioEngine.cpp">
<Filter>audio</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\audio\winrt\AudioEngine-winrt.cpp">
<Filter>audio</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\audio\winrt\AudioSourceReader.cpp">
<Filter>audio</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\physics3d\CCPhysics3D.cpp">
<Filter>physics3d</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\physics3d\CCPhysics3DComponent.cpp">
<Filter>physics3d</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\physics3d\CCPhysics3DConstraint.cpp">
<Filter>physics3d</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\navmesh\CCNavMesh.cpp">
<Filter>navmesh</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\navmesh\CCNavMeshAgent.cpp">
<Filter>navmesh</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\navmesh\CCNavMeshDebugDraw.cpp">
<Filter>navmesh</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\navmesh\CCNavMeshObstacle.cpp">
<Filter>navmesh</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\navmesh\CCNavMeshUtils.cpp">
<Filter>navmesh</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\base\CCNinePatchImageParser.cpp">
<Filter>base</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\physics3d\CCPhysics3DDebugDrawer.cpp">
<Filter>physics3d</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\physics3d\CCPhysics3DObject.cpp">
<Filter>physics3d</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\physics3d\CCPhysics3DShape.cpp">
<Filter>physics3d</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\physics3d\CCPhysics3DWorld.cpp">
<Filter>physics3d</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\physics3d\CCPhysicsSprite3D.cpp">
<Filter>physics3d</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\base\CCUserDefault-winrt.cpp">
<Filter>base</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\..\external\clipper\clipper.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\CCAutoPolygon.cpp" />
</ItemGroup>
@ -3701,6 +3763,15 @@
<Filter Include="external\clipper">
<UniqueIdentifier>{37ad3bdd-733d-46e4-b28d-b350521e6f54}</UniqueIdentifier>
</Filter>
<Filter Include="audio">
<UniqueIdentifier>{f1c7e21a-6d78-44ba-9480-d7ba197c7b42}</UniqueIdentifier>
</Filter>
<Filter Include="physics3d">
<UniqueIdentifier>{9cd5215e-ca71-4a7c-bc6d-a86d493b0a70}</UniqueIdentifier>
</Filter>
<Filter Include="navmesh">
<UniqueIdentifier>{9a25af30-04d1-41a7-9e55-e34db6b712cd}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<None Include="$(MSBuildThisFileDirectory)..\..\..\cocos2d.def" />
@ -3816,7 +3887,4 @@
<Filter>3d</Filter>
</None>
</ItemGroup>
<ItemGroup>
<Text Include="$(MSBuildThisFileDirectory)..\..\..\..\physics3d\CMakeLists.txt" />
</ItemGroup>
</Project>

28
cocos/2d/libcocos2d_win10/libcocos2d.vcxproj
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|ARM">
@ -541,6 +541,11 @@
<ClCompile Include="..\..\math\Vec2.cpp" />
<ClCompile Include="..\..\math\Vec3.cpp" />
<ClCompile Include="..\..\math\Vec4.cpp" />
<ClCompile Include="..\..\navmesh\CCNavMesh.cpp" />
<ClCompile Include="..\..\navmesh\CCNavMeshAgent.cpp" />
<ClCompile Include="..\..\navmesh\CCNavMeshDebugDraw.cpp" />
<ClCompile Include="..\..\navmesh\CCNavMeshObstacle.cpp" />
<ClCompile Include="..\..\navmesh\CCNavMeshUtils.cpp" />
<ClCompile Include="..\..\network\HttpClient-winrt.cpp" />
<ClCompile Include="..\..\network\HttpConnection-winrt.cpp" />
<ClCompile Include="..\..\network\HttpCookie.cpp" />
@ -1138,6 +1143,11 @@
<ClInclude Include="..\..\math\Vec2.h" />
<ClInclude Include="..\..\math\Vec3.h" />
<ClInclude Include="..\..\math\Vec4.h" />
<ClInclude Include="..\..\navmesh\CCNavMesh.h" />
<ClInclude Include="..\..\navmesh\CCNavMeshAgent.h" />
<ClInclude Include="..\..\navmesh\CCNavMeshDebugDraw.h" />
<ClInclude Include="..\..\navmesh\CCNavMeshObstacle.h" />
<ClInclude Include="..\..\navmesh\CCNavMeshUtils.h" />
<ClInclude Include="..\..\network\HttpClient.h" />
<ClInclude Include="..\..\network\HttpConnection-winrt.h" />
<ClInclude Include="..\..\network\HttpCookie.h" />
@ -1380,9 +1390,18 @@
<Text Include="..\..\renderer\CMakeLists.txt" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\external\Box2D\proj-win10\libbox2d.vcxproj">
<Project>{0c32d479-46d5-46c3-9aa9-0a8ff8320516}</Project>
</ProjectReference>
<ProjectReference Include="..\..\..\external\bullet\proj.win10\libbullet.vcxproj">
<Project>{ecee1119-ce2e-4f7e-83a8-1932ea48e893}</Project>
</ProjectReference>
<ProjectReference Include="..\..\..\external\recast\proj.win10\librecast.vcxproj">
<Project>{f551524d-8a70-4b2f-a7c2-28ae61150022}</Project>
</ProjectReference>
<ProjectReference Include="..\..\editor-support\spine\proj.win10\libSpine.vcxproj">
<Project>{4b3ba10a-941f-4e08-8a50-8a7fcb822bb8}</Project>
</ProjectReference>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{07c2895d-720c-487d-b7b4-12c293ea533f}</ProjectGuid>
@ -1516,6 +1535,7 @@
<SubSystem>Console</SubSystem>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
<IgnoreSpecificDefaultLibraries>MSVCRT;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@ -1553,6 +1573,7 @@
<SubSystem>Console</SubSystem>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
<IgnoreSpecificDefaultLibraries>MSVCRT;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|arm'">
@ -1585,12 +1606,13 @@
<DisableSpecificWarnings>4458;4459;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<AdditionalIncludeDirectories>$(EngineRoot)external\win10-specific\zlib\include;$(EngineRoot)external\freetype2\include\win10\freetype2;$(EngineRoot)external\protobuf-lite\src;$(EngineRoot)external\protobuf-lite\win32;$(EngineRoot)external\win10-specific\OggDecoder\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalOptions>/Zm384 /bigobj %(AdditionalOptions)</AdditionalOptions>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
<IgnoreSpecificDefaultLibraries>MSVCRT;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@ -1615,4 +1637,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>

41
cocos/2d/libcocos2d_win10/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="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Resource Files">
@ -248,6 +248,9 @@
<Filter Include="physics3d">
<UniqueIdentifier>{f68e83b4-2fa3-4f47-9864-e7dfd90c16a6}</UniqueIdentifier>
</Filter>
<Filter Include="navmesh">
<UniqueIdentifier>{cc4f6ca9-4231-479d-8e19-ede4dff3382e}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\cocos2d.cpp" />
@ -1842,9 +1845,6 @@
<ClCompile Include="..\..\renderer\CCVertexAttribBinding.cpp">
<Filter>renderer</Filter>
</ClCompile>
<ClCompile Include="..\renderer\CCFrameBuffer.cpp">
<Filter>renderer</Filter>
</ClCompile>
<ClCompile Include="..\..\base\CCUserDefault-winrt.cpp">
<Filter>base</Filter>
</ClCompile>
@ -1887,6 +1887,22 @@
<ClCompile Include="..\..\physics3d\CCPhysicsSprite3D.cpp">
<Filter>physics3d</Filter>
</ClCompile>
<ClCompile Include="..\..\renderer\CCFrameBuffer.cpp" />
<ClCompile Include="..\..\navmesh\CCNavMesh.cpp">
<Filter>navmesh</Filter>
</ClCompile>
<ClCompile Include="..\..\navmesh\CCNavMeshAgent.cpp">
<Filter>navmesh</Filter>
</ClCompile>
<ClCompile Include="..\..\navmesh\CCNavMeshDebugDraw.cpp">
<Filter>navmesh</Filter>
</ClCompile>
<ClCompile Include="..\..\navmesh\CCNavMeshObstacle.cpp">
<Filter>navmesh</Filter>
</ClCompile>
<ClCompile Include="..\..\navmesh\CCNavMeshUtils.cpp">
<Filter>navmesh</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\cocos2d.h" />
@ -3703,6 +3719,21 @@
<ClInclude Include="..\..\physics3d\CCPhysicsSprite3D.h">
<Filter>physics3d</Filter>
</ClInclude>
<ClInclude Include="..\..\navmesh\CCNavMesh.h">
<Filter>navmesh</Filter>
</ClInclude>
<ClInclude Include="..\..\navmesh\CCNavMeshAgent.h">
<Filter>navmesh</Filter>
</ClInclude>
<ClInclude Include="..\..\navmesh\CCNavMeshDebugDraw.h">
<Filter>navmesh</Filter>
</ClInclude>
<ClInclude Include="..\..\navmesh\CCNavMeshObstacle.h">
<Filter>navmesh</Filter>
</ClInclude>
<ClInclude Include="..\..\navmesh\CCNavMeshUtils.h">
<Filter>navmesh</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\..\base\CCController-iOS.mm">
@ -3865,4 +3896,4 @@
<Filter>renderer</Filter>
</Text>
</ItemGroup>
</Project>
</Project>

2
cocos/editor-support/spine/proj.win10/libSpine.vcxproj
View File

@ -417,6 +417,7 @@
<SDLCheck>false</SDLCheck>
<DisableSpecificWarnings>4458;4456;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<AdditionalIncludeDirectories>$(EngineRoot)external\win10-specific\angle\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
@ -454,6 +455,7 @@
<SDLCheck>false</SDLCheck>
<DisableSpecificWarnings>4458;4456;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<AdditionalIncludeDirectories>$(EngineRoot)external\win10-specific\angle\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>

1
cocos/navmesh/CCNavMesh.cpp
View File

@ -485,7 +485,6 @@ void cocos2d::NavMesh::findPath(const Vec3 &start, const Vec3 &end, std::vector<
{
static const int MAX_POLYS = 256;
static const int MAX_SMOOTH = 2048;
int pathIterNum = 0;
float ext[3];
ext[0] = 2; ext[1] = 4; ext[2] = 2;
dtQueryFilter filter;

2
cocos/navmesh/CCNavMeshUtils.cpp
View File

@ -31,7 +31,7 @@
NS_CC_BEGIN
LinearAllocator::LinearAllocator(const int cap)
: buffer(0)
: buffer(nullptr)
, capacity(0)
, top(0)
, high(0)

4
cocos/renderer/CCGLProgram.cpp
View File

@ -308,7 +308,7 @@ void GLProgram::bindPredefinedVertexAttribs()
void GLProgram::parseVertexAttribs()
{
_vertexAttribs.clear();
//_vertexAttribs.clear();
// Query and store vertex attribute meta-data from the program.
GLint activeAttributes;
@ -346,7 +346,7 @@ void GLProgram::parseVertexAttribs()
void GLProgram::parseUniforms()
{
_userUniforms.clear();
//_userUniforms.clear();
// Query and store uniforms from the program.
GLint activeUniforms;

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

@ -19,11 +19,13 @@ include_directories(
${cocos_root}/cocos/platform
${cocos_root}/cocos/audio/include
${cocos_root}/cocos/physics3d
${cocos_root}/cocos/navmesh
manual
manual/extension
manual/cocostudio
manual/ui
manual/cocos2d
manual/navmesh
auto
)
@ -110,6 +112,8 @@ set(lua_bindings_manual_files
manual/video/lua_cocos2dx_experimental_video_manual.cpp
manual/audioengine/lua_cocos2dx_audioengine_manual.cpp
manual/physics3d/lua_cocos2dx_physics3d_manual.cpp
manual/navmesh/lua_cocos2dx_navmesh_conversions.cpp
manual/navmesh/lua_cocos2dx_navmesh_manual.cpp
)
set(lua_bindings_auto_files
@ -128,6 +132,7 @@ set(lua_bindings_auto_files
auto/lua_cocos2dx_ui_auto.cpp
auto/lua_cocos2dx_audioengine_auto.cpp
auto/lua_cocos2dx_physics3d_auto.cpp
auto/lua_cocos2dx_navmesh_auto.cpp
)
if(MACOSX)

11
cocos/scripting/lua-bindings/auto/api/Bundle3D.lua
View File

@ -63,17 +63,6 @@
-- @param #cc.Bundle3D bundle
-- @return Bundle3D#Bundle3D self (return value: cc.Bundle3D)
--------------------------------
--
-- @function [parent=#Bundle3D] loadObj
-- @param self
-- @param #cc.MeshDatas meshdatas
-- @param #cc.MaterialDatas materialdatas
-- @param #cc.NodeDatas nodedatas
-- @param #string fullPath
-- @param #char mtl_basepath
-- @return bool#bool ret (return value: bool)
--------------------------------
--
-- @function [parent=#Bundle3D] Bundle3D

78
cocos/scripting/lua-bindings/auto/api/NavMesh.lua Normal file
View File

@ -0,0 +1,78 @@
--------------------------------
-- @module NavMesh
-- @extend Ref
-- @parent_module cc
--------------------------------
-- remove a obstacle from navmesh.
-- @function [parent=#NavMesh] removeNavMeshObstacle
-- @param self
-- @param #cc.NavMeshObstacle obstacle
-- @return NavMesh#NavMesh self (return value: cc.NavMesh)
--------------------------------
-- remove a agent from navmesh.
-- @function [parent=#NavMesh] removeNavMeshAgent
-- @param self
-- @param #cc.NavMeshAgent agent
-- @return NavMesh#NavMesh self (return value: cc.NavMesh)
--------------------------------
-- update navmesh.
-- @function [parent=#NavMesh] update
-- @param self
-- @param #float dt
-- @return NavMesh#NavMesh self (return value: cc.NavMesh)
--------------------------------
-- Check enabled debug draw.
-- @function [parent=#NavMesh] isDebugDrawEnabled
-- @param self
-- @return bool#bool ret (return value: bool)
--------------------------------
-- add a agent to navmesh.
-- @function [parent=#NavMesh] addNavMeshAgent
-- @param self
-- @param #cc.NavMeshAgent agent
-- @return NavMesh#NavMesh self (return value: cc.NavMesh)
--------------------------------
-- add a obstacle to navmesh.
-- @function [parent=#NavMesh] addNavMeshObstacle
-- @param self
-- @param #cc.NavMeshObstacle obstacle
-- @return NavMesh#NavMesh self (return value: cc.NavMesh)
--------------------------------
-- Enable debug draw or disable.
-- @function [parent=#NavMesh] setDebugDrawEnable
-- @param self
-- @param #bool enable
-- @return NavMesh#NavMesh self (return value: cc.NavMesh)
--------------------------------
-- Internal method, the updater of debug drawing, need called each frame.
-- @function [parent=#NavMesh] debugDraw
-- @param self
-- @param #cc.Renderer renderer
-- @return NavMesh#NavMesh self (return value: cc.NavMesh)
--------------------------------
-- Create navmesh<br>
-- param navFilePath The NavMesh File path.<br>
-- param geomFilePath The geometry File Path,include offmesh information,etc.
-- @function [parent=#NavMesh] create
-- @param self
-- @param #string navFilePath
-- @param #string geomFilePath
-- @return NavMesh#NavMesh ret (return value: cc.NavMesh)
--------------------------------
--
-- @function [parent=#NavMesh] NavMesh
-- @param self
-- @return NavMesh#NavMesh self (return value: cc.NavMesh)
return nil

225
cocos/scripting/lua-bindings/auto/api/NavMeshAgent.lua Normal file
View File

@ -0,0 +1,225 @@
--------------------------------
-- @module NavMeshAgent
-- @extend Component
-- @parent_module cc
--------------------------------
-- set maximal speed of agent
-- @function [parent=#NavMeshAgent] setMaxSpeed
-- @param self
-- @param #float maxSpeed
-- @return NavMeshAgent#NavMeshAgent self (return value: cc.NavMeshAgent)
--------------------------------
-- synchronize parameter to node.
-- @function [parent=#NavMeshAgent] syncToNode
-- @param self
-- @return NavMeshAgent#NavMeshAgent self (return value: cc.NavMeshAgent)
--------------------------------
-- Traverse OffMeshLink manually
-- @function [parent=#NavMeshAgent] completeOffMeshLink
-- @param self
-- @return NavMeshAgent#NavMeshAgent self (return value: cc.NavMeshAgent)
--------------------------------
-- get separation weight
-- @function [parent=#NavMeshAgent] getSeparationWeight
-- @param self
-- @return float#float ret (return value: float)
--------------------------------
-- Set automatic Traverse OffMeshLink
-- @function [parent=#NavMeshAgent] setAutoTraverseOffMeshLink
-- @param self
-- @param #bool isAuto
-- @return NavMeshAgent#NavMeshAgent self (return value: cc.NavMeshAgent)
--------------------------------
-- get current velocity
-- @function [parent=#NavMeshAgent] getCurrentVelocity
-- @param self
-- @return vec3_table#vec3_table ret (return value: vec3_table)
--------------------------------
-- synchronize parameter to agent.
-- @function [parent=#NavMeshAgent] syncToAgent
-- @param self
-- @return NavMeshAgent#NavMeshAgent self (return value: cc.NavMeshAgent)
--------------------------------
-- Check agent arrived OffMeshLink
-- @function [parent=#NavMeshAgent] isOnOffMeshLink
-- @param self
-- @return bool#bool ret (return value: bool)
--------------------------------
-- set separation weight
-- @function [parent=#NavMeshAgent] setSeparationWeight
-- @param self
-- @param #float weight
-- @return NavMeshAgent#NavMeshAgent self (return value: cc.NavMeshAgent)
--------------------------------
-- puase movement
-- @function [parent=#NavMeshAgent] pause
-- @param self
-- @return NavMeshAgent#NavMeshAgent self (return value: cc.NavMeshAgent)
--------------------------------
--
-- @function [parent=#NavMeshAgent] getUserData
-- @param self
-- @return void#void ret (return value: void)
--------------------------------
-- Set automatic Orientation
-- @function [parent=#NavMeshAgent] setAutoOrientation
-- @param self
-- @param #bool isAuto
-- @return NavMeshAgent#NavMeshAgent self (return value: cc.NavMeshAgent)
--------------------------------
-- get agent height
-- @function [parent=#NavMeshAgent] getHeight
-- @param self
-- @return float#float ret (return value: float)
--------------------------------
-- get maximal speed of agent
-- @function [parent=#NavMeshAgent] getMaxSpeed
-- @param self
-- @return float#float ret (return value: float)
--------------------------------
-- Get current OffMeshLink information
-- @function [parent=#NavMeshAgent] getCurrentOffMeshLinkData
-- @param self
-- @return OffMeshLinkData#OffMeshLinkData ret (return value: cc.OffMeshLinkData)
--------------------------------
-- get agent radius
-- @function [parent=#NavMeshAgent] getRadius
-- @param self
-- @return float#float ret (return value: float)
--------------------------------
-- synchronization between node and agent is time consuming, you can skip some synchronization using this function
-- @function [parent=#NavMeshAgent] setSyncFlag
-- @param self
-- @param #int flag
-- @return NavMeshAgent#NavMeshAgent self (return value: cc.NavMeshAgent)
--------------------------------
--
-- @function [parent=#NavMeshAgent] getSyncFlag
-- @param self
-- @return int#int ret (return value: int)
--------------------------------
-- resume movement
-- @function [parent=#NavMeshAgent] resume
-- @param self
-- @return NavMeshAgent#NavMeshAgent self (return value: cc.NavMeshAgent)
--------------------------------
-- stop movement
-- @function [parent=#NavMeshAgent] stop
-- @param self
-- @return NavMeshAgent#NavMeshAgent self (return value: cc.NavMeshAgent)
--------------------------------
-- set maximal acceleration of agent
-- @function [parent=#NavMeshAgent] setMaxAcceleration
-- @param self
-- @param #float maxAcceleration
-- @return NavMeshAgent#NavMeshAgent self (return value: cc.NavMeshAgent)
--------------------------------
-- Set the reference axes of agent's orientation<br>
-- param rotRefAxes The value of reference axes in local coordinate system.
-- @function [parent=#NavMeshAgent] setOrientationRefAxes
-- @param self
-- @param #vec3_table rotRefAxes
-- @return NavMeshAgent#NavMeshAgent self (return value: cc.NavMeshAgent)
--------------------------------
-- get maximal acceleration of agent
-- @function [parent=#NavMeshAgent] getMaxAcceleration
-- @param self
-- @return float#float ret (return value: float)
--------------------------------
-- set agent height
-- @function [parent=#NavMeshAgent] setHeight
-- @param self
-- @param #float height
-- @return NavMeshAgent#NavMeshAgent self (return value: cc.NavMeshAgent)
--------------------------------
--
-- @function [parent=#NavMeshAgent] setUserData
-- @param self
-- @param #void data
-- @return NavMeshAgent#NavMeshAgent self (return value: cc.NavMeshAgent)
--------------------------------
-- get obstacle avoidance type
-- @function [parent=#NavMeshAgent] getObstacleAvoidanceType
-- @param self
-- @return unsigned char#unsigned char ret (return value: unsigned char)
--------------------------------
-- get current velocity
-- @function [parent=#NavMeshAgent] getVelocity
-- @param self
-- @return vec3_table#vec3_table ret (return value: vec3_table)
--------------------------------
-- set agent radius
-- @function [parent=#NavMeshAgent] setRadius
-- @param self
-- @param #float radius
-- @return NavMeshAgent#NavMeshAgent self (return value: cc.NavMeshAgent)
--------------------------------
-- set obstacle avoidance type
-- @function [parent=#NavMeshAgent] setObstacleAvoidanceType
-- @param self
-- @param #unsigned char type
-- @return NavMeshAgent#NavMeshAgent self (return value: cc.NavMeshAgent)
--------------------------------
--
-- @function [parent=#NavMeshAgent] getNavMeshAgentComponentName
-- @param self
-- @return string#string ret (return value: string)
--------------------------------
-- Create agent<br>
-- param param The parameters of agent.
-- @function [parent=#NavMeshAgent] create
-- @param self
-- @param #cc.NavMeshAgentParam param
-- @return NavMeshAgent#NavMeshAgent ret (return value: cc.NavMeshAgent)
--------------------------------
--
-- @function [parent=#NavMeshAgent] onEnter
-- @param self
-- @return NavMeshAgent#NavMeshAgent self (return value: cc.NavMeshAgent)
--------------------------------
--
-- @function [parent=#NavMeshAgent] onExit
-- @param self
-- @return NavMeshAgent#NavMeshAgent self (return value: cc.NavMeshAgent)
--------------------------------
--
-- @function [parent=#NavMeshAgent] NavMeshAgent
-- @param self
-- @return NavMeshAgent#NavMeshAgent self (return value: cc.NavMeshAgent)
return nil

86
cocos/scripting/lua-bindings/auto/api/NavMeshObstacle.lua Normal file
View File

@ -0,0 +1,86 @@
--------------------------------
-- @module NavMeshObstacle
-- @extend Component
-- @parent_module cc
--------------------------------
--
-- @function [parent=#NavMeshObstacle] getSyncFlag
-- @param self
-- @return int#int ret (return value: int)
--------------------------------
--
-- @function [parent=#NavMeshObstacle] initWith
-- @param self
-- @param #float radius
-- @param #float height
-- @return bool#bool ret (return value: bool)
--------------------------------
-- synchronize parameter to obstacle.
-- @function [parent=#NavMeshObstacle] syncToObstacle
-- @param self
-- @return NavMeshObstacle#NavMeshObstacle self (return value: cc.NavMeshObstacle)
--------------------------------
-- synchronize parameter to node.
-- @function [parent=#NavMeshObstacle] syncToNode
-- @param self
-- @return NavMeshObstacle#NavMeshObstacle self (return value: cc.NavMeshObstacle)
--------------------------------
-- Get height of obstacle
-- @function [parent=#NavMeshObstacle] getHeight
-- @param self
-- @return float#float ret (return value: float)
--------------------------------
-- synchronization between node and obstacle is time consuming, you can skip some synchronization using this function
-- @function [parent=#NavMeshObstacle] setSyncFlag
-- @param self
-- @param #int flag
-- @return NavMeshObstacle#NavMeshObstacle self (return value: cc.NavMeshObstacle)
--------------------------------
-- Get radius of obstacle
-- @function [parent=#NavMeshObstacle] getRadius
-- @param self
-- @return float#float ret (return value: float)
--------------------------------
-- Create obstacle, shape is cylinder<br>
-- param radius The radius of obstacle.<br>
-- param height The height of obstacle.
-- @function [parent=#NavMeshObstacle] create
-- @param self
-- @param #float radius
-- @param #float height
-- @return NavMeshObstacle#NavMeshObstacle ret (return value: cc.NavMeshObstacle)
--------------------------------
--
-- @function [parent=#NavMeshObstacle] getNavMeshObstacleComponentName
-- @param self
-- @return string#string ret (return value: string)
--------------------------------
--
-- @function [parent=#NavMeshObstacle] onEnter
-- @param self
-- @return NavMeshObstacle#NavMeshObstacle self (return value: cc.NavMeshObstacle)
--------------------------------
--
-- @function [parent=#NavMeshObstacle] onExit
-- @param self
-- @return NavMeshObstacle#NavMeshObstacle self (return value: cc.NavMeshObstacle)
--------------------------------
--
-- @function [parent=#NavMeshObstacle] NavMeshObstacle
-- @param self
-- @return NavMeshObstacle#NavMeshObstacle self (return value: cc.NavMeshObstacle)
return nil

19
cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_navmesh_auto_api.lua Normal file
View File

@ -0,0 +1,19 @@
--------------------------------
-- @module cc
--------------------------------------------------------
-- the cc NavMeshAgent
-- @field [parent=#cc] NavMeshAgent#NavMeshAgent NavMeshAgent preloaded module
--------------------------------------------------------
-- the cc NavMeshObstacle
-- @field [parent=#cc] NavMeshObstacle#NavMeshObstacle NavMeshObstacle preloaded module
--------------------------------------------------------
-- the cc NavMesh
-- @field [parent=#cc] NavMesh#NavMesh NavMesh preloaded module
return nil

70
cocos/scripting/lua-bindings/auto/lua_cocos2dx_3d_auto.cpp
View File

@ -6090,75 +6090,6 @@ int lua_cocos2dx_3d_Bundle3D_destroyBundle(lua_State* tolua_S)
#endif
return 0;
}
int lua_cocos2dx_3d_Bundle3D_loadObj(lua_State* tolua_S)
{
int argc = 0;
bool ok = true;
#if COCOS2D_DEBUG >= 1
tolua_Error tolua_err;
#endif
#if COCOS2D_DEBUG >= 1
if (!tolua_isusertable(tolua_S,1,"cc.Bundle3D",0,&tolua_err)) goto tolua_lerror;
#endif
argc = lua_gettop(tolua_S) - 1;
if (argc == 4)
{
cocos2d::MeshDatas arg0;
cocos2d::MaterialDatas arg1;
cocos2d::NodeDatas arg2;
std::string arg3;
#pragma warning NO CONVERSION TO NATIVE FOR MeshDatas
ok = false;
#pragma warning NO CONVERSION TO NATIVE FOR MaterialDatas
ok = false;
#pragma warning NO CONVERSION TO NATIVE FOR NodeDatas
ok = false;
ok &= luaval_to_std_string(tolua_S, 5,&arg3, "cc.Bundle3D:loadObj");
if(!ok)
{
tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_3d_Bundle3D_loadObj'", nullptr);
return 0;
}
bool ret = cocos2d::Bundle3D::loadObj(arg0, arg1, arg2, arg3);
tolua_pushboolean(tolua_S,(bool)ret);
return 1;
}
if (argc == 5)
{
cocos2d::MeshDatas arg0;
cocos2d::MaterialDatas arg1;
cocos2d::NodeDatas arg2;
std::string arg3;
const char* arg4;
#pragma warning NO CONVERSION TO NATIVE FOR MeshDatas
ok = false;
#pragma warning NO CONVERSION TO NATIVE FOR MaterialDatas
ok = false;
#pragma warning NO CONVERSION TO NATIVE FOR NodeDatas
ok = false;
ok &= luaval_to_std_string(tolua_S, 5,&arg3, "cc.Bundle3D:loadObj");
std::string arg4_tmp; ok &= luaval_to_std_string(tolua_S, 6, &arg4_tmp, "cc.Bundle3D:loadObj"); arg4 = arg4_tmp.c_str();
if(!ok)
{
tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_3d_Bundle3D_loadObj'", nullptr);
return 0;
}
bool ret = cocos2d::Bundle3D::loadObj(arg0, arg1, arg2, arg3, arg4);
tolua_pushboolean(tolua_S,(bool)ret);
return 1;
}
luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Bundle3D:loadObj",argc, 4);
return 0;
#if COCOS2D_DEBUG >= 1
tolua_lerror:
tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_3d_Bundle3D_loadObj'.",&tolua_err);
#endif
return 0;
}
int lua_cocos2dx_3d_Bundle3D_constructor(lua_State* tolua_S)
{
int argc = 0;
@ -6215,7 +6146,6 @@ int lua_register_cocos2dx_3d_Bundle3D(lua_State* tolua_S)
tolua_function(tolua_S,"loadAnimationData",lua_cocos2dx_3d_Bundle3D_loadAnimationData);
tolua_function(tolua_S,"createBundle", lua_cocos2dx_3d_Bundle3D_createBundle);
tolua_function(tolua_S,"destroyBundle", lua_cocos2dx_3d_Bundle3D_destroyBundle);
tolua_function(tolua_S,"loadObj", lua_cocos2dx_3d_Bundle3D_loadObj);
tolua_endmodule(tolua_S);
std::string typeName = typeid(cocos2d::Bundle3D).name();
g_luaType[typeName] = "cc.Bundle3D";

1
cocos/scripting/lua-bindings/auto/lua_cocos2dx_3d_auto.hpp
View File

@ -141,7 +141,6 @@ int register_all_cocos2dx_3d(lua_State* tolua_S);
#endif // __cocos2dx_3d_h__

2556
cocos/scripting/lua-bindings/auto/lua_cocos2dx_navmesh_auto.cpp Normal file
View File

File diff suppressed because it is too large Load Diff

72
cocos/scripting/lua-bindings/auto/lua_cocos2dx_navmesh_auto.hpp Normal file
View File

@ -0,0 +1,72 @@
#include "base/ccConfig.h"
#if CC_USE_NAVMESH
#ifndef __cocos2dx_navmesh_h__
#define __cocos2dx_navmesh_h__
#ifdef __cplusplus
extern "C" {
#endif
#include "tolua++.h"
#ifdef __cplusplus
}
#endif
int register_all_cocos2dx_navmesh(lua_State* tolua_S);
#endif // __cocos2dx_navmesh_h__
#endif //#if CC_USE_NAVMESH

159
cocos/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_manual.cpp
View File

@ -2530,6 +2530,159 @@ tolua_lerror:
#endif //CC_USE_PHYSICS
#if CC_USE_NAVMESH
#include "navmesh/CCNavMesh.h"
int lua_cocos2dx_Scene_setNavMeshDebugCamera(lua_State* tolua_S)
{
int argc = 0;
cocos2d::Scene* cobj = nullptr;
bool ok = true;
#if COCOS2D_DEBUG >= 1
tolua_Error tolua_err;
#endif
#if COCOS2D_DEBUG >= 1
if (!tolua_isusertype(tolua_S,1,"cc.Scene",0,&tolua_err)) goto tolua_lerror;
#endif
cobj = (cocos2d::Scene*)tolua_tousertype(tolua_S,1,0);
#if COCOS2D_DEBUG >= 1
if (!cobj)
{
tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Scene_setNavMeshDebugCamera'", nullptr);
return 0;
}
#endif
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
cocos2d::Camera* arg0;
ok &= luaval_to_object<cocos2d::Camera>(tolua_S, 2, "cc.Camera",&arg0, "cc.Scene:setNavMeshDebugCamera");
if(!ok)
{
tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Scene_setNavMeshDebugCamera'", nullptr);
return 0;
}
cobj->setNavMeshDebugCamera(arg0);
lua_settop(tolua_S, 1);
return 1;
}
luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.Scene:setNavMeshDebugCamera",argc, 1);
return 0;
#if COCOS2D_DEBUG >= 1
tolua_lerror:
tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Scene_setNavMeshDebugCamera'.",&tolua_err);
#endif
return 0;
}
int lua_cocos2dx_Scene_setNavMesh(lua_State* tolua_S)
{
int argc = 0;
cocos2d::Scene* cobj = nullptr;
bool ok = true;
#if COCOS2D_DEBUG >= 1
tolua_Error tolua_err;
#endif
#if COCOS2D_DEBUG >= 1
if (!tolua_isusertype(tolua_S,1,"cc.Scene",0,&tolua_err)) goto tolua_lerror;
#endif
cobj = (cocos2d::Scene*)tolua_tousertype(tolua_S,1,0);
#if COCOS2D_DEBUG >= 1
if (!cobj)
{
tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Scene_setNavMesh'", nullptr);
return 0;
}
#endif
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
cocos2d::NavMesh* arg0;
ok &= luaval_to_object<cocos2d::NavMesh>(tolua_S, 2, "cc.NavMesh",&arg0, "cc.Scene:setNavMesh");
if(!ok)
{
tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Scene_setNavMesh'", nullptr);
return 0;
}
cobj->setNavMesh(arg0);
lua_settop(tolua_S, 1);
return 1;
}
luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.Scene:setNavMesh",argc, 1);
return 0;
#if COCOS2D_DEBUG >= 1
tolua_lerror:
tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Scene_setNavMesh'.",&tolua_err);
#endif
return 0;
}
int lua_cocos2dx_Scene_getNavMesh(lua_State* tolua_S)
{
int argc = 0;
cocos2d::Scene* cobj = nullptr;
bool ok = true;
#if COCOS2D_DEBUG >= 1
tolua_Error tolua_err;
#endif
#if COCOS2D_DEBUG >= 1
if (!tolua_isusertype(tolua_S,1,"cc.Scene",0,&tolua_err)) goto tolua_lerror;
#endif
cobj = (cocos2d::Scene*)tolua_tousertype(tolua_S,1,0);
#if COCOS2D_DEBUG >= 1
if (!cobj)
{
tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Scene_getNavMesh'", nullptr);
return 0;
}
#endif
argc = lua_gettop(tolua_S)-1;
if (argc == 0)
{
if(!ok)
{
tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Scene_getNavMesh'", nullptr);
return 0;
}
cocos2d::NavMesh* ret = cobj->getNavMesh();
object_to_luaval<cocos2d::NavMesh>(tolua_S, "cc.NavMesh",(cocos2d::NavMesh*)ret);
return 1;
}
luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.Scene:getNavMesh",argc, 0);
return 0;
#if COCOS2D_DEBUG >= 1
tolua_lerror:
tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Scene_getNavMesh'.",&tolua_err);
#endif
return 0;
}
#endif //#if CC_USE_NAVMESH
static int tolua_cocos2d_Spawn_create(lua_State* tolua_S)
{
if (NULL == tolua_S)
@ -4771,6 +4924,12 @@ static void extendScene(lua_State* tolua_S)
tolua_function(tolua_S, "getPhysics3DWorld", lua_cocos2dx_Scene_getPhysics3DWorld);
tolua_function(tolua_S, "setPhysics3DDebugCamera", lua_cocos2dx_Scene_setPhysics3DDebugCamera);
#endif
#if CC_USE_NAVMESH
tolua_function(tolua_S, "setNavMeshDebugCamera", lua_cocos2dx_Scene_setNavMeshDebugCamera);
tolua_function(tolua_S, "setNavMesh", lua_cocos2dx_Scene_setNavMesh);
tolua_function(tolua_S, "getNavMesh", lua_cocos2dx_Scene_getNavMesh);
#endif
}
lua_pop(tolua_S, 1);
}

216
cocos/scripting/lua-bindings/manual/navmesh/lua_cocos2dx_navmesh_conversions.cpp Normal file
View File

@ -0,0 +1,216 @@
/****************************************************************************
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_navmesh_conversions.h"
#include "base/ccConfig.h"
#if CC_USE_NAVMESH
#include "LuaBasicConversions.h"
#include "navmesh/CCNavMeshAgent.h"
#if COCOS2D_DEBUG >=1
extern void luaval_to_native_err(lua_State* L,const char* msg,tolua_Error* err, const char* funcName);
#endif
bool luaval_to_navmeshagentparam(lua_State* L, int lo, cocos2d::NavMeshAgentParam* outValue , const char* funcName)
{
if (nullptr == L || nullptr == outValue)
return false;
bool ok = true;
tolua_Error tolua_err;
if (!tolua_istable(L, lo, 0, &tolua_err) )
{
#if COCOS2D_DEBUG >=1
luaval_to_native_err(L,"#ferror:",&tolua_err,funcName);
#endif
ok = false;
}
if (ok)
{
lua_pushstring(L, "radius");
lua_gettable(L,lo);
outValue->radius = lua_isnumber(L, -1)? (float)lua_tonumber(L, -1) : 0.6;
lua_pop(L,1);
lua_pushstring(L, "height");
lua_gettable(L,lo);
outValue->height = lua_isnumber(L, -1)?(float)lua_tonumber(L, -1) : 2.0;
lua_pop(L,1);
lua_pushstring(L, "maxAcceleration");
lua_gettable(L, lo);
outValue->maxAcceleration = lua_isnumber(L, -1)?(float)lua_tonumber(L, -1) : 8.0;
lua_pop(L, 1);
lua_pushstring(L, "maxSpeed");
lua_gettable(L, lo);
outValue->maxSpeed = lua_isnumber(L, -1)?(float)lua_tonumber(L, -1) : 3.5;
lua_pop(L, 1);
lua_pushstring(L, "collisionQueryRange");
lua_gettable(L, lo);
outValue->collisionQueryRange = lua_isnumber(L, -1)?(float)lua_tonumber(L, -1) : outValue->radius * 12.0;
lua_pop(L, 1);
lua_pushstring(L, "pathOptimizationRange");
lua_gettable(L, lo);
outValue->pathOptimizationRange = lua_isnumber(L, -1)?(float)lua_tonumber(L, -1) : outValue->radius * 30.0;
lua_pop(L, 1);
lua_pushstring(L, "separationWeight");
lua_gettable(L, lo);
outValue->separationWeight = lua_isnumber(L, -1)?(float)lua_tonumber(L, -1) : 2.0;
lua_pop(L, 1);
lua_pushstring(L, "updateFlags");
lua_gettable(L, lo);
outValue->updateFlags = lua_isnumber(L, -1)?(unsigned char)lua_tonumber(L, -1) : DT_CROWD_ANTICIPATE_TURNS | DT_CROWD_OPTIMIZE_VIS | DT_CROWD_OPTIMIZE_TOPO | DT_CROWD_OBSTACLE_AVOIDANCE;
lua_pop(L, 1);
lua_pushstring(L, "obstacleAvoidanceType");
lua_gettable(L, lo);
outValue->obstacleAvoidanceType = lua_isnumber(L, -1)?(unsigned char)lua_tonumber(L, -1) : 3;
lua_pop(L, 1);
lua_pushstring(L, "queryFilterType");
lua_gettable(L, lo);
outValue->queryFilterType = lua_isnumber(L, -1)?(unsigned char)lua_tonumber(L, -1) : 0;
lua_pop(L, 1);
return true;
}
return false;
}
bool luaval_to_offmeshlinkdata(lua_State* L, int lo, cocos2d::OffMeshLinkData* outValue , const char* funcName)
{
if (nullptr == L || nullptr == outValue)
return false;
bool ok = true;
tolua_Error tolua_err;
if (!tolua_istable(L, lo, 0, &tolua_err) )
{
#if COCOS2D_DEBUG >=1
luaval_to_native_err(L,"#ferror:",&tolua_err,funcName);
#endif
ok = false;
}
if (ok)
{
lua_pushstring(L, "startPosition");
lua_gettable(L,lo);
ok &= luaval_to_vec3(L, lua_gettop(L), &outValue->startPosition);
if(!ok)
{
lua_pop(L, 1);
return false;
}
lua_pop(L,1);
lua_pushstring(L, "endPosition");
ok &= luaval_to_vec3(L, lua_gettop(L), &outValue->endPosition);
if(!ok)
{
lua_pop(L, 1);
return false;
}
lua_pop(L,1);
return true;
}
return false;
}
void navmeshagentparam_to_luaval(lua_State* L,const cocos2d::NavMeshAgentParam& inValue)
{
if (nullptr == L)
return;
lua_newtable(L);
lua_pushstring(L, "radius");
lua_pushnumber(L, (lua_Number)inValue.radius);
lua_rawset(L, -3);
lua_pushstring(L, "height");
lua_pushnumber(L, (lua_Number)inValue.height);
lua_rawset(L, -3);
lua_pushstring(L, "maxAcceleration");
lua_pushnumber(L, (lua_Number)inValue.maxAcceleration);
lua_rawset(L, -3);
lua_pushstring(L, "maxSpeed");
lua_pushnumber(L, (lua_Number)inValue.maxSpeed);
lua_rawset(L, -3);
lua_pushstring(L, "collisionQueryRange");
lua_pushnumber(L, (lua_Number)inValue.collisionQueryRange);
lua_rawset(L, -3);
lua_pushstring(L, "pathOptimizationRange");
lua_pushnumber(L, (lua_Number)inValue.pathOptimizationRange);
lua_rawset(L, -3);
lua_pushstring(L, "separationWeight");
lua_pushnumber(L, (lua_Number)inValue.separationWeight);
lua_rawset(L, -3);
lua_pushstring(L, "updateFlags");
lua_pushnumber(L, (lua_Number)inValue.updateFlags);
lua_rawset(L, -3);
lua_pushstring(L, "obstacleAvoidanceType");
lua_pushnumber(L, (lua_Number)inValue.obstacleAvoidanceType);
lua_rawset(L, -3);
lua_pushstring(L, "queryFilterType");
lua_pushnumber(L, (lua_Number)inValue.queryFilterType);
lua_rawset(L, -3);
}
void offmeshlinkdata_to_luaval(lua_State* L,const cocos2d::OffMeshLinkData& inValue)
{
if (nullptr == L)
return;
lua_newtable(L);
lua_pushstring(L, "startPosition");
vec3_to_luaval(L, inValue.startPosition);
lua_rawset(L, -3);
lua_pushstring(L, "endPosition");
vec3_to_luaval(L, inValue.endPosition);
lua_rawset(L, -3);
}
#endif

50
cocos/scripting/lua-bindings/manual/navmesh/lua_cocos2dx_navmesh_conversions.h Normal file
View File

@ -0,0 +1,50 @@
/****************************************************************************
Copyright (c) 2013-2015 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_BINDING_MANUAL_NAVMESH_LUA_NAVMESH_CONVERSIONS_H__
#define __COCOS_SCRIPTING_LUA_BINDING_MANUAL_NAVMESH_LUA_NAVMESH_CONVERSIONS_H__
#if CC_USE_NAVMESH
extern "C" {
#include "lua.h"
#include "tolua++.h"
}
#include "tolua_fix.h"
namespace cocos2d
{
struct NavMeshAgentParam;
struct OffMeshLinkData;
}
extern bool luaval_to_navmeshagentparam(lua_State* L, int lo, cocos2d::NavMeshAgentParam* outValue , const char* funcName = "");
extern bool luaval_to_offmeshlinkdata(lua_State* L, int lo, cocos2d::OffMeshLinkData* outValue , const char* funcName = "");
extern void navmeshagentparam_to_luaval(lua_State* L,const cocos2d::NavMeshAgentParam& inValue);
extern void offmeshlinkdata_to_luaval(lua_State* L,const cocos2d::OffMeshLinkData& inValue);
#endif // #if CC_USE_NAVMESH
#endif // __COCOS_SCRIPTING_LUA_BINDING_MANUAL_NAVMESH_LUA_NAVMESH_CONVERSIONS_H__

148
cocos/scripting/lua-bindings/manual/navmesh/lua_cocos2dx_navmesh_manual.cpp Normal file
View File

@ -0,0 +1,148 @@
/****************************************************************************
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.
****************************************************************************/
#include "platform/CCPlatformConfig.h"
#include "base/ccConfig.h"
#if CC_USE_NAVMESH
#include "lua_cocos2dx_navmesh_manual.h"
#include "lua_cocos2dx_navmesh_auto.hpp"
#include "tolua_fix.h"
#include "LuaBasicConversions.h"
#include "CCLuaEngine.h"
#include "navmesh/CCNavMesh.h"
int lua_cocos2dx_navmesh_NavMeshAgent_move(lua_State* tolua_S)
{
int argc = 0;
cocos2d::NavMeshAgent* cobj = nullptr;
bool ok = true;
#if COCOS2D_DEBUG >= 1
tolua_Error tolua_err;
#endif
#if COCOS2D_DEBUG >= 1
if (!tolua_isusertype(tolua_S,1,"cc.NavMeshAgent",0,&tolua_err)) goto tolua_lerror;
#endif
cobj = (cocos2d::NavMeshAgent*)tolua_tousertype(tolua_S,1,0);
#if COCOS2D_DEBUG >= 1
if (!cobj)
{
tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_navmesh_NavMeshAgent_move'", nullptr);
return 0;
}
#endif
argc = lua_gettop(tolua_S)-1;
if (argc == 1)
{
cocos2d::Vec3 arg0;
ok &= luaval_to_vec3(tolua_S, 2, &arg0, "cc.NavMeshAgent:move");
if(!ok)
{
tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_navmesh_NavMeshAgent_move'", nullptr);
return 0;
}
cobj->move(arg0);
lua_settop(tolua_S, 1);
return 1;
}
if (argc == 2)
{
cocos2d::Vec3 arg0;
LUA_FUNCTION handler;
ok &= luaval_to_vec3(tolua_S, 2, &arg0, "cc.NavMeshAgent:move");
#if COCOS2D_DEBUG >= 1
if (!toluafix_isfunction(tolua_S,3,"LUA_FUNCTION",0,&tolua_err)) {
goto tolua_lerror;
}
#endif
handler = toluafix_ref_function(tolua_S, 3, 0);
if(!ok)
{
tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_navmesh_NavMeshAgent_move'", nullptr);
return 0;
}
cobj->move(arg0, [=](cocos2d::NavMeshAgent *agent, float totalTimeAfterMove){
object_to_luaval<cocos2d::NavMeshAgent>(tolua_S, "cc.NavMeshAgent",(cocos2d::NavMeshAgent*)agent);
tolua_pushnumber(tolua_S, (lua_Number)totalTimeAfterMove);
LuaEngine::getInstance()->getLuaStack()->executeFunctionByHandler(handler, 2);
});
ScriptHandlerMgr::getInstance()->addCustomHandler((void*)cobj, handler);
lua_settop(tolua_S, 1);
return 1;
}
luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.NavMeshAgent:move",argc, 1);
return 0;
#if COCOS2D_DEBUG >= 1
tolua_lerror:
tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_navmesh_NavMeshAgent_move'.",&tolua_err);
#endif
return 0;
}
static void extendNavMeshAgent(lua_State* L)
{
lua_pushstring(L, "cc.NavMeshAgent");
lua_rawget(L, LUA_REGISTRYINDEX);
if (lua_istable(L,-1))
{
tolua_function(L, "move", lua_cocos2dx_navmesh_NavMeshAgent_move);
}
lua_pop(L, 1);
}
static int register_all_navmesh_manual(lua_State* L)
{
if (nullptr == L)
return 0;
extendNavMeshAgent(L);
return 1;
}
int register_navmesh_module(lua_State* L)
{
lua_getglobal(L, "_G");
if (lua_istable(L,-1))//stack:...,_G,
{
register_all_cocos2dx_navmesh(L);
register_all_navmesh_manual(L);
}
lua_pop(L, 1);
return 1;
}
#endif

57
cocos/scripting/lua-bindings/manual/navmesh/lua_cocos2dx_navmesh_manual.h Normal file
View File

@ -0,0 +1,57 @@
/****************************************************************************
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_SCRIPTING_LUA_BINDINGS_MANUAL_PHYSICS3D_LUA_COCOS2DX_NAVMESH_MANUAL_H__
#define COCOS_SCRIPTING_LUA_BINDINGS_MANUAL_PHYSICS3D_LUA_COCOS2DX_NAVMESH_MANUAL_H__
#if CC_USE_NAVMESH
#ifdef __cplusplus
extern "C" {
#endif
#include "tolua++.h"
#ifdef __cplusplus
}
#endif
/**
* @addtogroup lua
* @{
*/
/**
* Call this function can import the lua bindings for the navmesh module.
* After registering, we could call the related navmesh code conveniently in the lua.
* If you don't want to use the navmesh module in the lua, you only don't call this registering function.
* If you don't register the navmesh module, the package size would become smaller .
* The current mechanism,this function is called in the lua_module_register.h
*/
TOLUA_API int register_navmesh_module(lua_State* L);
// end group
/// @}
#endif // #if CC_USE_NAVMESH
#endif // #ifndef COCOS_SCRIPTING_LUA_BINDINGS_MANUAL_PHYSICS3D_LUA_COCOS2DX_NAVMESH_MANUAL_H__

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

@ -120,6 +120,11 @@ LOCAL_SRC_FILES += ../manual/extension/lua_cocos2dx_extension_manual.cpp \
LOCAL_SRC_FILES += ../manual/physics3d/lua_cocos2dx_physics3d_manual.cpp \
../auto/lua_cocos2dx_physics3d_auto.cpp \
#navmesh
LOCAL_SRC_FILES += ../manual/navmesh/lua_cocos2dx_navmesh_conversions.cpp \
../manual/navmesh/lua_cocos2dx_navmesh_manual.cpp \
../auto/lua_cocos2dx_navmesh_auto.cpp \
LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../../external/lua/tolua \
$(LOCAL_PATH)/../../../../external/lua/luajit/include \
$(LOCAL_PATH)/../../../2d \
@ -131,6 +136,7 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../../external/lua/tolua \
$(LOCAL_PATH)/../../../editor-support/spine \
$(LOCAL_PATH)/../../../ui \
$(LOCAL_PATH)/../../../physics3d \
$(LOCAL_PATH)/../../../navmesh \
$(LOCAL_PATH)/../../../../extensions \
$(LOCAL_PATH)/../auto \
$(LOCAL_PATH)/../manual \
@ -144,6 +150,7 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../../external/lua/tolua \
$(LOCAL_PATH)/../manual/cocosbuilder \
$(LOCAL_PATH)/../manual/spine \
$(LOCAL_PATH)/../manual/ui \
$(LOCAL_PATH)/../manual/navmesh \
$(LOCAL_PATH)/../../../../external/xxtea \
$(LOCAL_PATH)/../../../.. \
$(LOCAL_PATH)/../../../../external/lua
@ -162,6 +169,7 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../../external/lua/tolua \
$(LOCAL_PATH)/../manual/spine \
$(LOCAL_PATH)/../manual/extension \
$(LOCAL_PATH)/../manual/ui \
$(LOCAL_PATH)/../manual/navmesh \
$(LOCAL_PATH)/../../../..
LOCAL_WHOLE_STATIC_LIBRARIES := cocos2d_lua_android_static

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

@ -11,6 +11,18 @@
150906F119D556C8002C4D97 /* lua_cocos2dx_audioengine_auto.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3E2BDB0419C5E5FE0055CDCD /* lua_cocos2dx_audioengine_auto.hpp */; };
150906F219D556CE002C4D97 /* lua_cocos2dx_audioengine_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E2BDB0819C5E6100055CDCD /* lua_cocos2dx_audioengine_manual.cpp */; };
150906F319D556D1002C4D97 /* lua_cocos2dx_audioengine_manual.h in Headers */ = {isa = PBXBuildFile; fileRef = 3E2BDB0919C5E6100055CDCD /* lua_cocos2dx_audioengine_manual.h */; };
150983D01B1C0554007F3818 /* lua_cocos2dx_navmesh_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 150983CE1B1C0554007F3818 /* lua_cocos2dx_navmesh_auto.cpp */; };
150983D11B1C0554007F3818 /* lua_cocos2dx_navmesh_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 150983CE1B1C0554007F3818 /* lua_cocos2dx_navmesh_auto.cpp */; };
150983D21B1C0554007F3818 /* lua_cocos2dx_navmesh_auto.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 150983CF1B1C0554007F3818 /* lua_cocos2dx_navmesh_auto.hpp */; };
150983D31B1C0554007F3818 /* lua_cocos2dx_navmesh_auto.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 150983CF1B1C0554007F3818 /* lua_cocos2dx_navmesh_auto.hpp */; };
150983D71B1C3F3E007F3818 /* lua_cocos2dx_navmesh_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 150983D51B1C3F3E007F3818 /* lua_cocos2dx_navmesh_manual.cpp */; };
150983D81B1C3F3E007F3818 /* lua_cocos2dx_navmesh_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 150983D51B1C3F3E007F3818 /* lua_cocos2dx_navmesh_manual.cpp */; };
150983D91B1C3F3E007F3818 /* lua_cocos2dx_navmesh_manual.h in Headers */ = {isa = PBXBuildFile; fileRef = 150983D61B1C3F3E007F3818 /* lua_cocos2dx_navmesh_manual.h */; };
150983DA1B1C3F3E007F3818 /* lua_cocos2dx_navmesh_manual.h in Headers */ = {isa = PBXBuildFile; fileRef = 150983D61B1C3F3E007F3818 /* lua_cocos2dx_navmesh_manual.h */; };
150983DD1B1C4860007F3818 /* lua_cocos2dx_navmesh_conversions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 150983DB1B1C4860007F3818 /* lua_cocos2dx_navmesh_conversions.cpp */; };
150983DE1B1C4860007F3818 /* lua_cocos2dx_navmesh_conversions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 150983DB1B1C4860007F3818 /* lua_cocos2dx_navmesh_conversions.cpp */; };
150983DF1B1C4860007F3818 /* lua_cocos2dx_navmesh_conversions.h in Headers */ = {isa = PBXBuildFile; fileRef = 150983DC1B1C4860007F3818 /* lua_cocos2dx_navmesh_conversions.h */; };
150983E01B1C4860007F3818 /* lua_cocos2dx_navmesh_conversions.h in Headers */ = {isa = PBXBuildFile; fileRef = 150983DC1B1C4860007F3818 /* lua_cocos2dx_navmesh_conversions.h */; };
15415A7019A71768004F1E71 /* lua_cocos2dx_extension_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE74C18BC45C200215002 /* lua_cocos2dx_extension_auto.cpp */; };
15415A7119A71782004F1E71 /* lua_cocos2dx_extension_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE74C18BC45C200215002 /* lua_cocos2dx_extension_auto.cpp */; };
15415A7219A718FB004F1E71 /* lua_cocos2dx_3d_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1516227F19A0F3E3006099B8 /* lua_cocos2dx_3d_auto.cpp */; };
@ -278,6 +290,12 @@
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
150983CE1B1C0554007F3818 /* lua_cocos2dx_navmesh_auto.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_cocos2dx_navmesh_auto.cpp; sourceTree = "<group>"; };
150983CF1B1C0554007F3818 /* lua_cocos2dx_navmesh_auto.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = lua_cocos2dx_navmesh_auto.hpp; sourceTree = "<group>"; };
150983D51B1C3F3E007F3818 /* lua_cocos2dx_navmesh_manual.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = lua_cocos2dx_navmesh_manual.cpp; path = navmesh/lua_cocos2dx_navmesh_manual.cpp; sourceTree = "<group>"; };
150983D61B1C3F3E007F3818 /* lua_cocos2dx_navmesh_manual.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lua_cocos2dx_navmesh_manual.h; path = navmesh/lua_cocos2dx_navmesh_manual.h; sourceTree = "<group>"; };
150983DB1B1C4860007F3818 /* lua_cocos2dx_navmesh_conversions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = lua_cocos2dx_navmesh_conversions.cpp; path = navmesh/lua_cocos2dx_navmesh_conversions.cpp; sourceTree = "<group>"; };
150983DC1B1C4860007F3818 /* lua_cocos2dx_navmesh_conversions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lua_cocos2dx_navmesh_conversions.h; path = navmesh/lua_cocos2dx_navmesh_conversions.h; sourceTree = "<group>"; };
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>"; };
1540AF55193EC30500717D8E /* xxtea.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = xxtea.cpp; sourceTree = "<group>"; };
@ -448,6 +466,17 @@
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
150983D41B1C3F2D007F3818 /* navmesh */ = {
isa = PBXGroup;
children = (
150983DB1B1C4860007F3818 /* lua_cocos2dx_navmesh_conversions.cpp */,
150983DC1B1C4860007F3818 /* lua_cocos2dx_navmesh_conversions.h */,
150983D51B1C3F3E007F3818 /* lua_cocos2dx_navmesh_manual.cpp */,
150983D61B1C3F3E007F3818 /* lua_cocos2dx_navmesh_manual.h */,
);
name = navmesh;
sourceTree = "<group>";
};
1540AF54193EC30500717D8E /* xxtea */ = {
isa = PBXGroup;
children = (
@ -593,6 +622,8 @@
1AACE74818BC45C200215002 /* auto */ = {
isa = PBXGroup;
children = (
150983CE1B1C0554007F3818 /* lua_cocos2dx_navmesh_auto.cpp */,
150983CF1B1C0554007F3818 /* lua_cocos2dx_navmesh_auto.hpp */,
15A561E31B00A09A005D4720 /* lua_cocos2dx_physics3d_auto.cpp */,
15A561E41B00A09A005D4720 /* lua_cocos2dx_physics3d_auto.hpp */,
15C9A10C1AE4972500C15443 /* lua_cocos2dx_experimental_webview_auto.cpp */,
@ -631,6 +662,7 @@
1AACE75B18BC45C200215002 /* manual */ = {
isa = PBXGroup;
children = (
150983D41B1C3F2D007F3818 /* navmesh */,
15A561E91B00A3D0005D4720 /* physics3d */,
3E2BDB0719C5E6100055CDCD /* audioengine */,
158C128419A0FA1300781A76 /* 3d */,
@ -839,8 +871,10 @@
15C1C2ED19874CBE00A46ACC /* CCLuaObjcBridge.h in Headers */,
15C1C2EE19874CBE00A46ACC /* tolua_fix.h in Headers */,
155C7E2019A71CCC00F08B25 /* LuaSkeletonAnimation.h in Headers */,
150983D91B1C3F3E007F3818 /* lua_cocos2dx_navmesh_manual.h in Headers */,
1595523C1A25E1C5001E9FC9 /* lua_cocos2dx_csloader_auto.hpp in Headers */,
15415AB719A71A53004F1E71 /* io.h in Headers */,
150983DF1B1C4860007F3818 /* lua_cocos2dx_navmesh_conversions.h in Headers */,
566F016119B5EB0F00FCA620 /* CustomGUIReader.h in Headers */,
15C1C2DC19874B4400A46ACC /* xxtea.h in Headers */,
15415AD319A71A53004F1E71 /* timeout.h in Headers */,
@ -852,6 +886,7 @@
15C1C2D8198749BC00A46ACC /* lua_cocos2dx_manual.hpp in Headers */,
155C7E0819A71C7B00F08B25 /* lua_cocos2dx_extension_manual.h in Headers */,
155C7E1819A71CB300F08B25 /* lua_xml_http_request.h in Headers */,
150983D21B1C0554007F3818 /* lua_cocos2dx_navmesh_auto.hpp in Headers */,
155C7DFC19A71C5300F08B25 /* lua_cocos2dx_coco_studio_manual.hpp in Headers */,
15C1C2D9198749BC00A46ACC /* lua_cocos2dx_physics_manual.hpp in Headers */,
15C1C2DA198749BC00A46ACC /* LuaScriptHandlerMgr.h in Headers */,
@ -869,6 +904,7 @@
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
150983E01B1C4860007F3818 /* lua_cocos2dx_navmesh_conversions.h in Headers */,
15EFA64D198B3342000C57D3 /* lauxlib.h in Headers */,
15415AA819A71A53004F1E71 /* auxiliar.h in Headers */,
155C7E1119A71C9F00F08B25 /* lua_extensions.h in Headers */,
@ -904,6 +940,7 @@
155C7E0D19A71C9300F08B25 /* lua_cocos2dx_network_manual.h in Headers */,
15EFA63F198B32BB000C57D3 /* Cocos2dxLuaLoader.h in Headers */,
15EFA640198B32BB000C57D3 /* LuaBasicConversions.h in Headers */,
150983D31B1C0554007F3818 /* lua_cocos2dx_navmesh_auto.hpp in Headers */,
15415AB419A71A53004F1E71 /* inet.h in Headers */,
15EFA641198B32BB000C57D3 /* CCLuaObjcBridge.h in Headers */,
15EFA642198B32BB000C57D3 /* tolua_fix.h in Headers */,
@ -919,6 +956,7 @@
15C9A1131AE4973400C15443 /* lua_cocos2dx_experimental_webview_manual.hpp in Headers */,
15EFA62E198B3220000C57D3 /* lua_cocos2dx_manual.hpp in Headers */,
15C9A10F1AE4972500C15443 /* lua_cocos2dx_experimental_webview_auto.hpp in Headers */,
150983DA1B1C3F3E007F3818 /* lua_cocos2dx_navmesh_manual.h in Headers */,
15EFA62F198B3220000C57D3 /* lua_cocos2dx_physics_manual.hpp in Headers */,
155C7E0919A71C8500F08B25 /* lua_cocos2dx_extension_manual.h in Headers */,
155C7E1919A71CB500F08B25 /* lua_xml_http_request.h in Headers */,
@ -1009,6 +1047,7 @@
15415A7319A718FB004F1E71 /* lua_cocos2dx_cocosbuilder_auto.cpp in Sources */,
150906F219D556CE002C4D97 /* lua_cocos2dx_audioengine_manual.cpp in Sources */,
15415A7519A718FB004F1E71 /* lua_cocos2dx_experimental_video_auto.cpp in Sources */,
150983DD1B1C4860007F3818 /* lua_cocos2dx_navmesh_conversions.cpp in Sources */,
15B5754F1A6F4D1500041C20 /* lua-cocos-studio-conversions.cpp in Sources */,
15415A7619A718FB004F1E71 /* lua_cocos2dx_ui_auto.cpp in Sources */,
15415A7719A718FB004F1E71 /* lua_cocos2dx_spine_auto.cpp in Sources */,
@ -1020,6 +1059,7 @@
15415ACD19A71A53004F1E71 /* tcp.c in Sources */,
15AC69DB1987710400D17520 /* tolua_map.c in Sources */,
15415AD519A71A53004F1E71 /* udp.c in Sources */,
150983D01B1C0554007F3818 /* lua_cocos2dx_navmesh_auto.cpp in Sources */,
15415ADD19A71A53004F1E71 /* usocket.c in Sources */,
15AC69DC1987710400D17520 /* tolua_push.c in Sources */,
15AC69DD1987710400D17520 /* tolua_to.c in Sources */,
@ -1060,6 +1100,7 @@
155C7E2219A71CD300F08B25 /* lua_cocos2dx_experimental_video_manual.cpp in Sources */,
155C7DFA19A71C4C00F08B25 /* lua_cocos2dx_coco_studio_manual.cpp in Sources */,
155C7E2619A71CDD00F08B25 /* lua_cocos2dx_ui_manual.cpp in Sources */,
150983D71B1C3F3E007F3818 /* lua_cocos2dx_navmesh_manual.cpp in Sources */,
15415A7019A71768004F1E71 /* lua_cocos2dx_extension_auto.cpp in Sources */,
155C7DF619A71C3E00F08B25 /* lua_cocos2dx_cocosdenshion_manual.cpp in Sources */,
15415AA519A71A53004F1E71 /* auxiliar.c in Sources */,
@ -1094,12 +1135,14 @@
15415AC219A71A53004F1E71 /* options.c in Sources */,
15EFA645198B32DB000C57D3 /* xxtea.cpp in Sources */,
15EFA632198B328B000C57D3 /* CCLuaBridge.cpp in Sources */,
150983D11B1C0554007F3818 /* lua_cocos2dx_navmesh_auto.cpp in Sources */,
15EFA633198B328B000C57D3 /* CCLuaEngine.cpp in Sources */,
155C7DEE19A71BFC00F08B25 /* lua_cocos2dx_experimental_video_auto.cpp in Sources */,
15EFA634198B328B000C57D3 /* CCLuaStack.cpp in Sources */,
15EFA635198B328B000C57D3 /* CCLuaValue.cpp in Sources */,
15EFA636198B328B000C57D3 /* Cocos2dxLuaLoader.cpp in Sources */,
155C7DEB19A71BE900F08B25 /* lua_cocos2dx_cocosbuilder_auto.cpp in Sources */,
150983DE1B1C4860007F3818 /* lua_cocos2dx_navmesh_conversions.cpp in Sources */,
15EFA637198B328B000C57D3 /* LuaBasicConversions.cpp in Sources */,
15EFA638198B328B000C57D3 /* CCLuaObjcBridge.mm in Sources */,
155C7E1719A71CAF00F08B25 /* lua_xml_http_request.cpp in Sources */,
@ -1137,6 +1180,7 @@
15C9A10E1AE4972500C15443 /* lua_cocos2dx_experimental_webview_auto.cpp in Sources */,
15415AAA19A71A53004F1E71 /* buffer.c in Sources */,
155C7E2319A71CD500F08B25 /* lua_cocos2dx_experimental_video_manual.cpp in Sources */,
150983D81B1C3F3E007F3818 /* lua_cocos2dx_navmesh_manual.cpp in Sources */,
155C7DFB19A71C4E00F08B25 /* lua_cocos2dx_coco_studio_manual.cpp in Sources */,
155C7E2719A71CDE00F08B25 /* lua_cocos2dx_ui_manual.cpp in Sources */,
15415AB619A71A53004F1E71 /* io.c in Sources */,
@ -1192,7 +1236,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
SKIP_INSTALL = YES;
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../../.. $(SRCROOT)/../../.. $(SRCROOT)/../../../base $(SRCROOT)/../../../3d $(SRCROOT)/../../../2d $(SRCROOT)/../../../deprecated $(SRCROOT)/../../../physics $(SRCROOT)/../../../math/kazmath $(SRCROOT)/../../../2d/platform $(SRCROOT)/../../../audio/include $(SRCROOT)/../../../editor-support $(SRCROOT)/../../../editor-support/spine $(SRCROOT)/../../../editor-support/cocostudio $(SRCROOT)/../../../editor-support/cocosbuilder $(SRCROOT)/../../../ui $(SRCROOT)/../../../storage $(SRCROOT)/../../../../extensions $(SRCROOT)/../../../../external $(SRCROOT)/../../../../external/chipmunk/include/chipmunk $(SRCROOT)/../../../../external/lua $(SRCROOT)/../../../../external/lua/luajit/include $(SRCROOT)/../../../../external/lua/tolua $(SRCROOT)/../../../editor-support/cocostudio/ActionTimeline $(SRCROOT)/../../../physics3d";
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../../.. $(SRCROOT)/../../.. $(SRCROOT)/../../../base $(SRCROOT)/../../../3d $(SRCROOT)/../../../2d $(SRCROOT)/../../../deprecated $(SRCROOT)/../../../physics $(SRCROOT)/../../../math/kazmath $(SRCROOT)/../../../2d/platform $(SRCROOT)/../../../audio/include $(SRCROOT)/../../../editor-support $(SRCROOT)/../../../editor-support/spine $(SRCROOT)/../../../editor-support/cocostudio $(SRCROOT)/../../../editor-support/cocosbuilder $(SRCROOT)/../../../ui $(SRCROOT)/../../../storage $(SRCROOT)/../../../../extensions $(SRCROOT)/../../../../external $(SRCROOT)/../../../../external/chipmunk/include/chipmunk $(SRCROOT)/../../../../external/lua $(SRCROOT)/../../../../external/lua/luajit/include $(SRCROOT)/../../../../external/lua/tolua $(SRCROOT)/../../../editor-support/cocostudio/ActionTimeline $(SRCROOT)/../../../physics3d $(SRCROOT)/../../../navmesh";
};
name = Debug;
};
@ -1226,7 +1270,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
SKIP_INSTALL = YES;
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../../.. $(SRCROOT)/../../.. $(SRCROOT)/../../../base $(SRCROOT)/../../../3d $(SRCROOT)/../../../2d $(SRCROOT)/../../../deprecated $(SRCROOT)/../../../physics $(SRCROOT)/../../../math/kazmath $(SRCROOT)/../../../2d/platform $(SRCROOT)/../../../audio/include $(SRCROOT)/../../../editor-support $(SRCROOT)/../../../editor-support/spine $(SRCROOT)/../../../editor-support/cocostudio $(SRCROOT)/../../../editor-support/cocosbuilder $(SRCROOT)/../../../ui $(SRCROOT)/../../../storage $(SRCROOT)/../../../../extensions $(SRCROOT)/../../../../external $(SRCROOT)/../../../../external/chipmunk/include/chipmunk $(SRCROOT)/../../../../external/lua $(SRCROOT)/../../../../external/lua/luajit/include $(SRCROOT)/../../../../external/lua/tolua $(SRCROOT)/../../../editor-support/cocostudio/ActionTimeline $(SRCROOT)/../../../physics3d";
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../../.. $(SRCROOT)/../../.. $(SRCROOT)/../../../base $(SRCROOT)/../../../3d $(SRCROOT)/../../../2d $(SRCROOT)/../../../deprecated $(SRCROOT)/../../../physics $(SRCROOT)/../../../math/kazmath $(SRCROOT)/../../../2d/platform $(SRCROOT)/../../../audio/include $(SRCROOT)/../../../editor-support $(SRCROOT)/../../../editor-support/spine $(SRCROOT)/../../../editor-support/cocostudio $(SRCROOT)/../../../editor-support/cocosbuilder $(SRCROOT)/../../../ui $(SRCROOT)/../../../storage $(SRCROOT)/../../../../extensions $(SRCROOT)/../../../../external $(SRCROOT)/../../../../external/chipmunk/include/chipmunk $(SRCROOT)/../../../../external/lua $(SRCROOT)/../../../../external/lua/luajit/include $(SRCROOT)/../../../../external/lua/tolua $(SRCROOT)/../../../editor-support/cocostudio/ActionTimeline $(SRCROOT)/../../../physics3d $(SRCROOT)/../../../navmesh";
VALIDATE_PRODUCT = YES;
};
name = Release;

10
cocos/scripting/lua-bindings/proj.win32/libluacocos2d.vcxproj
View File

@ -41,6 +41,7 @@
<ClCompile Include="..\auto\lua_cocos2dx_experimental_video_auto.cpp" />
<ClCompile Include="..\auto\lua_cocos2dx_experimental_webview_auto.cpp" />
<ClCompile Include="..\auto\lua_cocos2dx_extension_auto.cpp" />
<ClCompile Include="..\auto\lua_cocos2dx_navmesh_auto.cpp" />
<ClCompile Include="..\auto\lua_cocos2dx_physics3d_auto.cpp" />
<ClCompile Include="..\auto\lua_cocos2dx_physics_auto.cpp" />
<ClCompile Include="..\auto\lua_cocos2dx_spine_auto.cpp" />
@ -68,6 +69,8 @@
<ClCompile Include="..\manual\cocostudio\lua_cocos2dx_csloader_manual.cpp" />
<ClCompile Include="..\manual\extension\lua_cocos2dx_extension_manual.cpp" />
<ClCompile Include="..\manual\LuaBasicConversions.cpp" />
<ClCompile Include="..\manual\navmesh\lua_cocos2dx_navmesh_conversions.cpp" />
<ClCompile Include="..\manual\navmesh\lua_cocos2dx_navmesh_manual.cpp" />
<ClCompile Include="..\manual\network\lua_cocos2dx_network_manual.cpp" />
<ClCompile Include="..\manual\network\lua_extensions.c" />
<ClCompile Include="..\manual\network\Lua_web_socket.cpp" />
@ -113,6 +116,7 @@
<ClInclude Include="..\auto\lua_cocos2dx_experimental_video_auto.hpp" />
<ClInclude Include="..\auto\lua_cocos2dx_experimental_webview_auto.hpp" />
<ClInclude Include="..\auto\lua_cocos2dx_extension_auto.hpp" />
<ClInclude Include="..\auto\lua_cocos2dx_navmesh_auto.hpp" />
<ClInclude Include="..\auto\lua_cocos2dx_physics3d_auto.hpp" />
<ClInclude Include="..\auto\lua_cocos2dx_physics_auto.hpp" />
<ClInclude Include="..\auto\lua_cocos2dx_spine_auto.hpp" />
@ -140,6 +144,8 @@
<ClInclude Include="..\manual\cocostudio\lua_cocos2dx_csloader_manual.hpp" />
<ClInclude Include="..\manual\extension\lua_cocos2dx_extension_manual.h" />
<ClInclude Include="..\manual\LuaBasicConversions.h" />
<ClInclude Include="..\manual\navmesh\lua_cocos2dx_navmesh_conversions.h" />
<ClInclude Include="..\manual\navmesh\lua_cocos2dx_navmesh_manual.h" />
<ClInclude Include="..\manual\network\lua_cocos2dx_network_manual.h" />
<ClInclude Include="..\manual\network\lua_extensions.h" />
<ClInclude Include="..\manual\network\Lua_web_socket.h" />
@ -273,7 +279,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(EngineRoot);$(EngineRoot)cocos\2d;$(EngineRoot)cocos\base;$(EngineRoot)cocos\3d;$(EngineRoot)cocos\physics3d;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\ui;$(EngineRoot)external;$(EngineRoot)external\lua;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\lua\luajit\include;$(EngineRoot)external\libwebsockets\win32\include;$(EngineRoot)extensions;$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\editor-support\cocostudio;$(EngineRoot)cocos\editor-support\cocostudio\ActionTimeline;$(EngineRoot)cocos\editor-support\spine;$(EngineRoot)cocos\editor-support\cocosbuilder;$(EngineRoot)cocos\scripting\lua-bindings\manual;$(EngineRoot)cocos\scripting\lua-bindings\auto;$(EngineRoot)cocos\scripting\lua-bindings\manual\extension;$(EngineRoot)cocos\scripting\lua-bindings\manual\cocostudio;$(EngineRoot)cocos\scripting\lua-bindings\manual\ui;$(EngineRoot)cocos\scripting\lua-bindings\manual\cocos2d;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(EngineRoot);$(EngineRoot)cocos\2d;$(EngineRoot)cocos\base;$(EngineRoot)cocos\3d;$(EngineRoot)cocos\physics3d;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\ui;$(EngineRoot)cocos\navmesh;$(EngineRoot)external;$(EngineRoot)external\lua;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\lua\luajit\include;$(EngineRoot)external\libwebsockets\win32\include;$(EngineRoot)extensions;$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\editor-support\cocostudio;$(EngineRoot)cocos\editor-support\cocostudio\ActionTimeline;$(EngineRoot)cocos\editor-support\spine;$(EngineRoot)cocos\editor-support\cocosbuilder;$(EngineRoot)cocos\scripting\lua-bindings\manual;$(EngineRoot)cocos\scripting\lua-bindings\auto;$(EngineRoot)cocos\scripting\lua-bindings\manual\extension;$(EngineRoot)cocos\scripting\lua-bindings\manual\cocostudio;$(EngineRoot)cocos\scripting\lua-bindings\manual\ui;$(EngineRoot)cocos\scripting\lua-bindings\manual\cocos2d;$(EngineRoot)cocos\scripting\lua-bindings\manual\navmesh;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;CC_ENABLE_BULLET_INTEGRATION=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@ -305,7 +311,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\lua\luajit\prebuilt\win32\*.*" "$
<ClCompile>
<Optimization>MinSpace</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>$(EngineRoot);$(EngineRoot)cocos\base;$(EngineRoot)cocos;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\lua\luajit\include;$(EngineRoot)external\lua;$(EngineRoot)cocos\scripting\lua-bindings\auto;$(EngineRoot)cocos\scripting\lua-bindings\manual;$(EngineRoot)cocos\2d;$(EngineRoot)cocos\3d;$(EngineRoot)cocos\scripting\lua-bindings\manual\extension;$(EngineRoot)cocos\scripting\lua-bindings\manual\cocostudio;$(EngineRoot)cocos\scripting\lua-bindings\manual\ui;$(EngineRoot)cocos\scripting\lua-bindings\manual\cocos2d;$(EngineRoot)extensions;$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\editor-support\cocostudio;$(EngineRoot)cocos\editor-support\cocostudio\ActionTimeline;$(EngineRoot)cocos\editor-support\spine;$(EngineRoot)cocos\editor-support\cocosbuilder;$(EngineRoot)cocos\audio\include;$(EngineRoot)external\libwebsockets\win32\include;$(EngineRoot)cocos\ui;$(EngineRoot)cocos\physics3d;$(EngineRoot)external;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(EngineRoot);$(EngineRoot)cocos\base;$(EngineRoot)cocos;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\lua\luajit\include;$(EngineRoot)external\lua;$(EngineRoot)cocos\scripting\lua-bindings\auto;$(EngineRoot)cocos\scripting\lua-bindings\manual;$(EngineRoot)cocos\2d;$(EngineRoot)cocos\3d;$(EngineRoot)cocos\scripting\lua-bindings\manual\extension;$(EngineRoot)cocos\scripting\lua-bindings\manual\cocostudio;$(EngineRoot)cocos\scripting\lua-bindings\manual\ui;$(EngineRoot)cocos\scripting\lua-bindings\manual\cocos2d;$(EngineRoot)cocos\scripting\lua-bindings\manual\navmesh;$(EngineRoot)extensions;$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\editor-support\cocostudio;$(EngineRoot)cocos\editor-support\cocostudio\ActionTimeline;$(EngineRoot)cocos\editor-support\spine;$(EngineRoot)cocos\editor-support\cocosbuilder;$(EngineRoot)cocos\audio\include;$(EngineRoot)external\libwebsockets\win32\include;$(EngineRoot)cocos\ui;$(EngineRoot)cocos\physics3d;$(EngineRoot)cocos\navmesh;$(EngineRoot)external;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;LIBLUA_EXPORTS;_CRT_SECURE_NO_WARNINGS;CC_ENABLE_BULLET_INTEGRATION=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>

21
cocos/scripting/lua-bindings/proj.win32/libluacocos2d.vcxproj.filters
View File

@ -76,6 +76,9 @@
<Filter Include="manual\physics3d">
<UniqueIdentifier>{3934b26e-18b0-465a-a89e-69a3417d107e}</UniqueIdentifier>
</Filter>
<Filter Include="manual\navmesh">
<UniqueIdentifier>{fa8be49e-8b79-4dc5-8f28-febde1347eda}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\auto\lua_cocos2dx_auto.cpp">
@ -282,6 +285,15 @@
<ClCompile Include="..\manual\physics3d\lua_cocos2dx_physics3d_manual.cpp">
<Filter>manual\physics3d</Filter>
</ClCompile>
<ClCompile Include="..\auto\lua_cocos2dx_navmesh_auto.cpp">
<Filter>auto</Filter>
</ClCompile>
<ClCompile Include="..\manual\navmesh\lua_cocos2dx_navmesh_conversions.cpp">
<Filter>manual\navmesh</Filter>
</ClCompile>
<ClCompile Include="..\manual\navmesh\lua_cocos2dx_navmesh_manual.cpp">
<Filter>manual\navmesh</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\auto\lua_cocos2dx_auto.hpp">
@ -494,6 +506,15 @@
<ClInclude Include="..\manual\physics3d\lua_cocos2dx_physics3d_manual.h">
<Filter>manual\physics3d</Filter>
</ClInclude>
<ClInclude Include="..\auto\lua_cocos2dx_navmesh_auto.hpp">
<Filter>auto</Filter>
</ClInclude>
<ClInclude Include="..\manual\navmesh\lua_cocos2dx_navmesh_conversions.h">
<Filter>manual\navmesh</Filter>
</ClInclude>
<ClInclude Include="..\manual\navmesh\lua_cocos2dx_navmesh_manual.h">
<Filter>manual\navmesh</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\script\CCBReaderLoad.lua">

4
external/config.json vendored
View File

@ -1,6 +1,6 @@
{
"version":"v3-deps-65",
"zip_file_size":"131249725",
"version":"v3-deps-66",
"zip_file_size":"131253061",
"repo_name":"cocos2d-x-3rd-party-libs-bin",
"repo_parent":"https://github.com/cocos2d/",
"move_dirs":{

7
templates/cocos2dx_files.json
View File

@ -3012,6 +3012,8 @@
"external/recast/Recast/RecastRegion.cpp",
"external/recast/fastlz/fastlz.c",
"external/recast/fastlz/fastlz.h",
"external/recast/proj.win10/librecast.vcxproj",
"external/recast/proj.win10/librecast.vcxproj.filters",
"external/recast/proj.win32/librecast.vcxproj",
"external/recast/proj.win32/librecast.vcxproj.filters",
"external/recast/proj.win8.1-universal/librecast.Shared/librecast.Shared.vcxitems",
@ -7334,6 +7336,10 @@
"cocos/scripting/lua-bindings/manual/controller/lua_cocos2dx_controller_manual.hpp",
"cocos/scripting/lua-bindings/manual/extension/lua_cocos2dx_extension_manual.cpp",
"cocos/scripting/lua-bindings/manual/extension/lua_cocos2dx_extension_manual.h",
"cocos/scripting/lua-bindings/manual/navmesh/lua_cocos2dx_navmesh_conversions.cpp",
"cocos/scripting/lua-bindings/manual/navmesh/lua_cocos2dx_navmesh_conversions.h",
"cocos/scripting/lua-bindings/manual/navmesh/lua_cocos2dx_navmesh_manual.cpp",
"cocos/scripting/lua-bindings/manual/navmesh/lua_cocos2dx_navmesh_manual.h",
"cocos/scripting/lua-bindings/manual/network/Lua_web_socket.cpp",
"cocos/scripting/lua-bindings/manual/network/Lua_web_socket.h",
"cocos/scripting/lua-bindings/manual/network/lua_cocos2dx_network_manual.cpp",
@ -7635,6 +7641,7 @@
"tools/tolua/cocos2dx_experimental_video.ini",
"tools/tolua/cocos2dx_experimental_webview.ini",
"tools/tolua/cocos2dx_extension.ini",
"tools/tolua/cocos2dx_navmesh.ini",
"tools/tolua/cocos2dx_physics.ini",
"tools/tolua/cocos2dx_physics3d.ini",
"tools/tolua/cocos2dx_spine.ini",

12
templates/cpp-template-default/proj.win10/App/HelloCpp.vcxproj
View File

@ -151,6 +151,9 @@
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
<IgnoreSpecificDefaultLibraries>MSVCRT;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
<ClCompile>
@ -171,6 +174,9 @@
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
<IgnoreSpecificDefaultLibraries>MSVCRT;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
@ -191,6 +197,9 @@
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
<IgnoreSpecificDefaultLibraries>MSVCRT;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
@ -269,6 +278,9 @@
<ProjectReference Include="..\..\cocos2d\external\bullet\proj.win10\libbullet.vcxproj">
<Project>{ecee1119-ce2e-4f7e-83a8-1932ea48e893}</Project>
</ProjectReference>
<ProjectReference Include="..\..\cocos2d\external\recast\proj.win10\librecast.vcxproj">
<Project>{f551524d-8a70-4b2f-a7c2-28ae61150022}</Project>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<SDKReference Include="WindowsMobile, Version=10.0.0.1" />

3
templates/cpp-template-default/proj.win10/App/HelloCpp.vcxproj.filters
View File

@ -79,6 +79,9 @@
<None Include="$(ZLibBinPath)zlib.dll" />
<None Include="$(WebsocketsBinPath)libwebsockets.dll" />
<None Include="$(SQLiteBinPath)sqlite3.dll" />
<None Include="$(OggBinPath)libogg.dll" />
<None Include="$(OggBinPath)libvorbis.dll" />
<None Include="$(OggBinPath)libvorbisfile.dll" />
</ItemGroup>
<ItemGroup>
<Page Include="Cocos2dEngine\OpenGLESPage.xaml">

15
templates/cpp-template-default/proj.win10/HelloCpp.sln
View File

@ -15,6 +15,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloCpp", "App\HelloCpp.vc
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbullet", "..\cocos2d\external\bullet\proj.win10\libbullet.vcxproj", "{ECEE1119-CE2E-4F7E-83A8-1932EA48E893}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "librecast", "..\cocos2d\external\recast\proj.win10\librecast.vcxproj", "{F551524D-8A70-4B2F-A7C2-28AE61150022}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|ARM = Debug|ARM
@ -91,6 +93,18 @@ Global
{ECEE1119-CE2E-4F7E-83A8-1932EA48E893}.Release|x64.Build.0 = Release|x64
{ECEE1119-CE2E-4F7E-83A8-1932EA48E893}.Release|x86.ActiveCfg = Release|Win32
{ECEE1119-CE2E-4F7E-83A8-1932EA48E893}.Release|x86.Build.0 = Release|Win32
{F551524D-8A70-4B2F-A7C2-28AE61150022}.Debug|ARM.ActiveCfg = Debug|ARM
{F551524D-8A70-4B2F-A7C2-28AE61150022}.Debug|ARM.Build.0 = Debug|ARM
{F551524D-8A70-4B2F-A7C2-28AE61150022}.Debug|x64.ActiveCfg = Debug|x64
{F551524D-8A70-4B2F-A7C2-28AE61150022}.Debug|x64.Build.0 = Debug|x64
{F551524D-8A70-4B2F-A7C2-28AE61150022}.Debug|x86.ActiveCfg = Debug|Win32
{F551524D-8A70-4B2F-A7C2-28AE61150022}.Debug|x86.Build.0 = Debug|Win32
{F551524D-8A70-4B2F-A7C2-28AE61150022}.Release|ARM.ActiveCfg = Release|ARM
{F551524D-8A70-4B2F-A7C2-28AE61150022}.Release|ARM.Build.0 = Release|ARM
{F551524D-8A70-4B2F-A7C2-28AE61150022}.Release|x64.ActiveCfg = Release|x64
{F551524D-8A70-4B2F-A7C2-28AE61150022}.Release|x64.Build.0 = Release|x64
{F551524D-8A70-4B2F-A7C2-28AE61150022}.Release|x86.ActiveCfg = Release|Win32
{F551524D-8A70-4B2F-A7C2-28AE61150022}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@ -99,5 +113,6 @@ Global
{0C32D479-46D5-46C3-9AA9-0A8FF8320516} = {B2F1FF1B-005C-490E-999E-17BD4B720B5C}
{4B3BA10A-941F-4E08-8A50-8A7FCB822BB8} = {B2F1FF1B-005C-490E-999E-17BD4B720B5C}
{ECEE1119-CE2E-4F7E-83A8-1932EA48E893} = {B2F1FF1B-005C-490E-999E-17BD4B720B5C}
{F551524D-8A70-4B2F-A7C2-28AE61150022} = {B2F1FF1B-005C-490E-999E-17BD4B720B5C}
EndGlobalSection
EndGlobal

3
templates/cpp-template-default/proj.win8.1-universal/App.Windows/HelloCpp.Windows.vcxproj
View File

@ -207,6 +207,9 @@
<ProjectReference Include="..\..\cocos2d\external\Box2D\proj.win8.1-universal\libbox2d.Windows\libbox2d.Windows.vcxproj">
<Project>{3b26a12d-3a44-47ea-82d2-282660fc844d}</Project>
</ProjectReference>
<ProjectReference Include="..\..\cocos2d\external\recast\proj.win8.1-universal\librecast.Windows\librecast.Windows.vcxproj">
<Project>{19e35654-a3ec-48fa-bb21-082a2356c87c}</Project>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">

3
templates/cpp-template-default/proj.win8.1-universal/App.WindowsPhone/HelloCpp.WindowsPhone.vcxproj
View File

@ -151,6 +151,9 @@
<ProjectReference Include="..\..\cocos2d\external\Box2D\proj.win8.1-universal\libbox2d.WindowsPhone\libbox2d.WindowsPhone.vcxproj">
<Project>{22f798d8-bfff-4754-996f-a5395343d5ec}</Project>
</ProjectReference>
<ProjectReference Include="..\..\cocos2d\external\recast\proj.win8.1-universal\librecast.WindowsPhone\librecast.WindowsPhone.vcxproj">
<Project>{d3bcfc1a-94bd-43b7-9c15-3f48ac6a9fac}</Project>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">

45
templates/cpp-template-default/proj.win8.1-universal/HelloCpp.sln
View File

@ -1,14 +1,14 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.30723.0
VisualStudioVersion = 12.0.31101.0
MinimumVisualStudioVersion = 12.0.21005.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HelloCpp", "HelloCpp", "{36AFDE04-D127-4D84-9730-D84E3E51EAA7}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "App.Shared", "App.Shared\HelloCpp.Shared.vcxitems", "{A3AD93E4-0B2F-4C58-9181-69BED2E42E3E}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloCpp.Shared", "App.Shared\HelloCpp.Shared.vcxitems", "{A3AD93E4-0B2F-4C58-9181-69BED2E42E3E}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "App.Windows", "App.Windows\HelloCpp.Windows.vcxproj", "{79A8FCDA-4B12-4DD1-B676-FF148D651638}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloCpp.Windows", "App.Windows\HelloCpp.Windows.vcxproj", "{79A8FCDA-4B12-4DD1-B676-FF148D651638}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "App.WindowsPhone", "App.WindowsPhone\HelloCpp.WindowsPhone.vcxproj", "{396FE85E-BB05-4B92-BCCB-F89AED4EA41A}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloCpp.WindowsPhone", "App.WindowsPhone\HelloCpp.WindowsPhone.vcxproj", "{396FE85E-BB05-4B92-BCCB-F89AED4EA41A}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libcocos2d", "libcocos2d", "{80DA05C1-6532-4D2A-8606-EF02079B1373}"
EndProject
@ -44,12 +44,22 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbullet.Windows", "..\coc
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbullet.WindowsPhone", "..\cocos2d\external\bullet\proj.win8.1-universal\libbullet.WindowsPhone\libbullet.WindowsPhone.vcxproj", "{E35634BD-B91B-4A6D-B957-96F56DD065F9}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "librecast", "librecast", "{19600DB1-1BD4-49BF-865C-ADC8C982F1F8}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "librecast.Shared", "..\cocos2d\external\recast\proj.win8.1-universal\librecast.Shared\librecast.Shared.vcxitems", "{F39A11FB-0D36-4B0A-91F1-345F1F0C9AA9}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "librecast.Windows", "..\cocos2d\external\recast\proj.win8.1-universal\librecast.Windows\librecast.Windows.vcxproj", "{19E35654-A3EC-48FA-BB21-082A2356C87C}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "librecast.WindowsPhone", "..\cocos2d\external\recast\proj.win8.1-universal\librecast.WindowsPhone\librecast.WindowsPhone.vcxproj", "{D3BCFC1A-94BD-43B7-9C15-3F48AC6A9FAC}"
EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
..\cocos2d\cocos\2d\libcocos2d_8_1\libcocos2d_8_1\libcocos2d_8_1.Shared\libcocos2d_8_1.Shared.vcxitems*{9335005f-678e-4e8e-9b84-50037216aec8}*SharedItemsImports = 4
..\cocos2d\external\recast\proj.win8.1-universal\librecast.Shared\librecast.Shared.vcxitems*{19e35654-a3ec-48fa-bb21-082a2356c87c}*SharedItemsImports = 4
App.Shared\HelloCpp.Shared.vcxitems*{a3ad93e4-0b2f-4c58-9181-69bed2e42e3e}*SharedItemsImports = 9
..\cocos2d\cocos\editor-support\spine\proj.win8.1-universal\libSpine.Shared\libSpine.Shared.vcxitems*{cc1da216-a80d-4be4-b309-acb6af313aff}*SharedItemsImports = 4
..\cocos2d\external\Box2D\proj.win8.1-universal\libbox2d.Shared\libbox2d.Shared.vcxitems*{4a3c6ba8-c227-498b-aa21-40bda27b461f}*SharedItemsImports = 9
..\cocos2d\external\recast\proj.win8.1-universal\librecast.Shared\librecast.Shared.vcxitems*{f39a11fb-0d36-4b0a-91f1-345f1f0c9aa9}*SharedItemsImports = 9
..\cocos2d\external\bullet\proj.win8.1-universal\libbullet.Shared\libbullet.Shared.vcxitems*{e35634bd-b91b-4a6d-b957-96f56dd065f9}*SharedItemsImports = 4
App.Shared\HelloCpp.Shared.vcxitems*{79a8fcda-4b12-4dd1-b676-ff148d651638}*SharedItemsImports = 4
..\cocos2d\external\bullet\proj.win8.1-universal\libbullet.Shared\libbullet.Shared.vcxitems*{ec2b1292-2d8c-4feb-a84b-2550b32c1ae7}*SharedItemsImports = 4
@ -60,6 +70,7 @@ Global
..\cocos2d\cocos\2d\libcocos2d_8_1\libcocos2d_8_1\libcocos2d_8_1.Shared\libcocos2d_8_1.Shared.vcxitems*{22f3b9df-1209-4574-8331-003966f562bf}*SharedItemsImports = 4
..\cocos2d\external\Box2D\proj.win8.1-universal\libbox2d.Shared\libbox2d.Shared.vcxitems*{22f798d8-bfff-4754-996f-a5395343d5ec}*SharedItemsImports = 4
..\cocos2d\cocos\editor-support\spine\proj.win8.1-universal\libSpine.Shared\libSpine.Shared.vcxitems*{f3550fe0-c795-44f6-8feb-093eb68143ae}*SharedItemsImports = 4
..\cocos2d\external\recast\proj.win8.1-universal\librecast.Shared\librecast.Shared.vcxitems*{d3bcfc1a-94bd-43b7-9c15-3f48ac6a9fac}*SharedItemsImports = 4
App.Shared\HelloCpp.Shared.vcxitems*{396fe85e-bb05-4b92-bccb-f89aed4ea41a}*SharedItemsImports = 4
EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -191,6 +202,28 @@ Global
{E35634BD-B91B-4A6D-B957-96F56DD065F9}.Release|Win32.ActiveCfg = Release|Win32
{E35634BD-B91B-4A6D-B957-96F56DD065F9}.Release|Win32.Build.0 = Release|Win32
{E35634BD-B91B-4A6D-B957-96F56DD065F9}.Release|x64.ActiveCfg = Release|Win32
{19E35654-A3EC-48FA-BB21-082A2356C87C}.Debug|ARM.ActiveCfg = Debug|ARM
{19E35654-A3EC-48FA-BB21-082A2356C87C}.Debug|ARM.Build.0 = Debug|ARM
{19E35654-A3EC-48FA-BB21-082A2356C87C}.Debug|Win32.ActiveCfg = Debug|Win32
{19E35654-A3EC-48FA-BB21-082A2356C87C}.Debug|Win32.Build.0 = Debug|Win32
{19E35654-A3EC-48FA-BB21-082A2356C87C}.Debug|x64.ActiveCfg = Debug|x64
{19E35654-A3EC-48FA-BB21-082A2356C87C}.Debug|x64.Build.0 = Debug|x64
{19E35654-A3EC-48FA-BB21-082A2356C87C}.Release|ARM.ActiveCfg = Release|ARM
{19E35654-A3EC-48FA-BB21-082A2356C87C}.Release|ARM.Build.0 = Release|ARM
{19E35654-A3EC-48FA-BB21-082A2356C87C}.Release|Win32.ActiveCfg = Release|Win32
{19E35654-A3EC-48FA-BB21-082A2356C87C}.Release|Win32.Build.0 = Release|Win32
{19E35654-A3EC-48FA-BB21-082A2356C87C}.Release|x64.ActiveCfg = Release|x64
{19E35654-A3EC-48FA-BB21-082A2356C87C}.Release|x64.Build.0 = Release|x64
{D3BCFC1A-94BD-43B7-9C15-3F48AC6A9FAC}.Debug|ARM.ActiveCfg = Debug|ARM
{D3BCFC1A-94BD-43B7-9C15-3F48AC6A9FAC}.Debug|ARM.Build.0 = Debug|ARM
{D3BCFC1A-94BD-43B7-9C15-3F48AC6A9FAC}.Debug|Win32.ActiveCfg = Debug|Win32
{D3BCFC1A-94BD-43B7-9C15-3F48AC6A9FAC}.Debug|Win32.Build.0 = Debug|Win32
{D3BCFC1A-94BD-43B7-9C15-3F48AC6A9FAC}.Debug|x64.ActiveCfg = Debug|Win32
{D3BCFC1A-94BD-43B7-9C15-3F48AC6A9FAC}.Release|ARM.ActiveCfg = Release|ARM
{D3BCFC1A-94BD-43B7-9C15-3F48AC6A9FAC}.Release|ARM.Build.0 = Release|ARM
{D3BCFC1A-94BD-43B7-9C15-3F48AC6A9FAC}.Release|Win32.ActiveCfg = Release|Win32
{D3BCFC1A-94BD-43B7-9C15-3F48AC6A9FAC}.Release|Win32.Build.0 = Release|Win32
{D3BCFC1A-94BD-43B7-9C15-3F48AC6A9FAC}.Release|x64.ActiveCfg = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@ -214,5 +247,9 @@ Global
{16AF311F-74CA-45A3-A82D-6334200FB124} = {72850ED1-A006-4767-B703-27A27C3F13FC}
{EC2B1292-2D8C-4FEB-A84B-2550B32C1AE7} = {72850ED1-A006-4767-B703-27A27C3F13FC}
{E35634BD-B91B-4A6D-B957-96F56DD065F9} = {72850ED1-A006-4767-B703-27A27C3F13FC}
{19600DB1-1BD4-49BF-865C-ADC8C982F1F8} = {F13CB4F7-BEE5-4368-A815-A971797387D8}
{F39A11FB-0D36-4B0A-91F1-345F1F0C9AA9} = {19600DB1-1BD4-49BF-865C-ADC8C982F1F8}
{19E35654-A3EC-48FA-BB21-082A2356C87C} = {19600DB1-1BD4-49BF-865C-ADC8C982F1F8}
{D3BCFC1A-94BD-43B7-9C15-3F48AC6A9FAC} = {19600DB1-1BD4-49BF-865C-ADC8C982F1F8}
EndGlobalSection
EndGlobal

18
templates/js-template-default/frameworks/runtime-src/proj.win8.1-universal/App.Windows/HelloJavascript.Windows.vcxproj
View File

@ -118,7 +118,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
<ClCompile>
<AdditionalOptions>/bigobj /Zm200 %(AdditionalOptions)</AdditionalOptions>
<DisableSpecificWarnings>4453;28204;4756;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<DisableSpecificWarnings>4453;28204;4756;4800;4101;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\Classes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<SDLCheck>false</SDLCheck>
@ -131,7 +131,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
<ClCompile>
<AdditionalOptions>/bigobj /Zm200 %(AdditionalOptions)</AdditionalOptions>
<DisableSpecificWarnings>4453;28204;4756;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<DisableSpecificWarnings>4453;28204;4756;4800;4101;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\Classes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<SDLCheck>false</SDLCheck>
@ -141,7 +141,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<AdditionalOptions>/bigobj /Zm200 %(AdditionalOptions)</AdditionalOptions>
<DisableSpecificWarnings>4453;28204;4756;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<DisableSpecificWarnings>4453;28204;4756;4800;4101;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\Classes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<SDLCheck>false</SDLCheck>
@ -154,7 +154,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<AdditionalOptions>/bigobj /Zm200 %(AdditionalOptions)</AdditionalOptions>
<DisableSpecificWarnings>4453;28204;4756;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<DisableSpecificWarnings>4453;28204;4756;4800;4101;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\Classes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<SDLCheck>false</SDLCheck>
@ -164,7 +164,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<AdditionalOptions>/bigobj /Zm200 %(AdditionalOptions)</AdditionalOptions>
<DisableSpecificWarnings>4453;28204;4756;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<DisableSpecificWarnings>4453;28204;4756;4800;4101;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\Classes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<SDLCheck>false</SDLCheck>
@ -177,7 +177,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<AdditionalOptions>/bigobj /Zm200 %(AdditionalOptions)</AdditionalOptions>
<DisableSpecificWarnings>4453;28204;4756;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<DisableSpecificWarnings>4453;28204;4756;4800;4101;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\Classes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<SDLCheck>false</SDLCheck>
@ -209,6 +209,12 @@
<ProjectReference Include="..\..\..\cocos2d-x\external\Box2D\proj.win8.1-universal\libbox2d.Windows\libbox2d.Windows.vcxproj">
<Project>{3b26a12d-3a44-47ea-82d2-282660fc844d}</Project>
</ProjectReference>
<ProjectReference Include="..\..\..\cocos2d-x\external\bullet\proj.win8.1-universal\libbullet.Windows\libbullet.Windows.vcxproj">
<Project>{ec2b1292-2d8c-4feb-a84b-2550b32c1ae7}</Project>
</ProjectReference>
<ProjectReference Include="..\..\..\cocos2d-x\external\recast\proj.win8.1-universal\librecast.Windows\librecast.Windows.vcxproj">
<Project>{19e35654-a3ec-48fa-bb21-082a2356c87c}</Project>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">

14
templates/js-template-default/frameworks/runtime-src/proj.win8.1-universal/App.WindowsPhone/HelloJavascript.WindowsPhone.vcxproj
View File

@ -85,7 +85,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
<ClCompile>
<AdditionalOptions>/bigobj /Zm200 %(AdditionalOptions)</AdditionalOptions>
<DisableSpecificWarnings>4453;28204;4756;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<DisableSpecificWarnings>4453;28204;4756;4800;4101;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\Classes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<SDLCheck>false</SDLCheck>
@ -98,7 +98,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
<ClCompile>
<AdditionalOptions>/bigobj /Zm200 %(AdditionalOptions)</AdditionalOptions>
<DisableSpecificWarnings>4453;28204;4756;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<DisableSpecificWarnings>4453;28204;4756;4800;4101;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\Classes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<SDLCheck>false</SDLCheck>
@ -108,7 +108,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<AdditionalOptions>/bigobj /Zm200 %(AdditionalOptions)</AdditionalOptions>
<DisableSpecificWarnings>4453;28204;4756;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<DisableSpecificWarnings>4453;28204;4756;4800;4101;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\Classes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<SDLCheck>false</SDLCheck>
@ -121,7 +121,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<AdditionalOptions>/bigobj /Zm200 %(AdditionalOptions)</AdditionalOptions>
<DisableSpecificWarnings>4453;28204;4756;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<DisableSpecificWarnings>4453;28204;4756;4800;4101;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\Classes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<SDLCheck>false</SDLCheck>
@ -154,6 +154,12 @@
<ProjectReference Include="..\..\..\cocos2d-x\external\Box2D\proj.win8.1-universal\libbox2d.WindowsPhone\libbox2d.WindowsPhone.vcxproj">
<Project>{22f798d8-bfff-4754-996f-a5395343d5ec}</Project>
</ProjectReference>
<ProjectReference Include="..\..\..\cocos2d-x\external\bullet\proj.win8.1-universal\libbullet.WindowsPhone\libbullet.WindowsPhone.vcxproj">
<Project>{e35634bd-b91b-4a6d-b957-96f56dd065f9}</Project>
</ProjectReference>
<ProjectReference Include="..\..\..\cocos2d-x\external\recast\proj.win8.1-universal\librecast.WindowsPhone\librecast.WindowsPhone.vcxproj">
<Project>{d3bcfc1a-94bd-43b7-9c15-3f48ac6a9fac}</Project>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">

37
templates/js-template-default/frameworks/runtime-src/proj.win8.1-universal/HelloJavascript.sln
View File

@ -52,12 +52,22 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbullet.Windows", "..\..\
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbullet.WindowsPhone", "..\..\cocos2d-x\external\bullet\proj.win8.1-universal\libbullet.WindowsPhone\libbullet.WindowsPhone.vcxproj", "{E35634BD-B91B-4A6D-B957-96F56DD065F9}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "librecast", "librecast", "{5593ACDF-DEC0-4BC0-A57D-2C8D05E16BE4}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "librecast.Shared", "..\..\cocos2d-x\external\recast\proj.win8.1-universal\librecast.Shared\librecast.Shared.vcxitems", "{F39A11FB-0D36-4B0A-91F1-345F1F0C9AA9}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "librecast.Windows", "..\..\cocos2d-x\external\recast\proj.win8.1-universal\librecast.Windows\librecast.Windows.vcxproj", "{19E35654-A3EC-48FA-BB21-082A2356C87C}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "librecast.WindowsPhone", "..\..\cocos2d-x\external\recast\proj.win8.1-universal\librecast.WindowsPhone\librecast.WindowsPhone.vcxproj", "{D3BCFC1A-94BD-43B7-9C15-3F48AC6A9FAC}"
EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
..\..\cocos2d-x\cocos\2d\libcocos2d_8_1\libcocos2d_8_1\libcocos2d_8_1.Shared\libcocos2d_8_1.Shared.vcxitems*{9335005f-678e-4e8e-9b84-50037216aec8}*SharedItemsImports = 4
..\..\cocos2d-x\external\recast\proj.win8.1-universal\librecast.Shared\librecast.Shared.vcxitems*{19e35654-a3ec-48fa-bb21-082a2356c87c}*SharedItemsImports = 4
App.Shared\HelloJavascript.Shared.vcxitems*{a3ad93e4-0b2f-4c58-9181-69bed2e42e3e}*SharedItemsImports = 9
..\..\cocos2d-x\cocos\editor-support\spine\proj.win8.1-universal\libSpine.Shared\libSpine.Shared.vcxitems*{cc1da216-a80d-4be4-b309-acb6af313aff}*SharedItemsImports = 4
..\..\cocos2d-x\external\Box2D\proj.win8.1-universal\libbox2d.Shared\libbox2d.Shared.vcxitems*{4a3c6ba8-c227-498b-aa21-40bda27b461f}*SharedItemsImports = 9
..\..\cocos2d-x\external\recast\proj.win8.1-universal\librecast.Shared\librecast.Shared.vcxitems*{f39a11fb-0d36-4b0a-91f1-345f1f0c9aa9}*SharedItemsImports = 9
..\..\cocos2d-x\external\bullet\proj.win8.1-universal\libbullet.Shared\libbullet.Shared.vcxitems*{e35634bd-b91b-4a6d-b957-96f56dd065f9}*SharedItemsImports = 4
App.Shared\HelloJavascript.Shared.vcxitems*{79a8fcda-4b12-4dd1-b676-ff148d651638}*SharedItemsImports = 4
..\..\cocos2d-x\external\bullet\proj.win8.1-universal\libbullet.Shared\libbullet.Shared.vcxitems*{ec2b1292-2d8c-4feb-a84b-2550b32c1ae7}*SharedItemsImports = 4
@ -71,6 +81,7 @@ Global
..\..\cocos2d-x\cocos\2d\libcocos2d_8_1\libcocos2d_8_1\libcocos2d_8_1.Shared\libcocos2d_8_1.Shared.vcxitems*{22f3b9df-1209-4574-8331-003966f562bf}*SharedItemsImports = 4
..\..\cocos2d-x\external\Box2D\proj.win8.1-universal\libbox2d.Shared\libbox2d.Shared.vcxitems*{22f798d8-bfff-4754-996f-a5395343d5ec}*SharedItemsImports = 4
..\..\cocos2d-x\cocos\editor-support\spine\proj.win8.1-universal\libSpine.Shared\libSpine.Shared.vcxitems*{f3550fe0-c795-44f6-8feb-093eb68143ae}*SharedItemsImports = 4
..\..\cocos2d-x\external\recast\proj.win8.1-universal\librecast.Shared\librecast.Shared.vcxitems*{d3bcfc1a-94bd-43b7-9c15-3f48ac6a9fac}*SharedItemsImports = 4
App.Shared\HelloJavascript.Shared.vcxitems*{396fe85e-bb05-4b92-bccb-f89aed4ea41a}*SharedItemsImports = 4
EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -224,6 +235,28 @@ Global
{E35634BD-B91B-4A6D-B957-96F56DD065F9}.Release|Win32.ActiveCfg = Release|Win32
{E35634BD-B91B-4A6D-B957-96F56DD065F9}.Release|Win32.Build.0 = Release|Win32
{E35634BD-B91B-4A6D-B957-96F56DD065F9}.Release|x64.ActiveCfg = Release|Win32
{19E35654-A3EC-48FA-BB21-082A2356C87C}.Debug|ARM.ActiveCfg = Debug|ARM
{19E35654-A3EC-48FA-BB21-082A2356C87C}.Debug|ARM.Build.0 = Debug|ARM
{19E35654-A3EC-48FA-BB21-082A2356C87C}.Debug|Win32.ActiveCfg = Debug|Win32
{19E35654-A3EC-48FA-BB21-082A2356C87C}.Debug|Win32.Build.0 = Debug|Win32
{19E35654-A3EC-48FA-BB21-082A2356C87C}.Debug|x64.ActiveCfg = Debug|x64
{19E35654-A3EC-48FA-BB21-082A2356C87C}.Debug|x64.Build.0 = Debug|x64
{19E35654-A3EC-48FA-BB21-082A2356C87C}.Release|ARM.ActiveCfg = Release|ARM
{19E35654-A3EC-48FA-BB21-082A2356C87C}.Release|ARM.Build.0 = Release|ARM
{19E35654-A3EC-48FA-BB21-082A2356C87C}.Release|Win32.ActiveCfg = Release|Win32
{19E35654-A3EC-48FA-BB21-082A2356C87C}.Release|Win32.Build.0 = Release|Win32
{19E35654-A3EC-48FA-BB21-082A2356C87C}.Release|x64.ActiveCfg = Release|x64
{19E35654-A3EC-48FA-BB21-082A2356C87C}.Release|x64.Build.0 = Release|x64
{D3BCFC1A-94BD-43B7-9C15-3F48AC6A9FAC}.Debug|ARM.ActiveCfg = Debug|ARM
{D3BCFC1A-94BD-43B7-9C15-3F48AC6A9FAC}.Debug|ARM.Build.0 = Debug|ARM
{D3BCFC1A-94BD-43B7-9C15-3F48AC6A9FAC}.Debug|Win32.ActiveCfg = Debug|Win32
{D3BCFC1A-94BD-43B7-9C15-3F48AC6A9FAC}.Debug|Win32.Build.0 = Debug|Win32
{D3BCFC1A-94BD-43B7-9C15-3F48AC6A9FAC}.Debug|x64.ActiveCfg = Debug|Win32
{D3BCFC1A-94BD-43B7-9C15-3F48AC6A9FAC}.Release|ARM.ActiveCfg = Release|ARM
{D3BCFC1A-94BD-43B7-9C15-3F48AC6A9FAC}.Release|ARM.Build.0 = Release|ARM
{D3BCFC1A-94BD-43B7-9C15-3F48AC6A9FAC}.Release|Win32.ActiveCfg = Release|Win32
{D3BCFC1A-94BD-43B7-9C15-3F48AC6A9FAC}.Release|Win32.Build.0 = Release|Win32
{D3BCFC1A-94BD-43B7-9C15-3F48AC6A9FAC}.Release|x64.ActiveCfg = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@ -250,5 +283,9 @@ Global
{16AF311F-74CA-45A3-A82D-6334200FB124} = {74FBA998-B56C-4170-AF95-CFC4FFB40468}
{EC2B1292-2D8C-4FEB-A84B-2550B32C1AE7} = {74FBA998-B56C-4170-AF95-CFC4FFB40468}
{E35634BD-B91B-4A6D-B957-96F56DD065F9} = {74FBA998-B56C-4170-AF95-CFC4FFB40468}
{5593ACDF-DEC0-4BC0-A57D-2C8D05E16BE4} = {F13CB4F7-BEE5-4368-A815-A971797387D8}
{F39A11FB-0D36-4B0A-91F1-345F1F0C9AA9} = {5593ACDF-DEC0-4BC0-A57D-2C8D05E16BE4}
{19E35654-A3EC-48FA-BB21-082A2356C87C} = {5593ACDF-DEC0-4BC0-A57D-2C8D05E16BE4}
{D3BCFC1A-94BD-43B7-9C15-3F48AC6A9FAC} = {5593ACDF-DEC0-4BC0-A57D-2C8D05E16BE4}
EndGlobalSection
EndGlobal

11
tests/cpp-empty-test/proj.win10/cpp-empty-test.vcxproj
View File

@ -165,6 +165,9 @@ xcopy "$(EngineRoot)cocos\platform\win8.1-universal\Cocos2dRenderer.h" "$(Engine
xcopy "$(EngineRoot)cocos\platform\win8.1-universal\pch.cpp" "$(EngineRoot)templates\cpp-template-default\proj.win10\App\*" /iycq
xcopy "$(EngineRoot)cocos\platform\win8.1-universal\pch.h" "$(EngineRoot)templates\cpp-template-default\proj.win10\App\*" /iycq</Command>
</PostBuildEvent>
<Link>
<IgnoreSpecificDefaultLibraries>MSVCRT;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
<ClCompile>
@ -209,6 +212,9 @@ xcopy "$(EngineRoot)cocos\platform\win8.1-universal\Cocos2dRenderer.h" "$(Engine
xcopy "$(EngineRoot)cocos\platform\win8.1-universal\pch.cpp" "$(EngineRoot)templates\cpp-template-default\proj.win10\App\*" /iycq
xcopy "$(EngineRoot)cocos\platform\win8.1-universal\pch.h" "$(EngineRoot)templates\cpp-template-default\proj.win10\App\*" /iycq</Command>
</PostBuildEvent>
<Link>
<IgnoreSpecificDefaultLibraries>MSVCRT;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
@ -239,7 +245,7 @@ xcopy "$(EngineRoot)cocos\platform\win8.1-universal\pch.h" "$(EngineRoot)templat
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
<SDLCheck>false</SDLCheck>
<AdditionalIncludeDirectories>..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<PostBuildEvent>
<Command>echo "Copying Windows 10.0 Universal App CPP template files"
@ -253,6 +259,9 @@ xcopy "$(EngineRoot)cocos\platform\win8.1-universal\Cocos2dRenderer.h" "$(Engine
xcopy "$(EngineRoot)cocos\platform\win8.1-universal\pch.cpp" "$(EngineRoot)templates\cpp-template-default\proj.win10\App\*" /iycq
xcopy "$(EngineRoot)cocos\platform\win8.1-universal\pch.h" "$(EngineRoot)templates\cpp-template-default\proj.win10\App\*" /iycq</Command>
</PostBuildEvent>
<Link>
<IgnoreSpecificDefaultLibraries>MSVCRT;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>

13
tests/cpp-tests/proj.win10/cpp-tests.vcxproj
View File

@ -154,6 +154,9 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<PreprocessorDefinitions>CC_ENABLE_CHIPMUNK_INTEGRATION=1;CC_ENABLE_BULLET_INTEGRATION=1;COCOS2D_DEBUG=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<IgnoreSpecificDefaultLibraries>MSVCRT;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
<ClCompile>
@ -180,6 +183,9 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<PreprocessorDefinitions>CC_ENABLE_CHIPMUNK_INTEGRATION=1;CC_ENABLE_BULLET_INTEGRATION=1;COCOS2D_DEBUG=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<IgnoreSpecificDefaultLibraries>MSVCRT;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
@ -202,9 +208,12 @@
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
<AdditionalIncludeDirectories>..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<SDLCheck>false</SDLCheck>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<PreprocessorDefinitions>CC_ENABLE_CHIPMUNK_INTEGRATION=1;CC_ENABLE_BULLET_INTEGRATION=1;COCOS2D_DEBUG=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<IgnoreSpecificDefaultLibraries>MSVCRT;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
@ -375,6 +384,7 @@
<ClInclude Include="..\Classes\MenuTest\MenuTest.h" />
<ClInclude Include="..\Classes\MotionStreakTest\MotionStreakTest.h" />
<ClInclude Include="..\Classes\MutiTouchTest\MutiTouchTest.h" />
<ClInclude Include="..\Classes\NavMeshTest\NavMeshTest.h" />
<ClInclude Include="..\Classes\NewAudioEngineTest\NewAudioEngineTest.h" />
<ClInclude Include="..\Classes\NewEventDispatcherTest\NewEventDispatcherTest.h" />
<ClInclude Include="..\Classes\NewRendererTest\NewRendererTest.h" />
@ -607,6 +617,7 @@
<ClCompile Include="..\Classes\MenuTest\MenuTest.cpp" />
<ClCompile Include="..\Classes\MotionStreakTest\MotionStreakTest.cpp" />
<ClCompile Include="..\Classes\MutiTouchTest\MutiTouchTest.cpp" />
<ClCompile Include="..\Classes\NavMeshTest\NavMeshTest.cpp" />
<ClCompile Include="..\Classes\NewAudioEngineTest\NewAudioEngineTest.cpp" />
<ClCompile Include="..\Classes\NewEventDispatcherTest\NewEventDispatcherTest.cpp" />
<ClCompile Include="..\Classes\NewRendererTest\NewRendererTest.cpp" />

12
tests/cpp-tests/proj.win10/cpp-tests.vcxproj.filters
View File

@ -386,6 +386,9 @@
<Filter Include="Classes\Physics3DTest">
<UniqueIdentifier>{a34bc185-d0fa-4e93-b289-954abaedcaae}</UniqueIdentifier>
</Filter>
<Filter Include="Classes\NavMeshTest">
<UniqueIdentifier>{a49e5dee-6eab-4a2a-9769-9f84ff6a5610}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ApplicationDefinition Include="App.xaml" />
@ -972,6 +975,9 @@
<ClCompile Include="..\Classes\Physics3DTest\Physics3DTest.cpp">
<Filter>Classes\Physics3DTest</Filter>
</ClCompile>
<ClCompile Include="..\Classes\NavMeshTest\NavMeshTest.cpp">
<Filter>Classes\NavMeshTest</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="App.xaml.h" />
@ -1759,6 +1765,9 @@
<ClInclude Include="..\Classes\Physics3DTest\Physics3DTest.h">
<Filter>Classes\Physics3DTest</Filter>
</ClInclude>
<ClInclude Include="..\Classes\NavMeshTest\NavMeshTest.h">
<Filter>Classes\NavMeshTest</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Image Include="Assets\WideLogo.scale-100.png">
@ -1775,6 +1784,9 @@
<None Include="$(ZLibBinPath)zlib.dll" />
<None Include="$(WebsocketsBinPath)libwebsockets.dll" />
<None Include="$(SQLiteBinPath)sqlite3.dll" />
<None Include="$(OggBinPath)libogg.dll" />
<None Include="$(OggBinPath)libvorbis.dll" />
<None Include="$(OggBinPath)libvorbisfile.dll" />
</ItemGroup>
<ItemGroup>
<Page Include="..\..\..\cocos\platform\win8.1-universal\OpenGLESPage.xaml" />

12
tests/js-tests/project/proj.win8.1-universal/App.Windows/js-tests.Windows.vcxproj
View File

@ -119,7 +119,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
<ClCompile>
<AdditionalOptions>/bigobj /Zm200 %(AdditionalOptions)</AdditionalOptions>
<DisableSpecificWarnings>4800;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<DisableSpecificWarnings>4800;4101;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<SDLCheck>false</SDLCheck>
@ -148,7 +148,7 @@ xcopy "$(EngineRoot)cocos\platform\win8.1-universal\cocos2d-js\pch.h" "$(EngineR
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
<ClCompile>
<AdditionalOptions>/bigobj /Zm200 %(AdditionalOptions)</AdditionalOptions>
<DisableSpecificWarnings>4800;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<DisableSpecificWarnings>4800;4101;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<SDLCheck>false</SDLCheck>
@ -174,7 +174,7 @@ xcopy "$(EngineRoot)cocos\platform\win8.1-universal\cocos2d-js\pch.h" "$(EngineR
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<AdditionalOptions>/bigobj /Zm200 %(AdditionalOptions)</AdditionalOptions>
<DisableSpecificWarnings>4800;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<DisableSpecificWarnings>4800;4101;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<SDLCheck>false</SDLCheck>
@ -203,7 +203,7 @@ xcopy "$(EngineRoot)cocos\platform\win8.1-universal\cocos2d-js\pch.h" "$(EngineR
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<AdditionalOptions>/bigobj /Zm200 %(AdditionalOptions)</AdditionalOptions>
<DisableSpecificWarnings>4800;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<DisableSpecificWarnings>4800;4101;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<SDLCheck>false</SDLCheck>
@ -229,7 +229,7 @@ xcopy "$(EngineRoot)cocos\platform\win8.1-universal\cocos2d-js\pch.h" "$(EngineR
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<AdditionalOptions>/bigobj /Zm200 %(AdditionalOptions)</AdditionalOptions>
<DisableSpecificWarnings>4800;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<DisableSpecificWarnings>4800;4101;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<SDLCheck>false</SDLCheck>
@ -256,7 +256,7 @@ xcopy "$(EngineRoot)cocos\platform\win8.1-universal\cocos2d-js\pch.h" "$(EngineR
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<AdditionalOptions>/bigobj /Zm200 %(AdditionalOptions)</AdditionalOptions>
<DisableSpecificWarnings>4800;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<DisableSpecificWarnings>4800;4101;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<SDLCheck>false</SDLCheck>

8
tests/js-tests/project/proj.win8.1-universal/App.WindowsPhone/js-tests.WindowsPhone.vcxproj
View File

@ -85,7 +85,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
<ClCompile>
<AdditionalOptions>/bigobj /Zm200 %(AdditionalOptions)</AdditionalOptions>
<DisableSpecificWarnings>4800;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<DisableSpecificWarnings>4800;4101;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<SDLCheck>false</SDLCheck>
@ -98,7 +98,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
<ClCompile>
<AdditionalOptions>/bigobj /Zm200 %(AdditionalOptions)</AdditionalOptions>
<DisableSpecificWarnings>4800;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<DisableSpecificWarnings>4800;4101;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<SDLCheck>false</SDLCheck>
@ -108,7 +108,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<AdditionalOptions>/bigobj /Zm200 %(AdditionalOptions)</AdditionalOptions>
<DisableSpecificWarnings>4800;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<DisableSpecificWarnings>4800;4101;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<SDLCheck>false</SDLCheck>
@ -121,7 +121,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<AdditionalOptions>/bigobj /Zm200 %(AdditionalOptions)</AdditionalOptions>
<DisableSpecificWarnings>4800;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<DisableSpecificWarnings>4800;4101;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<SDLCheck>false</SDLCheck>

5
tests/lua-tests/project/Classes/lua_module_register.h
View File

@ -11,6 +11,7 @@
#include "3d/lua_cocos2dx_3d_manual.h"
#include "audioengine/lua_cocos2dx_audioengine_manual.h"
#include "physics3d/lua_cocos2dx_physics3d_manual.h"
#include "navmesh/lua_cocos2dx_navmesh_manual.h"
int lua_module_register(lua_State* L)
@ -28,6 +29,10 @@ int lua_module_register(lua_State* L)
#if CC_USE_3D_PHYSICS && CC_ENABLE_BULLET_INTEGRATION
register_physics3d_module(L);
#endif
#if CC_USE_NAVMESH
register_navmesh_module(L);
#endif
return 1;
}

19
tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj
View File

@ -160,18 +160,25 @@ xcopy "$(OutDir)..\*.dll" "$(OutDir)" /D /Y</Command>
</DllDataFileName>
</Midl>
<PreBuildEvent>
<Command>xcopy "$(ProjectDir)..\..\res" "$(OutDir)res" /D /E /I /F /Y
xcopy "$(ProjectDir)..\..\src" "$(OutDir)src" /D /E /I /F /Y
xcopy "$(ProjectDir)..\..\..\..\tests\cpp-tests\Resources" "$(OutDir)res" /D /E /I /F /Y
xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script" "$(OutDir)src\cocos" /D /E /I /F /Y
xcopy "$(ProjectDir)..\..\..\..\external\lua\luasocket\script" "$(OutDir)script" /D /E /I /F /Y
xcopy "$(OutDir)..\*.dll" "$(OutDir)" /D /Y</Command>
<Command>
</Command>
<Message>copy files</Message>
</PreBuildEvent>
<PreLinkEvent>
<Command>
</Command>
</PreLinkEvent>
<CustomBuildStep>
<Command>xcopy "$(ProjectDir)..\..\res" "$(OutDir)res" /D /E /I /F /Y
xcopy "$(ProjectDir)..\..\src" "$(OutDir)src" /D /E /I /F /Y
xcopy "$(ProjectDir)..\..\..\..\tests\cpp-tests\Resources" "$(OutDir)res" /D /E /I /F /Y
xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script" "$(OutDir)src\cocos" /D /E /I /F /Y
xcopy "$(ProjectDir)..\..\..\..\external\lua\luasocket\script" "$(OutDir)script" /D /E /I /F /Y
xcopy "$(OutDir)..\*.dll" "$(OutDir)" /D /Y</Command>
</CustomBuildStep>
<CustomBuildStep>
<Outputs>xxx.txt</Outputs>
</CustomBuildStep>
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="..\Classes\AppDelegate.h" />

445
tests/lua-tests/src/NavMeshTest/NavMeshTest.lua Normal file
View File

@ -0,0 +1,445 @@
local AgentUserData =
{
time = 0
}
local function jump(v1, v2, height, t)
local out = {}
out.x = v1.x + t * (v2.x - v1.x)
out.y = v1.y + t * (v2.y - v1.y)
out.z = v1.z + t * (v2.z - v1.z)
out.y = out.y + height * math.sin(math.pi * t)
return out
end
local actionManager = cc.Director:getInstance():getActionManager()
----------------------------------------
----NavMeshBaseTestDemo
----------------------------------------
local NavMeshBaseTestDemo = class("NavMeshBaseTestDemo", function ()
-- body
local scene = cc.Scene:createWithPhysics()
return scene
end)
function NavMeshBaseTestDemo:ctor()
TestCastScene.initWithLayer(self)
TestCastScene.titleLabel:setString(self:title())
TestCastScene.subtitleLabel:setString(self:subtitle())
self:init()
local function onNodeEvent(event)
if "enter" == event then
self:onEnter()
elseif "exit" == event then
self:onExit()
end
end
self:registerScriptHandler(onNodeEvent)
end
function NavMeshBaseTestDemo:title()
return "Physics3D Test"
end
function NavMeshBaseTestDemo:subtitle()
return ""
end
function NavMeshBaseTestDemo:init()
self._angle = 0.0
self._agents = {}
local size = cc.Director:getInstance():getWinSize()
self._camera = cc.Camera:createPerspective(30.0, size.width / size.height, 1.0, 1000.0)
self._camera:setPosition3D(cc.vec3(0.0, 50.0, 100.0))
self._camera:lookAt(cc.vec3(0.0, 0.0, 0.0), cc.vec3(0.0, 1.0, 0.0))
self._camera:setCameraFlag(cc.CameraFlag.USER1)
self:addChild(self._camera)
self:registerTouchEvent()
self:initScene()
self:scheduleUpdateWithPriorityLua(function(dt)
if #self._agents == 0 then
return
end
if not self._resumeFlag and nil ~= self._agentNode then
self._resumeFlag = true
actionManager:resumeTarget(self._agentNode)
end
local currentVelocity = nil
local speed = 0
for i = 1, #self._agents do
currentVelocity = self._agents[i][1]:getCurrentVelocity()
speed = math.sqrt(currentVelocity.x * currentVelocity.x + currentVelocity.y * currentVelocity.y + currentVelocity.z * currentVelocity.z) * 0.2
if speed < 0 then
speed = 0.0
end
self._agents[i][2]:setSpeed(speed)
end
end, 0)
self:extend()
end
function NavMeshBaseTestDemo:onEnter()
local hitResult = {}
local ret = false
local physicsWorld = self:getPhysics3DWorld()
ret, hitResult = physicsWorld:rayCast(cc.vec3(0.0, 50.0, 0.0), cc.vec3(0.0, -50.0, 0.0), hitResult)
self:createAgent(hitResult.hitPosition)
end
function NavMeshBaseTestDemo:onExit()
self:unscheduleUpdate()
end
function NavMeshBaseTestDemo:registerTouchEvent()
end
function NavMeshBaseTestDemo:extend()
end
function NavMeshBaseTestDemo:initScene()
self:getPhysics3DWorld():setDebugDrawEnable(false)
local trianglesList = cc.Bundle3D:getTrianglesList("NavMesh/scene.obj")
local rbDes = {}
rbDes.mass = 0.0
rbDes.shape = cc.Physics3DShape:createMesh(trianglesList, math.floor(#trianglesList / 3))
local rigidBody = cc.Physics3DRigidBody:create(rbDes)
local component = cc.Physics3DComponent:create(rigidBody)
local sprite = cc.Sprite3D:create("NavMesh/scene.obj")
sprite:addComponent(component)
sprite:setCameraMask(cc.CameraFlag.USER1)
self:addChild(sprite)
self:setPhysics3DDebugCamera(self._camera)
local navMesh = cc.NavMesh:create("NavMesh/all_tiles_tilecache.bin", "NavMesh/geomset.txt")
navMesh:setDebugDrawEnable(true)
self:setNavMesh(navMesh)
self:setNavMeshDebugCamera(self._camera)
local ambientLight = cc.AmbientLight:create(cc.c3b(64, 64, 64))
ambientLight:setCameraMask(cc.CameraFlag.USER1)
self:addChild(ambientLight)
local dirLight = cc.DirectionLight:create(cc.vec3(1.2, -1.1, 0.5), cc.c3b(255, 255, 255))
dirLight:setCameraMask(cc.CameraFlag.USER1)
self:addChild(dirLight)
end
function NavMeshBaseTestDemo:createAgent(pos)
local filePath = "Sprite3DTest/girl.c3b"
local navMeshAgentParam = {}
navMeshAgentParam.radius = 2.0
navMeshAgentParam.height = 8.0
navMeshAgentParam.maxSpeed = 8.0
local agent = cc.NavMeshAgent:create(navMeshAgentParam)
local agentNode = cc.Sprite3D:create(filePath)
agent:setOrientationRefAxes(cc.vec3(-1.0, 0.0, 1.0))
agent.userdata = 0.0
agentNode:setScale(0.05)
agentNode:addComponent(agent)
local node = cc.Node:create()
node:addChild(agentNode)
node:setPosition3D(pos)
node:setCameraMask(cc.CameraFlag.USER1)
self:addChild(node)
local animation = cc.Animation3D:create(filePath)
local animate = cc.Animate3D:create(animation)
if nil ~= animate then
agentNode:runAction(cc.RepeatForever:create(animate))
animate:setSpeed(0.0)
end
self._agents[#self._agents + 1] = {agent, animate}
end
function NavMeshBaseTestDemo:createObstacle(pos)
local obstacle = cc.NavMeshObstacle:create(2.0, 8.0)
local obstacleNode = cc.Sprite3D:create("Sprite3DTest/cylinder.c3b")
obstacleNode:setPosition3D(cc.vec3(pos.x, pos.y -0.5, pos.z))
obstacleNode:setRotation3D(cc.vec3(-90.0, 0.0, 0.0))
obstacleNode:setScale(0.3)
obstacleNode:addComponent(obstacle)
obstacleNode:setCameraMask(cc.CameraFlag.USER1)
self:addChild(obstacleNode)
end
function NavMeshBaseTestDemo:moveAgents(des)
if #self._agents == 0 then
return
end
local agent = nil
for i = 1, #self._agents do
self._agents[i][1]:move(des, function (agent, totalTimeAfterMove)
local data = agent.userdata
if agent:isOnOffMeshLink() then
agent:setAutoTraverseOffMeshLink(false)
agent:setAutoOrientation(false)
local linkdata = agent:getCurrentOffMeshLinkData()
agent:getOwner():setPosition3D(jump(linkdata.startPosition, linkdata.endPosition, 10.0, data))
local dir = cc.vec3(linkdata.endPosition.x - linkdata.startPosition.x, linkdata.endPosition.y - linkdata.startPosition.y, linkdata.endPosition.z - linkdata.startPosition.z)
dir.y = 0.0
dir = cc.vec3normalize(dir)
local axes = cc.vec3(0.0, 0.0, 0.0)
local refAxes = cc.vec3(-1.0, 0.0, 1.0)
refAxes = cc.vec3normalize(refAxes)
axes = vec3_cross(refAxes, dir, axes)
local angle = refAxes.x * dir.x + refAxes.y * dir.y + refAxes.z * dir.z
local quaternion = cc.quaternion_createFromAxisAngle(axes, math.acos(angle))
agent:getOwner():setRotationQuat(quaternion)
agent.userdata = agent.userdata + 0.01
if 1.0 < agent.userdata then
agent:completeOffMeshLink()
agent:setAutoOrientation(true)
agent.userdata = 0.0
end
end
end)
end
end
----------------------------------------
----NavMeshBaseTestDemo
----------------------------------------
local NavMeshBasicTestDemo = class("NavMeshBasicTestDemo", NavMeshBaseTestDemo)
function NavMeshBasicTestDemo:title()
return "Navigation Mesh Test"
end
function NavMeshBasicTestDemo:subtitle()
return "Basic Test"
end
function NavMeshBasicTestDemo:registerTouchEvent()
local listener = cc.EventListenerTouchAllAtOnce:create()
listener:registerScriptHandler(function(touches, event)
self._needMoveAgents = true
end,cc.Handler.EVENT_TOUCHES_BEGAN)
listener:registerScriptHandler(function(touches, event)
if #touches > 0 and self._camera ~= nil then
local touch = touches[1]
local delta = touch:getDelta()
self._angle = self._angle - delta.x * math.pi / 180.0
self._camera:setPosition3D(cc.vec3(100.0 * math.sin(self._angle), 50.0, 100.0 * math.cos(self._angle)))
self._camera:lookAt(cc.vec3(0.0, 0.0, 0.0), cc.vec3(0.0, 1.0, 0.0))
if (delta.x * delta.x + delta.y * delta.y) > 16 then
self._needMoveAgents = false
end
end
end, cc.Handler.EVENT_TOUCHES_MOVED)
listener:registerScriptHandler(function(touches, event)
if not self._needMoveAgents then
return
end
local physicsWorld = self:getPhysics3DWorld()
if #touches > 0 then
local touch = touches[1]
local location = touch:getLocationInView()
local nearP = cc.vec3(location.x, location.y, 0.0)
local farP = cc.vec3(location.x, location.y, 1.0)
local size = cc.Director:getInstance():getWinSize()
nearP = self._camera:unproject(size, nearP, nearP)
farP = self._camera:unproject(size, farP, farP)
local hitResult = {}
local ret = false
ret, hitResult = physicsWorld:rayCast(nearP, farP, hitResult)
self:moveAgents(hitResult.hitPosition)
end
end, cc.Handler.EVENT_TOUCHES_ENDED)
local eventDispatcher = self:getEventDispatcher()
eventDispatcher:addEventListenerWithSceneGraphPriority(listener, self)
end
function NavMeshBasicTestDemo:extend()
local ttfConfig = {}
ttfConfig.fontFilePath = "fonts/arial.ttf"
ttfConfig.fontSize = 15
local debugLabel = cc.Label:createWithTTF(ttfConfig,"Debug Draw ON")
local menuItem = cc.MenuItemLabel:create(debugLabel)
menuItem:registerScriptTapHandler(function (tag, sender)
local scene = cc.Director:getInstance():getRunningScene()
local enabledDebug = not scene:getNavMesh():isDebugDrawEnabled()
scene:getNavMesh():setDebugDrawEnable(enabledDebug)
if enabledDebug then
debugLabel:setString("DebugDraw ON")
else
debugLabel:setString("DebugDraw OFF")
end
end)
menuItem:setAnchorPoint(cc.p(0.0, 1.0))
menuItem:setPosition(cc.p(VisibleRect:left().x, VisibleRect:top().y - 100))
local menu = cc.Menu:create(menuItem)
menu:setPosition(cc.p(0.0, 0.0))
self:addChild(menu)
end
----------------------------------------
----NavMeshAdvanceTestDemo
----------------------------------------
local NavMeshAdvanceTestDemo = class("NavMeshAdvanceTestDemo", NavMeshBaseTestDemo)
function NavMeshAdvanceTestDemo:title()
return "Navigation Mesh Test"
end
function NavMeshAdvanceTestDemo:subtitle()
return "Advance Test"
end
function NavMeshAdvanceTestDemo:registerTouchEvent()
local listener = cc.EventListenerTouchAllAtOnce:create()
listener:registerScriptHandler(function(touches, event)
self._needMoveAgents = true
end,cc.Handler.EVENT_TOUCHES_BEGAN)
listener:registerScriptHandler(function(touches, event)
if #touches > 0 and self._camera ~= nil then
local touch = touches[1]
local delta = touch:getDelta()
self._angle = self._angle - delta.x * math.pi / 180.0
self._camera:setPosition3D(cc.vec3(100.0 * math.sin(self._angle), 50.0, 100.0 * math.cos(self._angle)))
self._camera:lookAt(cc.vec3(0.0, 0.0, 0.0), cc.vec3(0.0, 1.0, 0.0))
if (delta.x * delta.x + delta.y * delta.y) > 16 then
self._needMoveAgents = false
end
end
end, cc.Handler.EVENT_TOUCHES_MOVED)
listener:registerScriptHandler(function(touches, event)
if not self._needMoveAgents then
return
end
local physicsWorld = self:getPhysics3DWorld()
if #touches > 0 then
local touch = touches[1]
local location = touch:getLocationInView()
local nearP = cc.vec3(location.x, location.y, 0.0)
local farP = cc.vec3(location.x, location.y, 1.0)
local size = cc.Director:getInstance():getWinSize()
nearP = self._camera:unproject(size, nearP, nearP)
farP = self._camera:unproject(size, farP, farP)
local hitResult = {}
local ret = false
ret, hitResult = physicsWorld:rayCast(nearP, farP, hitResult)
self:moveAgents(hitResult.hitPosition)
end
end, cc.Handler.EVENT_TOUCHES_ENDED)
local eventDispatcher = self:getEventDispatcher()
eventDispatcher:addEventListenerWithSceneGraphPriority(listener, self)
end
function NavMeshAdvanceTestDemo:extend()
local ttfConfig = {}
ttfConfig.fontFilePath = "fonts/arial.ttf"
ttfConfig.fontSize = 15
local obstacleLabel = cc.Label:createWithTTF(ttfConfig,"Create Obstacle")
local menuItem0 = cc.MenuItemLabel:create(obstacleLabel)
menuItem0:registerScriptTapHandler(function (tag, sender)
local scene = cc.Director:getInstance():getRunningScene()
local x = math.random(-50, 50)
local z = math.random(-50.0, 50.0)
local hitResult = {}
local ret = false
ret, hitResult = scene:getPhysics3DWorld():rayCast(cc.vec3(x, 50.0, z), cc.vec3(x, -50.0, z), hitResult)
self:createObstacle(hitResult.hitPosition)
end)
menuItem0:setAnchorPoint(cc.p(0.0, 1.0))
menuItem0:setPosition(cc.p(VisibleRect:left().x, VisibleRect:top().y - 50))
local agentLabel = cc.Label:createWithTTF(ttfConfig,"Create Agent")
local menuItem1 = cc.MenuItemLabel:create(agentLabel)
menuItem1:registerScriptTapHandler(function (tag, sender)
local scene = cc.Director:getInstance():getRunningScene()
local x = math.random(-50, 50)
local z = math.random(-50.0, 50.0)
local hitResult = {}
local ret = false
ret, hitResult = scene:getPhysics3DWorld():rayCast(cc.vec3(x, 50.0, z), cc.vec3(x, -50.0, z), hitResult)
self:createAgent(hitResult.hitPosition)
end)
menuItem1:setAnchorPoint(cc.p(0.0, 1.0))
menuItem1:setPosition(cc.p(VisibleRect:left().x, VisibleRect:top().y - 100))
local debugLabel = cc.Label:createWithTTF(ttfConfig,"Debug Draw ON")
local menuItem2 = cc.MenuItemLabel:create(debugLabel)
menuItem2:registerScriptTapHandler(function (tag, sender)
local scene = cc.Director:getInstance():getRunningScene()
local enabledDebug = not scene:getNavMesh():isDebugDrawEnabled()
scene:getNavMesh():setDebugDrawEnable(enabledDebug)
if enabledDebug then
debugLabel:setString("DebugDraw ON")
else
debugLabel:setString("DebugDraw OFF")
end
end)
menuItem2:setAnchorPoint(cc.p(0.0, 1.0))
menuItem2:setPosition(cc.p(VisibleRect:left().x, VisibleRect:top().y - 150))
local menu = cc.Menu:create(menuItem0, menuItem1, menuItem2)
menu:setPosition(cc.p(0.0, 0.0))
self:addChild(menu)
end
----------------------------------------
----NavMeshTest
----------------------------------------
function NavMeshTest()
Helper.usePhysics = true
TestCastScene.createFunctionTable =
{
NavMeshBasicTestDemo.create,
NavMeshAdvanceTestDemo.create,
}
local scene = NavMeshBasicTestDemo.create()
scene:addChild(CreateBackMenuItem())
return scene
end

69
tests/lua-tests/src/helper.lua
View File

@ -141,3 +141,72 @@ function createTestLayer(title, subtitle)
Helper.subtitleLabel:setString(subTitleStr)
return layer
end
TestCastScene = {
index = 1,
createFunctioinTable = nil,
titleLabel = nil,
subtitleLabel = nil
}
function TestCastScene.nextAction()
TestCastScene.index = TestCastScene.index + 1
if TestCastScene.index > table.getn(TestCastScene.createFunctionTable) then
TestCastScene.index = 1
end
return TestCastScene.newScene()
end
function TestCastScene.backAction()
TestCastScene.index = TestCastScene.index - 1
if TestCastScene.index == 0 then
TestCastScene.index = table.getn(TestCastScene.createFunctionTable)
end
return TestCastScene.newScene()
end
function TestCastScene.restartAction()
return TestCastScene.newScene()
end
function TestCastScene.newScene()
local scene = TestCastScene.createFunctionTable[TestCastScene.index]()
scene:addChild(CreateBackMenuItem())
cc.Director:getInstance():replaceScene(scene)
end
function TestCastScene.initWithLayer(scene)
local size = cc.Director:getInstance():getWinSize()
TestCastScene.titleLabel = cc.Label:createWithTTF("", s_arialPath, 28)
TestCastScene.titleLabel:setAnchorPoint(cc.p(0.5, 0.5))
scene:addChild(TestCastScene.titleLabel, 1)
TestCastScene.titleLabel:setPosition(size.width / 2, size.height - 50)
TestCastScene.subtitleLabel = cc.Label:createWithTTF("", s_thonburiPath, 16)
TestCastScene.subtitleLabel:setAnchorPoint(cc.p(0.5, 0.5))
scene:addChild(TestCastScene.subtitleLabel, 1)
TestCastScene.subtitleLabel:setPosition(size.width / 2, size.height - 80)
-- menu
local item1 = cc.MenuItemImage:create(s_pPathB1, s_pPathB2)
local item2 = cc.MenuItemImage:create(s_pPathR1, s_pPathR2)
local item3 = cc.MenuItemImage:create(s_pPathF1, s_pPathF2)
item1:registerScriptTapHandler(TestCastScene.backAction)
item2:registerScriptTapHandler(TestCastScene.restartAction)
item3:registerScriptTapHandler(TestCastScene.nextAction)
local menu = cc.Menu:create()
menu:addChild(item1)
menu:addChild(item2)
menu:addChild(item3)
menu:setPosition(cc.p(0, 0))
item1:setPosition(cc.p(size.width / 2 - item2:getContentSize().width * 2, item2:getContentSize().height / 2))
item2:setPosition(cc.p(size.width / 2, item2:getContentSize().height / 2))
item3:setPosition(cc.p(size.width / 2 + item2:getContentSize().width * 2, item2:getContentSize().height / 2))
scene:addChild(menu, 1)
local background = cc.Layer:create()
scene:addChild(background, -10)
end

6
tests/lua-tests/src/mainMenu.lua
View File

@ -63,6 +63,7 @@ require "SpritePolygonTest/SpritePolygonTest"
require "Physics3DTest/Physics3DTest"
require "Scene3DTest/Scene3DTest"
require "MaterialSystemTest/MaterialSystemTest"
require "NavMeshTest/NavMeshTest"
local LINE_SPACE = 40
@ -115,6 +116,7 @@ local _allTests = {
{ isSupported = true, name = "MenuTest" , create_func = MenuTestMain },
{ isSupported = true, name = "MotionStreakTest" , create_func = MotionStreakTest },
{ isSupported = false, name = "MutiTouchTest" , create_func= MutiTouchTestMain },
{ isSupported = true, name = "NavMeshTest" , create_func = NavMeshTest },
{ isSupported = true, name = "NewEventDispatcherTest" , create_func = NewEventDispatcherTest },
{ isSupported = true, name = "NodeTest" , create_func = CocosNodeTest },
{ isSupported = true, name = "OpenGLTest" , create_func= OpenGLTestMain },
@ -216,6 +218,10 @@ function CreateTestMenu()
testMenuItem:setEnabled(false)
end
if obj.name == "NavMeshTest" and nil == cc.NavMesh then
testMenuItem:setEnabled(false)
end
testMenuItem:registerScriptTapHandler(menuCallback)
testMenuItem:setPosition(cc.p(s.width / 2, (s.height - (index) * LINE_SPACE)))
MainMenu:addChild(testMenuItem, index + 10000, index + 10000)

2
tools/bindings-generator

@ -1 +1 @@
Subproject commit 956a4f04cc55c2a5cff0b637d8465b09b20abc2a
Subproject commit b384d93865d9a9499eed7f6f4b961a58c067fec0

4
tools/simulator/frameworks/runtime-src/Classes/lua_module_register.h
View File

@ -11,6 +11,7 @@
#include "3d/lua_cocos2dx_3d_manual.h"
#include "audioengine/lua_cocos2dx_audioengine_manual.h"
#include "physics3d/lua_cocos2dx_physics3d_manual.h"
#include "navmesh/lua_cocos2dx_navmesh_manual.h"
static int lua_module_register(lua_State* L)
{
@ -26,6 +27,9 @@ static int lua_module_register(lua_State* L)
register_audioengine_module(L);
#if CC_USE_3D_PHYSICS && CC_ENABLE_BULLET_INTEGRATION
register_physics3d_module(L);
#endif
#if CC_USE_NAVMESH
register_navmesh_module(L);
#endif
return 1;
}

2
tools/tolua/cocos2dx_3d.ini
View File

@ -42,7 +42,7 @@ skip = Mesh::[create getAABB getVertexBuffer hasVertexAttrib getSkin getMeshInde
BillBoard::[draw],
Sprite3DCache::[addSprite3DData getSpriteData],
Terrain::[lookForIndicesLODSkrit lookForIndicesLOD insertIndicesLOD insertIndicesLODSkirt getIntersectionPoint getAABB getQuadTree create ^getHeight$],
Bundle3D::[calculateAABB loadMeshDatas getTrianglesList]
Bundle3D::[calculateAABB loadMeshDatas getTrianglesList loadObj]
rename_functions =

66
tools/tolua/cocos2dx_navmesh.ini Normal file
View File

@ -0,0 +1,66 @@
[cocos2dx_navmesh]
# the prefix to be added to the generated functions. You might or might not use this in your own
# templates
prefix = cocos2dx_navmesh
# create a target namespace (in javascript, this would create some code like the equiv. to `ns = ns || {}`)
# all classes will be embedded in that namespace
target_namespace = cc
macro_judgement = #if CC_USE_NAVMESH
android_headers = -I%(androidndkdir)s/platforms/android-14/arch-arm/usr/include -I%(androidndkdir)s/sources/cxx-stl/gnu-libstdc++/4.7/libs/armeabi-v7a/include -I%(androidndkdir)s/sources/cxx-stl/gnu-libstdc++/4.7/include -I%(androidndkdir)s/sources/cxx-stl/gnu-libstdc++/4.8/libs/armeabi-v7a/include -I%(androidndkdir)s/sources/cxx-stl/gnu-libstdc++/4.8/include
android_flags = -D_SIZE_T_DEFINED_
clang_headers = -I%(clangllvmdir)s/lib/clang/3.3/include
clang_flags = -nostdinc -x c++ -std=c++11 -D CC_USE_NAVMESH
win32_clang_flags = -U __SSE__
cocos_headers = -I%(cocosdir)s/cocos -I%(cocosdir)s/cocos/platform/android -I%(cocosdir)s/external -I%(cocosdir)s/external/recast/Detour -I%(cocosdir)s/external/recast/DetourCrowd -I%(cocosdir)s/external/recast/DetourTileCache -I%(cocosdir)s/external/recast/DebugUtils -I%(cocosdir)s/external/recast/fastlz -I%(cocosdir)s/external/recast/Recast -I%(cocosdir)s/external/lua/luajit/include -I%(cocosdir)s/external/lua/tolua -I%(cocosdir)s/cocos/scripting/lua-bindings/manual
cocos_flags = -DANDROID
cxxgenerator_headers =
# extra arguments for clang
extra_arguments = %(android_headers)s %(clang_headers)s %(cxxgenerator_headers)s %(cocos_headers)s %(android_flags)s %(clang_flags)s %(cocos_flags)s %(extra_flags)s
# what headers to parse
headers = %(cocosdir)s/cocos/navmesh/CCNavMesh.h %(cocosdir)s/cocos/scripting/lua-bindings/manual/navmesh/lua_cocos2dx_navmesh_conversions.h
# what classes to produce code for. You can use regular expressions here. When testing the regular
# expression, it will be enclosed in "^$", like this: "^Menu*$".
classes = NavMesh NavMeshAgent NavMeshObstacle
# what should we skip? in the format ClassName::[function function]
# ClassName is a regular expression, but will be used like this: "^ClassName$" functions are also
# regular expressions, they will not be surrounded by "^$". If you want to skip a whole class, just
# add a single "*" as functions. See bellow for several examples. A special class name is "*", which
# will apply to all class names. This is a convenience wildcard to be able to skip similar named
# functions from all classes.
skip = NavMesh::[findPath],
NavMeshObstacle::[setRadius setHeight],
NavMeshAgent::[move]
rename_functions =
rename_classes =
# for all class names, should we remove something when registering in the target VM?
remove_prefix =
# classes for which there will be no "parent" lookup
classes_have_no_parents =
# base classes which will be skipped when their sub-classes found them.
base_classes_to_skip =
# classes that create no constructor
# Set is special and we will use a hand-written constructor
abstract_classes =
# Determining whether to use script object(js object) to control the lifecycle of native(cpp) object or the other way around. Supported values are 'yes' or 'no'.
script_control_cpp = no

1
tools/tolua/genbindings.py
View File

@ -149,6 +149,7 @@ def main():
'cocos2dx_csloader.ini' : ('cocos2dx_csloader', 'lua_cocos2dx_csloader_auto'), \
'cocos2dx_experimental_webview.ini' : ('cocos2dx_experimental_webview', 'lua_cocos2dx_experimental_webview_auto'), \
'cocos2dx_physics3d.ini' : ('cocos2dx_physics3d', 'lua_cocos2dx_physics3d_auto'), \
'cocos2dx_navmesh.ini' : ('cocos2dx_navmesh', 'lua_cocos2dx_navmesh_auto'), \
}
target = 'lua'
generator_py = '%s/generator.py' % cxx_generator_root