Merge pull request #2900 from dumganhar/flaming0-develop

merge PR https://github.com/cocos2d/cocos2d-x/pull/2897
2013-06-15 20:22:28 -07:00 · 2013-06-15 20:22:28 -07:00 · 12d83f543b
parent b6f0c7e85b 8b298fab0e
commit 12d83f543b
6 changed files with 393 additions and 3 deletions
--- a/cocos2dx/proj.win32/cocos2d.vcxproj
+++ b/cocos2dx/proj.win32/cocos2d.vcxproj
@ -220,6 +220,8 @@ xcopy /Y /Q "$(ProjectDir)..\platform\third_party\win32\libraries\*.*" "$(OutDir
    <ClCompile Include="..\support\ccUTF8.cpp" />
    <ClCompile Include="..\support\ccUtils.cpp" />
    <ClCompile Include="..\support\CCVertex.cpp" />
+    <ClCompile Include="..\support\component\CCComponent.cpp" />
+    <ClCompile Include="..\support\component\CCComponentContainer.cpp" />
    <ClCompile Include="..\support\tinyxml2\tinyxml2.cpp" />
    <ClCompile Include="..\support\TransformUtils.cpp" />
    <ClCompile Include="..\support\data_support\ccCArray.cpp" />
@ -379,6 +381,8 @@ xcopy /Y /Q "$(ProjectDir)..\platform\third_party\win32\libraries\*.*" "$(OutDir
    <ClInclude Include="..\support\ccUTF8.h" />
    <ClInclude Include="..\support\ccUtils.h" />
    <ClInclude Include="..\support\CCVertex.h" />
+    <ClInclude Include="..\support\component\CCComponent.h" />
+    <ClInclude Include="..\support\component\CCComponentContainer.h" />
    <ClInclude Include="..\support\tinyxml2\tinyxml2.h" />
    <ClInclude Include="..\support\TransformUtils.h" />
    <ClInclude Include="..\support\data_support\ccCArray.h" />
--- a/cocos2dx/proj.win32/cocos2d.vcxproj.filters
+++ b/cocos2dx/proj.win32/cocos2d.vcxproj.filters
@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
    <Filter Include="base_nodes">
@ -100,6 +100,9 @@
    <Filter Include="support\user_default">
      <UniqueIdentifier>{c45b97e8-fa1f-4e58-8ec5-d46371c2dd26}</UniqueIdentifier>
    </Filter>
+    <Filter Include="support\component">
+      <UniqueIdentifier>{caa78ce0-9b58-4314-b117-1acae278691e}</UniqueIdentifier>
+    </Filter>
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="..\base_nodes\CCAtlasNode.cpp">
@ -468,6 +471,12 @@
    <ClCompile Include="..\textures\CCTextureETC.cpp">
      <Filter>textures</Filter>
    </ClCompile>
+    <ClCompile Include="..\support\component\CCComponent.cpp">
+      <Filter>support\component</Filter>
+    </ClCompile>
+    <ClCompile Include="..\support\component\CCComponentContainer.cpp">
+      <Filter>support\component</Filter>
+    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="..\base_nodes\CCAtlasNode.h">
@ -942,5 +951,12 @@
    <ClInclude Include="..\textures\CCTextureETC.h">
      <Filter>textures</Filter>
    </ClInclude>
+    <ClInclude Include="..\ccFPSImages.h" />
+    <ClInclude Include="..\support\component\CCComponentContainer.h">
+      <Filter>support\component</Filter>
+    </ClInclude>
+    <ClInclude Include="..\support\component\CCComponent.h">
+      <Filter>support\component</Filter>
+    </ClInclude>
  </ItemGroup>
 </Project>
--- a/extensions/proj.win32/libExtensions.vcxproj
+++ b/extensions/proj.win32/libExtensions.vcxproj
@ -92,6 +92,32 @@
  </ItemDefinitionGroup>
  <ItemGroup>
    <ClCompile Include="..\AssetsManager\AssetsManager.cpp" />
