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

Merge branch 'v3.6' of https://github.com/Wu-Hao/cocos2d-x into v3.6

This commit is contained in:
WuHao 2015-04-27 10:44:56 +08:00
parent cd0ebc1801 7232577b23
commit c2cefadb6f
9 changed files with 61 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cocos/2d/MarchingSquare.h
View File

@ -30,6 +30,7 @@ THE SOFTWARE.
#include <string> #include <string>
#include <vector> #include <vector>
#include "base/CCConsole.h"
#include "platform/CCPlatformMacros.h" #include "platform/CCPlatformMacros.h"
#include "math/Vec2.h" #include "math/Vec2.h"

8
cocos/2d/libcocos2d.vcxproj
View File

@ -703,8 +703,8 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\chipmunk\prebuilt\win32\release-lib\*.*
<ClCompile Include="CCTransitionProgress.cpp" /> <ClCompile Include="CCTransitionProgress.cpp" />
<ClCompile Include="CCTweenFunction.cpp" /> <ClCompile Include="CCTweenFunction.cpp" />
<ClCompile Include="MarchingSquare.cpp" /> <ClCompile Include="MarchingSquare.cpp" />
<ClCompile Include="PolySprite.cpp" /> <ClCompile Include="SpritePolygon.cpp" />
<ClCompile Include="PolySpriteCache.cpp" /> <ClCompile Include="SpritePolygonCache.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\extensions\assets-manager\AssetsManager.h" /> <ClInclude Include="..\..\extensions\assets-manager\AssetsManager.h" />
@ -1289,8 +1289,8 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\chipmunk\prebuilt\win32\release-lib\*.*
<ClInclude Include="CCTransitionProgress.h" /> <ClInclude Include="CCTransitionProgress.h" />
<ClInclude Include="CCTweenFunction.h" /> <ClInclude Include="CCTweenFunction.h" />
<ClInclude Include="MarchingSquare.h" /> <ClInclude Include="MarchingSquare.h" />
<ClInclude Include="PolySprite.h" /> <ClInclude Include="SpritePolygon.h" />
<ClInclude Include="PolySpriteCache.h" /> <ClInclude Include="SpritePolygonCache.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="..\3d\CCAnimationCurve.inl" /> <None Include="..\3d\CCAnimationCurve.inl" />

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

@ -1803,15 +1803,6 @@
<ClCompile Include="..\editor-support\cocostudio\CocoStudio.cpp"> <ClCompile Include="..\editor-support\cocostudio\CocoStudio.cpp">
<Filter>cocostudio\json</Filter> <Filter>cocostudio\json</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="MarchingSquare.cpp">
<Filter>2d</Filter>
</ClCompile>
<ClCompile Include="PolySprite.cpp">
<Filter>2d</Filter>
</ClCompile>
<ClCompile Include="PolySpriteCache.cpp">
<Filter>2d</Filter>
</ClCompile>
<ClCompile Include="..\..\external\poly2tri\common\shapes.cc"> <ClCompile Include="..\..\external\poly2tri\common\shapes.cc">
<Filter>external\poly2tri\common</Filter> <Filter>external\poly2tri\common</Filter>
</ClCompile> </ClCompile>
@ -1827,6 +1818,15 @@
<ClCompile Include="..\..\external\poly2tri\sweep\sweep_context.cc"> <ClCompile Include="..\..\external\poly2tri\sweep\sweep_context.cc">
<Filter>external\poly2tri\sweep</Filter> <Filter>external\poly2tri\sweep</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="MarchingSquare.cpp">
<Filter>2d</Filter>
</ClCompile>
<ClCompile Include="SpritePolygon.cpp">
<Filter>2d</Filter>
</ClCompile>
<ClCompile Include="SpritePolygonCache.cpp">
<Filter>2d</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\physics\CCPhysicsBody.h"> <ClInclude Include="..\physics\CCPhysicsBody.h">
@ -3545,15 +3545,6 @@
<ClInclude Include="..\editor-support\cocostudio\CCObjectExtensionData.h"> <ClInclude Include="..\editor-support\cocostudio\CCObjectExtensionData.h">
<Filter>cocostudio\json</Filter> <Filter>cocostudio\json</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="MarchingSquare.h">
<Filter>2d</Filter>
</ClInclude>
<ClInclude Include="PolySprite.h">
<Filter>2d</Filter>
</ClInclude>
<ClInclude Include="PolySpriteCache.h">
<Filter>2d</Filter>
</ClInclude>
<ClInclude Include="..\..\external\poly2tri\poly2tri.h"> <ClInclude Include="..\..\external\poly2tri\poly2tri.h">
<Filter>external\poly2tri</Filter> <Filter>external\poly2tri</Filter>
</ClInclude> </ClInclude>
@ -3575,6 +3566,15 @@
<ClInclude Include="..\..\external\poly2tri\sweep\sweep_context.h"> <ClInclude Include="..\..\external\poly2tri\sweep\sweep_context.h">
<Filter>external\poly2tri\sweep</Filter> <Filter>external\poly2tri\sweep</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="MarchingSquare.h">
<Filter>2d</Filter>
</ClInclude>
<ClInclude Include="SpritePolygon.h">
<Filter>2d</Filter>
</ClInclude>
<ClInclude Include="SpritePolygonCache.h">
<Filter>2d</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="..\math\Mat4.inl"> <None Include="..\math\Mat4.inl">

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

