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

fixed compile fail

This commit is contained in:
Dhilan007 2014-04-28 11:42:54 +08:00
parent 0133551f43
commit 35f83fc40a
7 changed files with 113 additions and 435 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cocos/2d/CCRenderTexture.cpp
View File

@ -535,12 +535,9 @@ void RenderTexture::onBegin()
director->setProjection(director->getProjection()); director->setProjection(director->getProjection());
#if CC_TARGET_PLATFORM == CC_PLATFORM_WP8 #if CC_TARGET_PLATFORM == CC_PLATFORM_WP8
kmMat4 modifiedProjection; Matrix modifiedProjection = director->getMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_PROJECTION);
kmGLGetMatrix(KM_GL_PROJECTION, &modifiedProjection); modifiedProjection = CCEGLView::sharedOpenGLView()->getReverseOrientationMatrix() * modifiedProjection;
kmMat4Multiply(&modifiedProjection, CCEGLView::sharedOpenGLView()->getReverseOrientationMatrix(), &modifiedProjection); director->loadMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_PROJECTION,modifiedProjection);
kmGLMatrixMode(KM_GL_PROJECTION);
kmGLLoadMatrix(&modifiedProjection);
kmGLMatrixMode(KM_GL_MODELVIEW);
#endif #endif
const Size& texSize = _texture->getContentSizeInPixels(); const Size& texSize = _texture->getContentSizeInPixels();

346
cocos/2d/cocos2d_wp8.vcxproj
View File