+    <ClCompile Include="..\CCArmature\animation\CCArmatureAnimation.cpp" />
+    <ClCompile Include="..\CCArmature\animation\CCProcessBase.cpp" />
+    <ClCompile Include="..\CCArmature\animation\CCTween.cpp" />
+    <ClCompile Include="..\CCArmature\CCArmature.cpp" />
+    <ClCompile Include="..\CCArmature\CCBone.cpp" />
+    <ClCompile Include="..\CCArmature\datas\CCDatas.cpp" />
+    <ClCompile Include="..\CCArmature\display\CCBatchNode.cpp" />
+    <ClCompile Include="..\CCArmature\display\CCDecorativeDisplay.cpp" />
+    <ClCompile Include="..\CCArmature\display\CCDisplayFactory.cpp" />
+    <ClCompile Include="..\CCArmature\display\CCDisplayManager.cpp" />
+    <ClCompile Include="..\CCArmature\display\CCShaderNode.cpp" />
+    <ClCompile Include="..\CCArmature\display\CCSkin.cpp" />
+    <ClCompile Include="..\CCArmature\external_tool\CCTexture2DMutable.cpp" />
+    <ClCompile Include="..\CCArmature\external_tool\GLES-Render.cpp" />
+    <ClCompile Include="..\CCArmature\external_tool\Json\CSContentJsonDictionary.cpp" />
+    <ClCompile Include="..\CCArmature\external_tool\Json\lib_json\json_reader.cpp" />
+    <ClCompile Include="..\CCArmature\external_tool\Json\lib_json\json_value.cpp" />
+    <ClCompile Include="..\CCArmature\external_tool\Json\lib_json\json_writer.cpp" />
+    <ClCompile Include="..\CCArmature\physics\CCColliderDetector.cpp" />
+    <ClCompile Include="..\CCArmature\physics\CCPhysicsWorld.cpp" />
+    <ClCompile Include="..\CCArmature\utils\CCArmatureDataManager.cpp" />
+    <ClCompile Include="..\CCArmature\utils\CCDataReaderHelper.cpp" />
+    <ClCompile Include="..\CCArmature\utils\CCSpriteFrameCacheHelper.cpp" />
+    <ClCompile Include="..\CCArmature\utils\CCTransformHelp.cpp" />
+    <ClCompile Include="..\CCArmature\utils\CCTweenFunction.cpp" />
+    <ClCompile Include="..\CCArmature\utils\CCUtilMath.cpp" />
    <ClCompile Include="..\CCBReader\CCBAnimationManager.cpp" />
    <ClCompile Include="..\CCBReader\CCBFileLoader.cpp" />
    <ClCompile Include="..\CCBReader\CCBKeyframe.cpp" />
@ -115,6 +141,10 @@
    <ClCompile Include="..\CCBReader\CCScale9SpriteLoader.cpp" />
    <ClCompile Include="..\CCBReader\CCScrollViewLoader.cpp" />
    <ClCompile Include="..\CCBReader\CCSpriteLoader.cpp" />
+    <ClCompile Include="..\Components\CCComAttribute.cpp" />
+    <ClCompile Include="..\Components\CCComAudio.cpp" />
+    <ClCompile Include="..\Components\CCComController.cpp" />
+    <ClCompile Include="..\Components\CCInputDelegate.cpp" />
    <ClCompile Include="..\GUI\CCControlExtension\CCControl.cpp" />
    <ClCompile Include="..\GUI\CCControlExtension\CCControlButton.cpp" />
    <ClCompile Include="..\GUI\CCControlExtension\CCControlColourPicker.cpp" />