@ -602,8 +602,8 @@
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\CCTransitionProgress.h" /> <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\CCTransitionProgress.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\CCTweenFunction.h" /> <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\CCTweenFunction.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\MarchingSquare.h" /> <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\MarchingSquare.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\PolySprite.h" /> <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\SpritePolygon.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\PolySpriteCache.h" /> <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\SpritePolygonCache.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)targetver.h" /> <ClInclude Include="$(MSBuildThisFileDirectory)targetver.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
@ -1162,8 +1162,8 @@
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\CCTransitionProgress.cpp" /> <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\CCTransitionProgress.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\CCTweenFunction.cpp" /> <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\CCTweenFunction.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\MarchingSquare.cpp" /> <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\MarchingSquare.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\PolySprite.cpp" /> <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\SpritePolygon.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\PolySpriteCache.cpp" /> <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\SpritePolygonCache.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectCapability Include="SourceItemsFromImports" /> <ProjectCapability Include="SourceItemsFromImports" />

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

@ -1746,12 +1746,6 @@
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\MarchingSquare.h"> <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\MarchingSquare.h">
<Filter>2d</Filter> <Filter>2d</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\PolySprite.h">
<Filter>2d</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\PolySpriteCache.h">
<Filter>2d</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\..\external\poly2tri\common\shapes.h"> <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\..\external\poly2tri\common\shapes.h">
<Filter>external\poly2tri\common</Filter> <Filter>external\poly2tri\common</Filter>
</ClInclude> </ClInclude>
@ -1773,6 +1767,12 @@
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\..\external\poly2tri\poly2tri.h"> <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\..\external\poly2tri\poly2tri.h">
<Filter>external\poly2tri</Filter> <Filter>external\poly2tri</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\SpritePolygon.h">
<Filter>2d</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\SpritePolygonCache.h">
<Filter>2d</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\cocos2d.cpp" /> <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\cocos2d.cpp" />
@ -3348,12 +3348,6 @@
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\MarchingSquare.cpp"> <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\MarchingSquare.cpp">
<Filter>2d</Filter> <Filter>2d</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\PolySprite.cpp">
<Filter>2d</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\PolySpriteCache.cpp">
<Filter>2d</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\..\external\poly2tri\common\shapes.cc"> <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\..\external\poly2tri\common\shapes.cc">
<Filter>external\poly2tri\common</Filter> <Filter>external\poly2tri\common</Filter>
</ClCompile> </ClCompile>
@ -3369,6 +3363,12 @@
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\..\external\poly2tri\sweep\sweep_context.cc"> <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\..\external\poly2tri\sweep\sweep_context.cc">
<Filter>external\poly2tri\sweep</Filter> <Filter>external\poly2tri\sweep</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\SpritePolygon.cpp">
<Filter>2d</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\SpritePolygonCache.cpp">
<Filter>2d</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Filter Include="2d"> <Filter Include="2d">