@ -221,316 +221,19 @@
<ClCompile Include="..\base\CCValue.cpp" /> <ClCompile Include="..\base\CCValue.cpp" />
<ClCompile Include="..\base\etc1.cpp" /> <ClCompile Include="..\base\etc1.cpp" />
<ClCompile Include="..\base\s3tc.cpp" /> <ClCompile Include="..\base\s3tc.cpp" />
<ClCompile Include="..\cocos2d.cpp" />
<ClCompile Include="..\deprecated\CCArray.cpp" /> <ClCompile Include="..\deprecated\CCArray.cpp" />
<ClCompile Include="..\deprecated\CCDeprecated.cpp" /> <ClCompile Include="..\deprecated\CCDeprecated.cpp" />
<ClCompile Include="..\deprecated\CCDictionary.cpp" /> <ClCompile Include="..\deprecated\CCDictionary.cpp" />
<ClCompile Include="..\deprecated\CCNotificationCenter.cpp" /> <ClCompile Include="..\deprecated\CCNotificationCenter.cpp" />
<ClCompile Include="..\deprecated\CCSet.cpp" /> <ClCompile Include="..\deprecated\CCSet.cpp" />
<ClCompile Include="..\deprecated\CCString.cpp" /> <ClCompile Include="..\deprecated\CCString.cpp" />
<ClCompile Include="..\math\kazmath\kazmath\aabb.c"> <ClCompile Include="..\math\MathUtil.cpp" />
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</CompileAsWinRT> <ClCompile Include="..\math\Matrix.cpp" />
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</CompileAsWinRT> <ClCompile Include="..\math\Quaternion.cpp" />
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsWinRT> <ClCompile Include="..\math\Vector2.cpp" />
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsWinRT> <ClCompile Include="..\math\Vector3.cpp" />
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">CompileAsCpp</CompileAs> <ClCompile Include="..\math\Vector4.cpp" />
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">CompileAsCpp</CompileAs>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsCpp</CompileAs>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
</ForcedIncludeFiles>
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
</ForcedIncludeFiles>
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
</ForcedIncludeFiles>
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
</ForcedIncludeFiles>
</ClCompile>
<ClCompile Include="..\math\kazmath\kazmath\GL\mat4stack.c">
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</CompileAsWinRT>
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</CompileAsWinRT>
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsWinRT>
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsWinRT>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">CompileAsCpp</CompileAs>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">CompileAsCpp</CompileAs>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsCpp</CompileAs>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
</ForcedIncludeFiles>
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
</ForcedIncludeFiles>
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
</ForcedIncludeFiles>
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
</ForcedIncludeFiles>
</ClCompile>
<ClCompile Include="..\math\kazmath\kazmath\GL\matrix.c">
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</CompileAsWinRT>
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</CompileAsWinRT>
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsWinRT>
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsWinRT>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">CompileAsCpp</CompileAs>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">CompileAsCpp</CompileAs>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsCpp</CompileAs>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
</ForcedIncludeFiles>
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
</ForcedIncludeFiles>
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
</ForcedIncludeFiles>
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
</ForcedIncludeFiles>
</ClCompile>
<ClCompile Include="..\math\kazmath\kazmath\mat3.c">
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</CompileAsWinRT>
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</CompileAsWinRT>
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsWinRT>
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsWinRT>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">CompileAsCpp</CompileAs>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">CompileAsCpp</CompileAs>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsCpp</CompileAs>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
</ForcedIncludeFiles>
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
</ForcedIncludeFiles>
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
</ForcedIncludeFiles>
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
</ForcedIncludeFiles>
</ClCompile>
<ClCompile Include="..\math\kazmath\kazmath\mat4.c">
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</CompileAsWinRT>
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</CompileAsWinRT>
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsWinRT>
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsWinRT>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">CompileAsCpp</CompileAs>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">CompileAsCpp</CompileAs>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsCpp</CompileAs>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
</ForcedIncludeFiles>
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
</ForcedIncludeFiles>
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
</ForcedIncludeFiles>
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
</ForcedIncludeFiles>
</ClCompile>
<ClCompile Include="..\math\kazmath\kazmath\neon_matrix_impl.c">
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</CompileAsWinRT>
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</CompileAsWinRT>
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsWinRT>
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsWinRT>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">CompileAsCpp</CompileAs>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">CompileAsCpp</CompileAs>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsCpp</CompileAs>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
</ForcedIncludeFiles>
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
</ForcedIncludeFiles>
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
</ForcedIncludeFiles>
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
</ForcedIncludeFiles>
</ClCompile>
<ClCompile Include="..\math\kazmath\kazmath\plane.c">
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</CompileAsWinRT>
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</CompileAsWinRT>
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsWinRT>
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsWinRT>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">CompileAsCpp</CompileAs>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">CompileAsCpp</CompileAs>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsCpp</CompileAs>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
</ForcedIncludeFiles>
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
</ForcedIncludeFiles>
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
</ForcedIncludeFiles>
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
</ForcedIncludeFiles>
</ClCompile>
<ClCompile Include="..\math\kazmath\kazmath\quaternion.c">
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</CompileAsWinRT>
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</CompileAsWinRT>
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsWinRT>
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsWinRT>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">CompileAsCpp</CompileAs>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">CompileAsCpp</CompileAs>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsCpp</CompileAs>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
</ForcedIncludeFiles>
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
</ForcedIncludeFiles>
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
</ForcedIncludeFiles>
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
</ForcedIncludeFiles>
</ClCompile>
<ClCompile Include="..\math\kazmath\kazmath\ray2.c">
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</CompileAsWinRT>
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</CompileAsWinRT>
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsWinRT>
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsWinRT>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">CompileAsCpp</CompileAs>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">CompileAsCpp</CompileAs>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsCpp</CompileAs>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
</ForcedIncludeFiles>
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
</ForcedIncludeFiles>
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
</ForcedIncludeFiles>
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
</ForcedIncludeFiles>
</ClCompile>
<ClCompile Include="..\math\kazmath\kazmath\ray3.c">
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">CompileAsCpp</CompileAs>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">CompileAsCpp</CompileAs>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsCpp</CompileAs>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
</ForcedIncludeFiles>
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
</ForcedIncludeFiles>
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
</ForcedIncludeFiles>
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
</ForcedIncludeFiles>
</ClCompile>
<ClCompile Include="..\math\kazmath\kazmath\utility.c">
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</CompileAsWinRT>
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</CompileAsWinRT>
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsWinRT>
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsWinRT>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">CompileAsCpp</CompileAs>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">CompileAsCpp</CompileAs>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsCpp</CompileAs>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
</ForcedIncludeFiles>
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
</ForcedIncludeFiles>
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
</ForcedIncludeFiles>
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
</ForcedIncludeFiles>
</ClCompile>
<ClCompile Include="..\math\kazmath\kazmath\vec2.c">
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</CompileAsWinRT>
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</CompileAsWinRT>
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsWinRT>
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsWinRT>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">CompileAsCpp</CompileAs>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">CompileAsCpp</CompileAs>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsCpp</CompileAs>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
</ForcedIncludeFiles>
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
</ForcedIncludeFiles>
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
</ForcedIncludeFiles>
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
</ForcedIncludeFiles>
</ClCompile>
<ClCompile Include="..\math\kazmath\kazmath\vec3.c">
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</CompileAsWinRT>
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</CompileAsWinRT>
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsWinRT>
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsWinRT>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">CompileAsCpp</CompileAs>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">CompileAsCpp</CompileAs>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsCpp</CompileAs>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
</ForcedIncludeFiles>
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
</ForcedIncludeFiles>
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
</ForcedIncludeFiles>
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
</ForcedIncludeFiles>
</ClCompile>
<ClCompile Include="..\math\kazmath\kazmath\vec4.c">
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</CompileAsWinRT>
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</CompileAsWinRT>
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsWinRT>
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsWinRT>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">CompileAsCpp</CompileAs>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">CompileAsCpp</CompileAs>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsCpp</CompileAs>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
</ForcedIncludeFiles>
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
</ForcedIncludeFiles>
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
</ForcedIncludeFiles>
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
</ForcedIncludeFiles>
</ClCompile>
<ClCompile Include="..\physics\CCPhysicsBody.cpp" /> <ClCompile Include="..\physics\CCPhysicsBody.cpp" />
<ClCompile Include="..\physics\CCPhysicsContact.cpp" /> <ClCompile Include="..\physics\CCPhysicsContact.cpp" />
<ClCompile Include="..\physics\CCPhysicsJoint.cpp" /> <ClCompile Include="..\physics\CCPhysicsJoint.cpp" />
@ -655,7 +358,6 @@
<ClCompile Include="ccUTF8.cpp" /> <ClCompile Include="ccUTF8.cpp" />
<ClCompile Include="ccUtils.cpp" /> <ClCompile Include="ccUtils.cpp" />
<ClCompile Include="CCVertex.cpp" /> <ClCompile Include="CCVertex.cpp" />
<ClCompile Include="cocos2d.cpp" />
<ClCompile Include="platform\CCGLViewProtocol.cpp" /> <ClCompile Include="platform\CCGLViewProtocol.cpp" />
<ClCompile Include="platform\CCFileUtils.cpp" /> <ClCompile Include="platform\CCFileUtils.cpp" />
<ClCompile Include="platform\CCImage.cpp" /> <ClCompile Include="platform\CCImage.cpp" />
@ -701,7 +403,6 @@
<ClCompile Include="platform\wp8\DirectXBase.cpp" /> <ClCompile Include="platform\wp8\DirectXBase.cpp" />
<ClCompile Include="renderer\CCBatchCommand.cpp" /> <ClCompile Include="renderer\CCBatchCommand.cpp" />
<ClCompile Include="renderer\CCCustomCommand.cpp" /> <ClCompile Include="renderer\CCCustomCommand.cpp" />
<ClCompile Include="renderer\CCFrustum.cpp" />
<ClCompile Include="renderer\CCGroupCommand.cpp" /> <ClCompile Include="renderer\CCGroupCommand.cpp" />
<ClCompile Include="renderer\CCMaterialManager.cpp" /> <ClCompile Include="renderer\CCMaterialManager.cpp" />
<ClCompile Include="renderer\CCQuadCommand.cpp" /> <ClCompile Include="renderer\CCQuadCommand.cpp" />
@ -743,21 +444,14 @@
<ClInclude Include="..\deprecated\CCNotificationCenter.h" /> <ClInclude Include="..\deprecated\CCNotificationCenter.h" />
<ClInclude Include="..\deprecated\CCSet.h" /> <ClInclude Include="..\deprecated\CCSet.h" />
<ClInclude Include="..\deprecated\CCString.h" /> <ClInclude Include="..\deprecated\CCString.h" />
<ClInclude Include="..\math\kazmath\kazmath\aabb.h" /> <ClInclude Include="..\math\CCMath.h" />
<ClInclude Include="..\math\kazmath\kazmath\GL\mat4stack.h" /> <ClInclude Include="..\math\CCMathBase.h" />
<ClInclude Include="..\math\kazmath\kazmath\GL\matrix.h" /> <ClInclude Include="..\math\MathUtil.h" />
<ClInclude Include="..\math\kazmath\kazmath\kazmath.h" /> <ClInclude Include="..\math\Matrix.h" />
<ClInclude Include="..\math\kazmath\kazmath\mat3.h" /> <ClInclude Include="..\math\Quaternion.h" />
<ClInclude Include="..\math\kazmath\kazmath\mat4.h" /> <ClInclude Include="..\math\Vector2.h" />
<ClInclude Include="..\math\kazmath\kazmath\neon_matrix_impl.h" /> <ClInclude Include="..\math\Vector3.h" />
<ClInclude Include="..\math\kazmath\kazmath\plane.h" /> <ClInclude Include="..\math\Vector4.h" />
<ClInclude Include="..\math\kazmath\kazmath\quaternion.h" />
<ClInclude Include="..\math\kazmath\kazmath\ray2.h" />
<ClInclude Include="..\math\kazmath\kazmath\ray3.h" />
<ClInclude Include="..\math\kazmath\kazmath\utility.h" />
<ClInclude Include="..\math\kazmath\kazmath\vec2.h" />
<ClInclude Include="..\math\kazmath\kazmath\vec3.h" />
<ClInclude Include="..\math\kazmath\kazmath\vec4.h" />
<ClInclude Include="..\physics\CCPhysicsBody.h" /> <ClInclude Include="..\physics\CCPhysicsBody.h" />
<ClInclude Include="..\physics\CCPhysicsContact.h" /> <ClInclude Include="..\physics\CCPhysicsContact.h" />
<ClInclude Include="..\physics\CCPhysicsJoint.h" /> <ClInclude Include="..\physics\CCPhysicsJoint.h" />
@ -898,7 +592,6 @@
<ClInclude Include="platform\wp8\DirectXBase.h" /> <ClInclude Include="platform\wp8\DirectXBase.h" />
<ClInclude Include="renderer\CCBatchCommand.h" /> <ClInclude Include="renderer\CCBatchCommand.h" />
<ClInclude Include="renderer\CCCustomCommand.h" /> <ClInclude Include="renderer\CCCustomCommand.h" />
<ClInclude Include="renderer\CCFrustum.h" />
<ClInclude Include="renderer\CCGroupCommand.h" /> <ClInclude Include="renderer\CCGroupCommand.h" />
<ClInclude Include="renderer\CCMaterialManager.h" /> <ClInclude Include="renderer\CCMaterialManager.h" />
<ClInclude Include="renderer\CCQuadCommand.h" /> <ClInclude Include="renderer\CCQuadCommand.h" />
@ -912,4 +605,13 @@
<ClInclude Include="utlist.h" /> <ClInclude Include="utlist.h" />
<ClInclude Include="ZipUtils.h" /> <ClInclude Include="ZipUtils.h" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<None Include="..\math\MathUtil.inl" />
<None Include="..\math\MathUtilNeon.inl" />
<None Include="..\math\Matrix.inl" />
<None Include="..\math\Quaternion.inl" />
<None Include="..\math\Vector2.inl" />
<None Include="..\math\Vector3.inl" />
<None Include="..\math\Vector4.inl" />
</ItemGroup>
</Project> </Project>

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