@ -163,6 +193,42 @@
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="..\AssetsManager\AssetsManager.h" />
+    <ClInclude Include="..\CCArmature\animation\CCArmatureAnimation.h" />
+    <ClInclude Include="..\CCArmature\animation\CCProcessBase.h" />
+    <ClInclude Include="..\CCArmature\animation\CCTween.h" />
+    <ClInclude Include="..\CCArmature\CCArmature.h" />
+    <ClInclude Include="..\CCArmature\CCBone.h" />
+    <ClInclude Include="..\CCArmature\datas\CCDatas.h" />
+    <ClInclude Include="..\CCArmature\display\CCBatchNode.h" />
+    <ClInclude Include="..\CCArmature\display\CCDecorativeDisplay.h" />
+    <ClInclude Include="..\CCArmature\display\CCDisplayFactory.h" />
+    <ClInclude Include="..\CCArmature\display\CCDisplayManager.h" />
+    <ClInclude Include="..\CCArmature\display\CCShaderNode.h" />
+    <ClInclude Include="..\CCArmature\display\CCSkin.h" />
+    <ClInclude Include="..\CCArmature\external_tool\CCTexture2DMutable.h" />
+    <ClInclude Include="..\CCArmature\external_tool\GLES-Render.h" />
+    <ClInclude Include="..\CCArmature\external_tool\Json\CSContentJsonDictionary.h" />
+    <ClInclude Include="..\CCArmature\external_tool\Json\lib_json\autolink.h" />
+    <ClInclude Include="..\CCArmature\external_tool\Json\lib_json\config.h" />
+    <ClInclude Include="..\CCArmature\external_tool\Json\lib_json\features.h" />
+    <ClInclude Include="..\CCArmature\external_tool\Json\lib_json\forwards.h" />
+    <ClInclude Include="..\CCArmature\external_tool\Json\lib_json\json_batchallocator.h" />
+    <ClInclude Include="..\CCArmature\external_tool\Json\lib_json\json_lib.h" />
+    <ClInclude Include="..\CCArmature\external_tool\Json\lib_json\json_tool.h" />
+    <ClInclude Include="..\CCArmature\external_tool\Json\lib_json\reader.h" />
+    <ClInclude Include="..\CCArmature\external_tool\Json\lib_json\value.h" />
+    <ClInclude Include="..\CCArmature\external_tool\Json\lib_json\writer.h" />
+    <ClInclude Include="..\CCArmature\external_tool\sigslot.h" />
+    <ClInclude Include="..\CCArmature\physics\CCColliderDetector.h" />
+    <ClInclude Include="..\CCArmature\physics\CCPhysicsWorld.h" />
+    <ClInclude Include="..\CCArmature\utils\CCArmatureDataManager.h" />
+    <ClInclude Include="..\CCArmature\utils\CCArmatureDefine.h" />
+    <ClInclude Include="..\CCArmature\utils\CCConstValue.h" />
+    <ClInclude Include="..\CCArmature\utils\CCDataReaderHelper.h" />
+    <ClInclude Include="..\CCArmature\utils\CCSpriteFrameCacheHelper.h" />
+    <ClInclude Include="..\CCArmature\utils\CCTransformHelp.h" />
+    <ClInclude Include="..\CCArmature\utils\CCTweenFunction.h" />
+    <ClInclude Include="..\CCArmature\utils\CCUtilMath.h" />
    <ClInclude Include="..\CCBReader\CCBAnimationManager.h" />
    <ClInclude Include="..\CCBReader\CCBFileLoader.h" />
    <ClInclude Include="..\CCBReader\CCBKeyframe.h" />
@ -190,6 +256,10 @@
    <ClInclude Include="..\CCBReader\CCScale9SpriteLoader.h" />
    <ClInclude Include="..\CCBReader\CCScrollViewLoader.h" />
    <ClInclude Include="..\CCBReader\CCSpriteLoader.h" />
+    <ClInclude Include="..\Components\CCComAttribute.h" />
+    <ClInclude Include="..\Components\CCComAudio.h" />
+    <ClInclude Include="..\Components\CCComController.h" />
+    <ClInclude Include="..\Components\CCInputDelegate.h" />
    <ClInclude Include="..\GUI\CCControlExtension\CCControl.h" />
    <ClInclude Include="..\GUI\CCControlExtension\CCControlButton.h" />
    <ClInclude Include="..\GUI\CCControlExtension\CCControlColourPicker.h" />
@ -243,6 +313,11 @@
    <ClInclude Include="..\spine\spine.h" />
    <ClInclude Include="Win32InputBox.h" />
  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\CCArmature\external_tool\Json\lib_json\json_internalarray.inl" />
+    <None Include="..\CCArmature\external_tool\Json\lib_json\json_internalmap.inl" />
+    <None Include="..\CCArmature\external_tool\Json\lib_json\json_valueiterator.inl" />
+  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
  </ImportGroup>
--- a/extensions/proj.win32/libExtensions.vcxproj.filters
+++ b/extensions/proj.win32/libExtensions.vcxproj.filters
@ -31,6 +31,30 @@
    <Filter Include="network">
      <UniqueIdentifier>{2a7741ff-87a5-41c8-8e51-d7a1cf0c8e4d}</UniqueIdentifier>
    </Filter>