2
tests/cpp-tests/proj.win32/cpp-tests.vcxproj
View File

@ -204,6 +204,7 @@ xcopy "$(OutDir)..\*.dll" "$(OutDir)" /D /Y</Command>
<ClCompile Include="..\Classes\SpineTest\SpineTest.cpp" /> <ClCompile Include="..\Classes\SpineTest\SpineTest.cpp" />
<ClCompile Include="..\Classes\Sprite3DTest\DrawNode3D.cpp" /> <ClCompile Include="..\Classes\Sprite3DTest\DrawNode3D.cpp" />
<ClCompile Include="..\Classes\Sprite3DTest\Sprite3DTest.cpp" /> <ClCompile Include="..\Classes\Sprite3DTest\Sprite3DTest.cpp" />
<ClCompile Include="..\Classes\SpritePolygonTest\SpritePolygonTest.cpp" />
<ClCompile Include="..\Classes\TerrainTest\TerrainTest.cpp" /> <ClCompile Include="..\Classes\TerrainTest\TerrainTest.cpp" />
<ClCompile Include="..\Classes\TexturePackerEncryptionTest\TextureAtlasEncryptionTest.cpp" /> <ClCompile Include="..\Classes\TexturePackerEncryptionTest\TextureAtlasEncryptionTest.cpp" />
<ClCompile Include="..\Classes\TileMapTest\TileMapTest2.cpp" /> <ClCompile Include="..\Classes\TileMapTest\TileMapTest2.cpp" />
@ -405,6 +406,7 @@ xcopy "$(OutDir)..\*.dll" "$(OutDir)" /D /Y</Command>
<ClInclude Include="..\Classes\SpineTest\SpineTest.h" /> <ClInclude Include="..\Classes\SpineTest\SpineTest.h" />
<ClInclude Include="..\Classes\Sprite3DTest\DrawNode3D.h" /> <ClInclude Include="..\Classes\Sprite3DTest\DrawNode3D.h" />
<ClInclude Include="..\Classes\Sprite3DTest\Sprite3DTest.h" /> <ClInclude Include="..\Classes\Sprite3DTest\Sprite3DTest.h" />
<ClInclude Include="..\Classes\SpritePolygonTest\SpritePolygonTest.h" />
<ClInclude Include="..\Classes\TerrainTest\TerrainTest.h" /> <ClInclude Include="..\Classes\TerrainTest\TerrainTest.h" />
<ClInclude Include="..\Classes\TexturePackerEncryptionTest\TextureAtlasEncryptionTest.h" /> <ClInclude Include="..\Classes\TexturePackerEncryptionTest\TextureAtlasEncryptionTest.h" />
<ClInclude Include="..\Classes\TileMapTest\TileMapTest2.h" /> <ClInclude Include="..\Classes\TileMapTest\TileMapTest2.h" />

9
tests/cpp-tests/proj.win32/cpp-tests.vcxproj.filters
View File

@ -355,6 +355,9 @@
<Filter Include="Classes\TerrainTest"> <Filter Include="Classes\TerrainTest">
<UniqueIdentifier>{3f5069e6-78e5-4388-b614-04c0ea943b4c}</UniqueIdentifier> <UniqueIdentifier>{3f5069e6-78e5-4388-b614-04c0ea943b4c}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="Classes\SpritePolygonTest">
<UniqueIdentifier>{b35cfbde-9e13-4981-8458-f7596f089bde}</UniqueIdentifier>
</Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="main.cpp"> <ClCompile Include="main.cpp">
@ -930,6 +933,9 @@
<ClCompile Include="..\Classes\PerformanceTest\PerformanceParticle3DTest.cpp"> <ClCompile Include="..\Classes\PerformanceTest\PerformanceParticle3DTest.cpp">
<Filter>Classes\PerformanceTest</Filter> <Filter>Classes\PerformanceTest</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\Classes\SpritePolygonTest\SpritePolygonTest.cpp">
<Filter>Classes\SpritePolygonTest</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="main.h"> <ClInclude Include="main.h">
@ -1703,5 +1709,8 @@
<ClInclude Include="..\Classes\PerformanceTest\PerformanceParticle3DTest.h"> <ClInclude Include="..\Classes\PerformanceTest\PerformanceParticle3DTest.h">
<Filter>Classes\PerformanceTest</Filter> <Filter>Classes\PerformanceTest</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\Classes\SpritePolygonTest\SpritePolygonTest.h">
<Filter>Classes\SpritePolygonTest</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
</Project> </Project>