@ -58,9 +58,6 @@
<Filter Include="script_support"> <Filter Include="script_support">
<UniqueIdentifier>{5b082c5c-d396-43ca-b3b1-997d0f6247d0}</UniqueIdentifier> <UniqueIdentifier>{5b082c5c-d396-43ca-b3b1-997d0f6247d0}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="kazmath">
<UniqueIdentifier>{7751500e-ac9e-4604-a96d-670b30b7d8bd}</UniqueIdentifier>
</Filter>
<Filter Include="shaders"> <Filter Include="shaders">
<UniqueIdentifier>{163895ae-8a8e-46bf-bdf2-98bb2c1347fc}</UniqueIdentifier> <UniqueIdentifier>{163895ae-8a8e-46bf-bdf2-98bb2c1347fc}</UniqueIdentifier>
</Filter> </Filter>
@ -106,6 +103,9 @@
<Filter Include="deprecated"> <Filter Include="deprecated">
<UniqueIdentifier>{5598fb0c-c012-45b6-8e43-447e7891b61d}</UniqueIdentifier> <UniqueIdentifier>{5598fb0c-c012-45b6-8e43-447e7891b61d}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="math">
<UniqueIdentifier>{9bbf7050-757b-41b1-ab15-418db52c2023}</UniqueIdentifier>
</Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\physics\CCPhysicsBody.cpp"> <ClCompile Include="..\physics\CCPhysicsBody.cpp">
@ -383,7 +383,6 @@
<ClCompile Include="ccFPSImages.c" /> <ClCompile Include="ccFPSImages.c" />
<ClCompile Include="CCScheduler.cpp" /> <ClCompile Include="CCScheduler.cpp" />
<ClCompile Include="ccTypes.cpp" /> <ClCompile Include="ccTypes.cpp" />
<ClCompile Include="cocos2d.cpp" />
<ClCompile Include="base64.cpp"> <ClCompile Include="base64.cpp">
<Filter>support</Filter> <Filter>support</Filter>
</ClCompile> </ClCompile>
@ -483,9 +482,6 @@
<ClCompile Include="renderer\CCCustomCommand.cpp"> <ClCompile Include="renderer\CCCustomCommand.cpp">
<Filter>renderer</Filter> <Filter>renderer</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="renderer\CCFrustum.cpp">
<Filter>renderer</Filter>
</ClCompile>
<ClCompile Include="renderer\CCGroupCommand.cpp"> <ClCompile Include="renderer\CCGroupCommand.cpp">
<Filter>renderer</Filter> <Filter>renderer</Filter>
</ClCompile> </ClCompile>
@ -547,48 +543,6 @@
<ClCompile Include="platform\winrt\sha1.cpp"> <ClCompile Include="platform\winrt\sha1.cpp">
<Filter>platform\winrt</Filter> <Filter>platform\winrt</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\math\kazmath\kazmath\aabb.c">
<Filter>kazmath</Filter>
</ClCompile>
<ClCompile Include="..\math\kazmath\kazmath\mat3.c">
<Filter>kazmath</Filter>
</ClCompile>
<ClCompile Include="..\math\kazmath\kazmath\mat4.c">
<Filter>kazmath</Filter>
</ClCompile>
<ClCompile Include="..\math\kazmath\kazmath\GL\mat4stack.c">
<Filter>kazmath</Filter>
</ClCompile>
<ClCompile Include="..\math\kazmath\kazmath\GL\matrix.c">
<Filter>kazmath</Filter>
</ClCompile>
<ClCompile Include="..\math\kazmath\kazmath\neon_matrix_impl.c">
<Filter>kazmath</Filter>
</ClCompile>
<ClCompile Include="..\math\kazmath\kazmath\plane.c">
<Filter>kazmath</Filter>
</ClCompile>
<ClCompile Include="..\math\kazmath\kazmath\quaternion.c">
<Filter>kazmath</Filter>
</ClCompile>
<ClCompile Include="..\math\kazmath\kazmath\ray2.c">
<Filter>kazmath</Filter>
</ClCompile>
<ClCompile Include="..\math\kazmath\kazmath\utility.c">
<Filter>kazmath</Filter>
</ClCompile>
<ClCompile Include="..\math\kazmath\kazmath\vec2.c">
<Filter>kazmath</Filter>
</ClCompile>
<ClCompile Include="..\math\kazmath\kazmath\vec4.c">
<Filter>kazmath</Filter>
</ClCompile>
<ClCompile Include="..\math\kazmath\kazmath\vec3.c">
<Filter>kazmath</Filter>
</ClCompile>
<ClCompile Include="..\math\kazmath\kazmath\ray3.c">
<Filter>kazmath</Filter>
</ClCompile>
<ClCompile Include="platform\winrt\pch.cpp"> <ClCompile Include="platform\winrt\pch.cpp">
<Filter>platform\winrt</Filter> <Filter>platform\winrt</Filter>
</ClCompile> </ClCompile>
@ -619,6 +573,25 @@
<ClCompile Include="platform\winrt\inet_ntop_winrt.cpp"> <ClCompile Include="platform\winrt\inet_ntop_winrt.cpp">
<Filter>platform\winrt</Filter> <Filter>platform\winrt</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\cocos2d.cpp" />
<ClCompile Include="..\math\MathUtil.cpp">
<Filter>math</Filter>
</ClCompile>
<ClCompile Include="..\math\Matrix.cpp">
<Filter>math</Filter>
</ClCompile>
<ClCompile Include="..\math\Quaternion.cpp">
<Filter>math</Filter>
</ClCompile>
<ClCompile Include="..\math\Vector2.cpp">
<Filter>math</Filter>
</ClCompile>
<ClCompile Include="..\math\Vector3.cpp">
<Filter>math</Filter>
</ClCompile>
<ClCompile Include="..\math\Vector4.cpp">
<Filter>math</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\physics\CCPhysicsBody.h"> <ClInclude Include="..\physics\CCPhysicsBody.h">
@ -1048,9 +1021,6 @@
<ClInclude Include="renderer\CCCustomCommand.h"> <ClInclude Include="renderer\CCCustomCommand.h">
<Filter>renderer</Filter> <Filter>renderer</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="renderer\CCFrustum.h">
<Filter>renderer</Filter>
</ClInclude>
<ClInclude Include="renderer\CCGroupCommand.h"> <ClInclude Include="renderer\CCGroupCommand.h">
<Filter>renderer</Filter> <Filter>renderer</Filter>
</ClInclude> </ClInclude>
@ -1118,51 +1088,6 @@
<ClInclude Include="platform\winrt\sha1.h"> <ClInclude Include="platform\winrt\sha1.h">
<Filter>platform\winrt</Filter> <Filter>platform\winrt</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\math\kazmath\kazmath\aabb.h">
<Filter>kazmath</Filter>
</ClInclude>
<ClInclude Include="..\math\kazmath\kazmath\kazmath.h">
<Filter>kazmath</Filter>
</ClInclude>
<ClInclude Include="..\math\kazmath\kazmath\mat3.h">
<Filter>kazmath</Filter>
</ClInclude>
<ClInclude Include="..\math\kazmath\kazmath\mat4.h">
<Filter>kazmath</Filter>
</ClInclude>
<ClInclude Include="..\math\kazmath\kazmath\GL\mat4stack.h">
<Filter>kazmath</Filter>
</ClInclude>
<ClInclude Include="..\math\kazmath\kazmath\GL\matrix.h">
<Filter>kazmath</Filter>
</ClInclude>
<ClInclude Include="..\math\kazmath\kazmath\neon_matrix_impl.h">
<Filter>kazmath</Filter>
</ClInclude>
<ClInclude Include="..\math\kazmath\kazmath\plane.h">
<Filter>kazmath</Filter>
</ClInclude>
<ClInclude Include="..\math\kazmath\kazmath\quaternion.h">
<Filter>kazmath</Filter>
</ClInclude>
<ClInclude Include="..\math\kazmath\kazmath\ray2.h">
<Filter>kazmath</Filter>
</ClInclude>
<ClInclude Include="..\math\kazmath\kazmath\utility.h">
<Filter>kazmath</Filter>
</ClInclude>
<ClInclude Include="..\math\kazmath\kazmath\vec4.h">
<Filter>kazmath</Filter>
</ClInclude>
<ClInclude Include="..\math\kazmath\kazmath\vec3.h">
<Filter>kazmath</Filter>
</ClInclude>
<ClInclude Include="..\math\kazmath\kazmath\vec2.h">
<Filter>kazmath</Filter>
</ClInclude>
<ClInclude Include="..\math\kazmath\kazmath\ray3.h">
<Filter>kazmath</Filter>
</ClInclude>
<ClInclude Include="platform\winrt\pch.h"> <ClInclude Include="platform\winrt\pch.h">
<Filter>platform\winrt</Filter> <Filter>platform\winrt</Filter>
</ClInclude> </ClInclude>
@ -1208,5 +1133,52 @@
<ClInclude Include="platform\winrt\inet_ntop_winrt.h"> <ClInclude Include="platform\winrt\inet_ntop_winrt.h">
<Filter>platform\winrt</Filter> <Filter>platform\winrt</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\math\CCMath.h">
<Filter>math</Filter>
</ClInclude>
<ClInclude Include="..\math\CCMathBase.h">
<Filter>math</Filter>
</ClInclude>
<ClInclude Include="..\math\MathUtil.h">
<Filter>math</Filter>
</ClInclude>
<ClInclude Include="..\math\Matrix.h">
<Filter>math</Filter>
</ClInclude>
<ClInclude Include="..\math\Quaternion.h">
<Filter>math</Filter>
</ClInclude>
<ClInclude Include="..\math\Vector2.h">
<Filter>math</Filter>
</ClInclude>
<ClInclude Include="..\math\Vector3.h">
<Filter>math</Filter>
</ClInclude>
<ClInclude Include="..\math\Vector4.h">
<Filter>math</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\math\MathUtil.inl">
<Filter>math</Filter>
</None>
<None Include="..\math\MathUtilNeon.inl">
<Filter>math</Filter>
</None>
<None Include="..\math\Matrix.inl">
<Filter>math</Filter>
</None>
<None Include="..\math\Quaternion.inl">
<Filter>math</Filter>
</None>
<None Include="..\math\Vector2.inl">
<Filter>math</Filter>
</None>
<None Include="..\math\Vector3.inl">
<Filter>math</Filter>
</None>
<None Include="..\math\Vector4.inl">
<Filter>math</Filter>
</None>
</ItemGroup> </ItemGroup>
</Project> </Project>