+    <Filter Include="CCArmature">
+      <UniqueIdentifier>{cf3469d5-421b-4990-a9be-4cd95129fb73}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="CCArmature\animation">
+      <UniqueIdentifier>{f48d1291-33fe-49a1-8f9f-4d203e782d4a}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="CCArmature\datas">
+      <UniqueIdentifier>{043f8489-822e-43c8-8d9d-5d171a701663}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="CCArmature\display">
+      <UniqueIdentifier>{b8c65820-b5c9-4bd6-83c8-180fdc6100fb}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="CCArmature\physics">
+      <UniqueIdentifier>{fa9a165e-cc7c-45e9-ae4f-cae3c2f16e6a}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="CCArmature\utils">
+      <UniqueIdentifier>{5e5b3d7d-62a7-493e-a130-ed72ee7c65f2}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Components">
+      <UniqueIdentifier>{5258a1e1-5d50-4fee-9216-da08d2ec19de}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="CCArmature\external_tool">
+      <UniqueIdentifier>{bd365bbb-6972-4073-b268-8360df428166}</UniqueIdentifier>
+    </Filter>
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="..\GUI\CCScrollView\CCScrollView.cpp">
@ -240,6 +264,96 @@
    <ClCompile Include="..\network\Websocket.cpp">
      <Filter>network</Filter>
    </ClCompile>
+    <ClCompile Include="..\CCArmature\CCArmature.cpp">
+      <Filter>CCArmature</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CCArmature\CCBone.cpp">
+      <Filter>CCArmature</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CCArmature\animation\CCArmatureAnimation.cpp">
+      <Filter>CCArmature\animation</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CCArmature\animation\CCProcessBase.cpp">
+      <Filter>CCArmature\animation</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CCArmature\animation\CCTween.cpp">
+      <Filter>CCArmature\animation</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CCArmature\datas\CCDatas.cpp">
+      <Filter>CCArmature\datas</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CCArmature\display\CCBatchNode.cpp">
+      <Filter>CCArmature\display</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CCArmature\display\CCDecorativeDisplay.cpp">
+      <Filter>CCArmature\display</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CCArmature\display\CCDisplayFactory.cpp">
+      <Filter>CCArmature\display</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CCArmature\display\CCDisplayManager.cpp">
+      <Filter>CCArmature\display</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CCArmature\display\CCShaderNode.cpp">
+      <Filter>CCArmature\display</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CCArmature\display\CCSkin.cpp">
+      <Filter>CCArmature\display</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CCArmature\physics\CCColliderDetector.cpp">
+      <Filter>CCArmature\physics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CCArmature\physics\CCPhysicsWorld.cpp">
+      <Filter>CCArmature\physics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CCArmature\utils\CCArmatureDataManager.cpp">
+      <Filter>CCArmature\utils</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CCArmature\utils\CCDataReaderHelper.cpp">
+      <Filter>CCArmature\utils</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CCArmature\utils\CCSpriteFrameCacheHelper.cpp">
+      <Filter>CCArmature\utils</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CCArmature\utils\CCTransformHelp.cpp">
+      <Filter>CCArmature\utils</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CCArmature\utils\CCTweenFunction.cpp">
+      <Filter>CCArmature\utils</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CCArmature\utils\CCUtilMath.cpp">
+      <Filter>CCArmature\utils</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Components\CCComAttribute.cpp">
+      <Filter>Components</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Components\CCComAudio.cpp">
+      <Filter>Components</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Components\CCComController.cpp">
+      <Filter>Components</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Components\CCInputDelegate.cpp">
+      <Filter>Components</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CCArmature\external_tool\CCTexture2DMutable.cpp">
+      <Filter>CCArmature\external_tool</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CCArmature\external_tool\GLES-Render.cpp">
+      <Filter>CCArmature\external_tool</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CCArmature\external_tool\Json\CSContentJsonDictionary.cpp">
+      <Filter>CCArmature\external_tool</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CCArmature\external_tool\Json\lib_json\json_reader.cpp">
+      <Filter>CCArmature\external_tool</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CCArmature\external_tool\Json\lib_json\json_value.cpp">
+      <Filter>CCArmature\external_tool</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CCArmature\external_tool\Json\lib_json\json_writer.cpp">
+      <Filter>CCArmature\external_tool</Filter>
+    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="..\GUI\CCScrollView\CCScrollView.h">
@ -478,5 +592,136 @@
    <ClInclude Include="..\network\Websocket.h">
      <Filter>network</Filter>
    </ClInclude>