2
tests/cpp-tests/proj.win8.1-universal/cpp-tests.Shared/cpp-tests.Shared.vcxitems
View File

@ -143,6 +143,7 @@
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\SpineTest\SpineTest.cpp" /> <ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\SpineTest\SpineTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\Sprite3DTest\DrawNode3D.cpp" /> <ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\Sprite3DTest\DrawNode3D.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\Sprite3DTest\Sprite3DTest.cpp" /> <ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\Sprite3DTest\Sprite3DTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\SpritePolygonTest\SpritePolygonTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\SpriteTest\SpriteTest.cpp" /> <ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\SpriteTest\SpriteTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\TerrainTest\TerrainTest.cpp" /> <ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\TerrainTest\TerrainTest.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\testBasic.cpp" /> <ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\testBasic.cpp" />
@ -407,6 +408,7 @@
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\SpineTest\SpineTest.h" /> <ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\SpineTest\SpineTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\Sprite3DTest\DrawNode3D.h" /> <ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\Sprite3DTest\DrawNode3D.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\Sprite3DTest\Sprite3DTest.h" /> <ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\Sprite3DTest\Sprite3DTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\SpritePolygonTest\SpritePolygonTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\SpriteTest\SpriteTest.h" /> <ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\SpriteTest\SpriteTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\TerrainTest\TerrainTest.h" /> <ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\TerrainTest\TerrainTest.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\testBasic.h" /> <ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\testBasic.h" />

9
tests/cpp-tests/proj.win8.1-universal/cpp-tests.Shared/cpp-tests.Shared.vcxitems.filters
View File

@ -778,6 +778,9 @@
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\TerrainTest\TerrainTest.cpp"> <ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\TerrainTest\TerrainTest.cpp">
<Filter>Classes\TerrainTest</Filter> <Filter>Classes\TerrainTest</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\SpritePolygonTest\SpritePolygonTest.cpp">
<Filter>Classes\SpritePolygonTest</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\ActionManagerTest\ActionManagerTest.cpp"> <ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\ActionManagerTest\ActionManagerTest.cpp">
@ -1683,6 +1686,9 @@
<Filter Include="Classes\TerrainTest"> <Filter Include="Classes\TerrainTest">
<UniqueIdentifier>{56386912-b41e-4559-bd2c-b256434179d4}</UniqueIdentifier> <UniqueIdentifier>{56386912-b41e-4559-bd2c-b256434179d4}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="Classes\SpritePolygonTest">
<UniqueIdentifier>{ee1c5d87-3c80-4a10-892e-985fcd93a6c1}</UniqueIdentifier>
</Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Page Include="$(MSBuildThisFileDirectory)..\..\..\..\cocos\platform\win8.1-universal\OpenGLESPage.xaml" /> <Page Include="$(MSBuildThisFileDirectory)..\..\..\..\cocos\platform\win8.1-universal\OpenGLESPage.xaml" />
@ -1716,5 +1722,8 @@
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\TerrainTest\TerrainTest.h"> <ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\TerrainTest\TerrainTest.h">
<Filter>Classes\TerrainTest</Filter> <Filter>Classes\TerrainTest</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\SpritePolygonTest\SpritePolygonTest.h">
<Filter>Classes\SpritePolygonTest</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
</Project> </Project>