7
cocos/2d/platform/wp8/CCGLView.cpp
View File

@ -397,10 +397,9 @@ void GLView::UpdateWindowSize()
} }
} }
const kmMat4* GLView::getOrientationMatrix() const const Matrix& GLView::getOrientationMatrix() const
{ {
const kmMat4* k = &m_orientationMatrix; return m_orientationMatrix;
return &m_orientationMatrix;
}; };
@ -430,7 +429,7 @@ void GLView::UpdateOrientationMatrix()
} }
} }
cocos2d::Vector2 GLView::TransformToOrientation(Windows::Foundation::Vector2 p) cocos2d::Point GLView::TransformToOrientation(Windows::Foundation::Point p)
{ {
cocos2d::Vector2 returnValue; cocos2d::Vector2 returnValue;

12
cocos/2d/platform/wp8/CCGLView.h
View File

@ -62,8 +62,8 @@ public:
virtual void swapBuffers(); virtual void swapBuffers();
virtual void setViewPortInPoints(float x , float y , float w , float h); virtual void setViewPortInPoints(float x , float y , float w , float h);
virtual void setScissorInPoints(float x , float y , float w , float h); virtual void setScissorInPoints(float x , float y , float w , float h);
const kmMat4* getOrientationMatrix() const; const Matrix& getOrientationMatrix() const;
const kmMat4* getReverseOrientationMatrix () const {return &m_reverseOrientationMatrix;}; const Matrix& getReverseOrientationMatrix () const {return m_reverseOrientationMatrix;};
Windows::Graphics::Display::DisplayOrientations getDeviceOrientation() {return m_orientation;}; Windows::Graphics::Display::DisplayOrientations getDeviceOrientation() {return m_orientation;};
@ -147,12 +147,12 @@ private:
void UpdateWindowSize(); void UpdateWindowSize();
void UpdateOrientationMatrix(); void UpdateOrientationMatrix();
cocos2d::Vector2 TransformToOrientation(Windows::Foundation::Vector2 point); cocos2d::Vector2 TransformToOrientation(Windows::Foundation::Point point);
cocos2d::Vector2 GetPoint(Windows::UI::Core::PointerEventArgs^ args); cocos2d::Vector2 GetPoint(Windows::UI::Core::PointerEventArgs^ args);
Windows::Foundation::Rect m_windowBounds; Windows::Foundation::Rect m_windowBounds;
Windows::Foundation::EventRegistrationToken m_eventToken; Windows::Foundation::EventRegistrationToken m_eventToken;
Windows::Foundation::Vector2 m_lastPoint; Windows::Foundation::Point m_lastPoint;
float m_width; float m_width;
float m_height; float m_height;
@ -163,8 +163,8 @@ private:
bool m_lastPointValid; bool m_lastPointValid;
bool m_windowClosed; bool m_windowClosed;
bool m_windowVisible; bool m_windowVisible;
kmMat4 m_orientationMatrix; Matrix m_orientationMatrix;
kmMat4 m_reverseOrientationMatrix; Matrix m_reverseOrientationMatrix;
bool m_running; bool m_running;

2
tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj
View File

@ -272,6 +272,7 @@
<ClCompile Include="..\..\Classes\ShaderTest\ShaderTest2.cpp" /> <ClCompile Include="..\..\Classes\ShaderTest\ShaderTest2.cpp" />
<ClCompile Include="..\..\Classes\SpineTest\SpineTest.cpp" /> <ClCompile Include="..\..\Classes\SpineTest\SpineTest.cpp" />
<ClCompile Include="..\..\Classes\TexturePackerEncryptionTest\TextureAtlasEncryptionTest.cpp" /> <ClCompile Include="..\..\Classes\TexturePackerEncryptionTest\TextureAtlasEncryptionTest.cpp" />
<ClCompile Include="..\..\Classes\UnitTest\RefPtrTest.cpp" />
<ClCompile Include="..\..\Classes\UnitTest\UnitTest.cpp" /> <ClCompile Include="..\..\Classes\UnitTest\UnitTest.cpp" />
<ClCompile Include="..\..\Classes\VisibleRect.cpp" /> <ClCompile Include="..\..\Classes\VisibleRect.cpp" />
<ClCompile Include="..\..\Classes\AppDelegate.cpp" /> <ClCompile Include="..\..\Classes\AppDelegate.cpp" />
@ -466,6 +467,7 @@
<ClInclude Include="..\..\Classes\ShaderTest\ShaderTest2.h" /> <ClInclude Include="..\..\Classes\ShaderTest\ShaderTest2.h" />
<ClInclude Include="..\..\Classes\SpineTest\SpineTest.h" /> <ClInclude Include="..\..\Classes\SpineTest\SpineTest.h" />
<ClInclude Include="..\..\Classes\TexturePackerEncryptionTest\TextureAtlasEncryptionTest.h" /> <ClInclude Include="..\..\Classes\TexturePackerEncryptionTest\TextureAtlasEncryptionTest.h" />
<ClInclude Include="..\..\Classes\UnitTest\RefPtrTest.h" />
<ClInclude Include="..\..\Classes\UnitTest\UnitTest.h" /> <ClInclude Include="..\..\Classes\UnitTest\UnitTest.h" />
<ClInclude Include="..\..\Classes\VisibleRect.h" /> <ClInclude Include="..\..\Classes\VisibleRect.h" />
<ClInclude Include="..\..\Classes\AppDelegate.h" /> <ClInclude Include="..\..\Classes\AppDelegate.h" />

6
tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj.filters
View File

@ -834,6 +834,9 @@
<ClCompile Include="..\..\Classes\CurlTest\CurlTest.cpp"> <ClCompile Include="..\..\Classes\CurlTest\CurlTest.cpp">
<Filter>Classes\CurlTest</Filter> <Filter>Classes\CurlTest</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\Classes\UnitTest\RefPtrTest.cpp">
<Filter>Classes\UnitTest</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\Classes\AppDelegate.h"> <ClInclude Include="..\..\Classes\AppDelegate.h">
@ -1545,6 +1548,9 @@
<ClInclude Include="..\..\Classes\CurlTest\CurlTest.h"> <ClInclude Include="..\..\Classes\CurlTest\CurlTest.h">
<Filter>Classes\CurlTest</Filter> <Filter>Classes\CurlTest</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\Classes\UnitTest\RefPtrTest.h">
<Filter>Classes\UnitTest</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="..\..\..\..\external\curl\prebuilt\wp8\arm\libcurl.dll" /> <None Include="..\..\..\..\external\curl\prebuilt\wp8\arm\libcurl.dll" />