+    <ClInclude Include="..\CCArmature\CCArmature.h">
+      <Filter>CCArmature</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CCArmature\CCBone.h">
+      <Filter>CCArmature</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CCArmature\animation\CCArmatureAnimation.h">
+      <Filter>CCArmature\animation</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CCArmature\animation\CCProcessBase.h">
+      <Filter>CCArmature\animation</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CCArmature\animation\CCTween.h">
+      <Filter>CCArmature\animation</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CCArmature\datas\CCDatas.h">
+      <Filter>CCArmature\datas</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CCArmature\display\CCBatchNode.h">
+      <Filter>CCArmature\display</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CCArmature\display\CCDecorativeDisplay.h">
+      <Filter>CCArmature\display</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CCArmature\display\CCDisplayFactory.h">
+      <Filter>CCArmature\display</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CCArmature\display\CCDisplayManager.h">
+      <Filter>CCArmature\display</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CCArmature\display\CCShaderNode.h">
+      <Filter>CCArmature\display</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CCArmature\display\CCSkin.h">
+      <Filter>CCArmature\display</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CCArmature\physics\CCColliderDetector.h">
+      <Filter>CCArmature\physics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CCArmature\physics\CCPhysicsWorld.h">
+      <Filter>CCArmature\physics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CCArmature\utils\CCArmatureDataManager.h">
+      <Filter>CCArmature\utils</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CCArmature\utils\CCArmatureDefine.h">
+      <Filter>CCArmature\utils</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CCArmature\utils\CCConstValue.h">
+      <Filter>CCArmature\utils</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CCArmature\utils\CCDataReaderHelper.h">
+      <Filter>CCArmature\utils</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CCArmature\utils\CCSpriteFrameCacheHelper.h">
+      <Filter>CCArmature\utils</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CCArmature\utils\CCTransformHelp.h">
+      <Filter>CCArmature\utils</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CCArmature\utils\CCTweenFunction.h">
+      <Filter>CCArmature\utils</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CCArmature\utils\CCUtilMath.h">
+      <Filter>CCArmature\utils</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Components\CCComAttribute.h">
+      <Filter>Components</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Components\CCComAudio.h">
+      <Filter>Components</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Components\CCComController.h">
+      <Filter>Components</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Components\CCInputDelegate.h">
+      <Filter>Components</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CCArmature\external_tool\CCTexture2DMutable.h">
+      <Filter>CCArmature\external_tool</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CCArmature\external_tool\GLES-Render.h">
+      <Filter>CCArmature\external_tool</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CCArmature\external_tool\sigslot.h">
+      <Filter>CCArmature\external_tool</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CCArmature\external_tool\Json\CSContentJsonDictionary.h">
+      <Filter>CCArmature\external_tool</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CCArmature\external_tool\Json\lib_json\autolink.h">
+      <Filter>CCArmature\external_tool</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CCArmature\external_tool\Json\lib_json\config.h">
+      <Filter>CCArmature\external_tool</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CCArmature\external_tool\Json\lib_json\features.h">
+      <Filter>CCArmature\external_tool</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CCArmature\external_tool\Json\lib_json\forwards.h">
+      <Filter>CCArmature\external_tool</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CCArmature\external_tool\Json\lib_json\json_batchallocator.h">
+      <Filter>CCArmature\external_tool</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CCArmature\external_tool\Json\lib_json\json_lib.h">
+      <Filter>CCArmature\external_tool</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CCArmature\external_tool\Json\lib_json\json_tool.h">
+      <Filter>CCArmature\external_tool</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CCArmature\external_tool\Json\lib_json\reader.h">
+      <Filter>CCArmature\external_tool</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CCArmature\external_tool\Json\lib_json\value.h">
+      <Filter>CCArmature\external_tool</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CCArmature\external_tool\Json\lib_json\writer.h">
+      <Filter>CCArmature\external_tool</Filter>
+    </ClInclude>
  </ItemGroup>
-</Project>
+  <ItemGroup>
+    <None Include="..\CCArmature\external_tool\Json\lib_json\json_internalarray.inl">
+      <Filter>CCArmature\external_tool</Filter>
+    </None>
+    <None Include="..\CCArmature\external_tool\Json\lib_json\json_internalmap.inl">
+      <Filter>CCArmature\external_tool</Filter>
+    </None>
+    <None Include="..\CCArmature\external_tool\Json\lib_json\json_valueiterator.inl">
+      <Filter>CCArmature\external_tool</Filter>
+    </None>
+  </ItemGroup>
+</Project>
--- a/external/chipmunk/include/chipmunk/chipmunk.h
+++ b/external/chipmunk/include/chipmunk/chipmunk.h
@ -23,7 +23,9 @@
 #define CHIPMUNK_HEADER

 #ifdef _MSC_VER
-    #define _USE_MATH_DEFINES
+	#ifndef _USE_MATH_DEFINES
+	#define _USE_MATH_DEFINES
+	#endif
 #endif

 #include <stdlib.h>
--- a/samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj.filters
+++ b/samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj.filters
@ -226,6 +226,12 @@
    <Filter Include="Classes\ConfigurationTest">
      <UniqueIdentifier>{81ec2355-7efd-49e0-b6cb-b1bba23fbbc8}</UniqueIdentifier>
    </Filter>
+    <Filter Include="Classes\ExtensionsTest\ArmatureTest">
+      <UniqueIdentifier>{f0a099b9-0cf3-4217-a311-8d2f84e503c9}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Classes\ExtensionsTest\ComponentsTest">
+      <UniqueIdentifier>{285cdfb8-5749-4969-ae31-99ec25f15e6e}</UniqueIdentifier>
+    </Filter>
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="main.cpp">
@ -516,6 +522,27 @@
    <ClCompile Include="..\Classes\BaseTest.cpp">
      <Filter>Classes</Filter>
    </ClCompile>
+    <ClCompile Include="..\Classes\ExtensionsTest\ArmatureTest\ArmatureScene.cpp">
+      <Filter>Classes\ExtensionsTest\ArmatureTest</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Classes\ExtensionsTest\ComponentsTest\ComponentsTestScene.cpp">
+      <Filter>Classes\ExtensionsTest\ComponentsTest</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Classes\ExtensionsTest\ComponentsTest\EnemyController.cpp">
+      <Filter>Classes\ExtensionsTest\ComponentsTest</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Classes\ExtensionsTest\ComponentsTest\GameOverScene.cpp">
+      <Filter>Classes\ExtensionsTest\ComponentsTest</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Classes\ExtensionsTest\ComponentsTest\PlayerController.cpp">
+      <Filter>Classes\ExtensionsTest\ComponentsTest</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Classes\ExtensionsTest\ComponentsTest\ProjectileController.cpp">
+      <Filter>Classes\ExtensionsTest\ComponentsTest</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Classes\ExtensionsTest\ComponentsTest\SceneController.cpp">
+      <Filter>Classes\ExtensionsTest\ComponentsTest</Filter>
+    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="main.h">
@ -986,5 +1013,26 @@
    <ClInclude Include="..\Classes\BaseTest.h">
      <Filter>Classes</Filter>
    </ClInclude>
+    <ClInclude Include="..\Classes\ExtensionsTest\ArmatureTest\ArmatureScene.h">
+      <Filter>Classes\ExtensionsTest\ArmatureTest</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Classes\ExtensionsTest\ComponentsTest\ComponentsTestScene.h">
+      <Filter>Classes\ExtensionsTest\ComponentsTest</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Classes\ExtensionsTest\ComponentsTest\EnemyController.h">
+      <Filter>Classes\ExtensionsTest\ComponentsTest</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Classes\ExtensionsTest\ComponentsTest\GameOverScene.h">
+      <Filter>Classes\ExtensionsTest\ComponentsTest</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Classes\ExtensionsTest\ComponentsTest\PlayerController.h">
+      <Filter>Classes\ExtensionsTest\ComponentsTest</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Classes\ExtensionsTest\ComponentsTest\ProjectileController.h">
+      <Filter>Classes\ExtensionsTest\ComponentsTest</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Classes\ExtensionsTest\ComponentsTest\SceneController.h">
+      <Filter>Classes\ExtensionsTest\ComponentsTest</Filter>
+    </ClInclude>
  </ItemGroup>
 </Project>