mirror of https://github.com/axmolengine/axmol.git
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_studio2
Conflicts: cocos/scripting/lua-bindings/proj.android/Android.mk cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/project.pbxproj
This commit is contained in:
samuele3hu
commit
067ad6ad60
12
AUTHORS
12
AUTHORS
|
|
@ -1097,6 +1097,18 @@ Developers:
|
|||
|
||||
IgorMats
|
||||
Added MotionStreak::getStroke/setStroke
|
||||
|
||||
matsuokah
|
||||
Fixed the bug that JNI illegal start byte error causes crashing error on Android 5.0
|
||||
|
||||
babcca
|
||||
Fixed crashing when playing streamed MP4 file on iOS
|
||||
|
||||
milos1290
|
||||
Added Lerp for Vec3
|
||||
|
||||
perminovVS
|
||||
Optimize Vec3 and Vec2
|
||||
|
||||
Retired Core Developers:
|
||||
WenSheng Yang
|
||||
|
|
|
|||
13
CHANGELOG
13
CHANGELOG
|
|
@ -1,3 +1,15 @@
|
|||
cocos2d-x-3.6 ??
|
||||
[NEW] 3rd: update chipmunk to v 6.2.2 on Windows 8.1 Universal App
|
||||
[NEW] 3rd: update freetype to v 2.5.5 on Windows 8.1 Universal App
|
||||
[NEW] Label: added LabelEffect::ALL which can be used in disableEffect(LabelEffect) to disable all effects
|
||||
[NEW] MathUtil: added `MathUtil::lerp()`
|
||||
[NEW] Vec2: added `Vec2::setZero()`
|
||||
[NEW] Vec3: added `Vec3::lerp()`
|
||||
[NEW] WP8: remove WP8 support because Angle don't support WP8 any more
|
||||
|
||||
[FIX] JNI: JNI illegal start byte error which causes crashing error on Android 5.0
|
||||
[FIX] UI:VideoPlayer: crashed when playing streamed MP4 file on iOS
|
||||
|
||||
cocos2d-x-3.6beta0 Apr.14 2015
|
||||
[NEW] 3rd: update Spine runtime to v2.1.25
|
||||
[NEW] MotionStreak: add `MotionStreak::getStroke()` and `MotionStreak::setStroke()`
|
||||
|
|
@ -6,6 +18,7 @@ cocos2d-x-3.6beta0 Apr.14 2015
|
|||
|
||||
[FIX] 3rd: link error on VS2012 caused by libpng
|
||||
[FIX] Label: position is wrong if it is visited by a new camera
|
||||
[FIX] Particle3D: crash on clone
|
||||
[FIX] Particle3D: "make local" now working correctly. "Make local" is a properties that toggles particle coordination between local and global.
|
||||
[FIX] Particle3D: particle rotation now no longer stacks up on each other
|
||||
[FIX] Particle3D: Ribbon Trail now positions correctly
|
||||
|
|
|
|||
24
README.md
24
README.md
|
|
@ -4,10 +4,10 @@
|
|||
cocos2d-x
|
||||
=========
|
||||
|
||||
| |iOS|Mac|Linux|Win32|Android|WP8|Win8.1-Universal|
|
||||
| ----|----|----- | ---|----|---|---- |---|
|
||||
|v3|[](http://45.56.80.45:8080/job/daily-build-v3/node=ios)|[](http://45.56.80.45:8080/job/daily-build-v3/node=mac)|[](http://45.56.80.45:8080/job/daily-build-v3/node=linux)|[](http://45.56.80.45:8080/job/daily-build-v3/node=win32)|[](http://45.56.80.45:8080/job/daily-build-v3/node=android)|[](http://45.56.80.45:8080/job/daily-build-v3/node=wp8)|[](http://45.56.80.45:8080/job/daily-build-v3/node=windows-universal)|
|
||||
|v4|[](http://45.56.80.45:8080/job/daily-build-v4/node=ios)|[](http://45.56.80.45:8080/job/daily-build-v4/node=mac)|[](http://45.56.80.45:8080/job/daily-build-v4/node=linux)|[](http://45.56.80.45:8080/job/daily-build-v4/node=win32)|[](http://45.56.80.45:8080/job/daily-build-v4/node=android)|NA|[](http://45.56.80.45:8080/job/daily-build-v4/node=windows-universal)|
|
||||
| |iOS|Mac|Linux|Win32|Android|Win8.1-Universal|
|
||||
| ----|----|----- | ---|----|------|---|
|
||||
|v3|[](http://45.56.80.45:8080/job/daily-build-v3/node=ios)|[](http://45.56.80.45:8080/job/daily-build-v3/node=mac)|[](http://45.56.80.45:8080/job/daily-build-v3/node=linux)|[](http://45.56.80.45:8080/job/daily-build-v3/node=win32)|[](http://45.56.80.45:8080/job/daily-build-v3/node=android)|[](http://45.56.80.45:8080/job/daily-build-v3/node=windows-universal)|
|
||||
|v4|[](http://45.56.80.45:8080/job/daily-build-v4/node=ios)|[](http://45.56.80.45:8080/job/daily-build-v4/node=mac)|[](http://45.56.80.45:8080/job/daily-build-v4/node=linux)|[](http://45.56.80.45:8080/job/daily-build-v4/node=win32)|[](http://45.56.80.45:8080/job/daily-build-v4/node=android)|[](http://45.56.80.45:8080/job/daily-build-v4/node=windows-universal)|
|
||||
|
||||
|
||||
|
||||
|
|
@ -61,7 +61,7 @@ Example:
|
|||
### Build and run a new project for iOS ###
|
||||
|
||||
$ cocos run -p ios
|
||||
|
||||
|
||||
### Build and run a new project for OSX ###
|
||||
|
||||
$ cocos run -p mac
|
||||
|
|
@ -78,7 +78,7 @@ Then
|
|||
|
||||
$ cd NEW_PROJECTS_DIR/MyGame
|
||||
$ cocos run -p linux
|
||||
|
||||
|
||||
Run
|
||||
|
||||
$ bin/MyGame
|
||||
|
|
@ -89,11 +89,15 @@ Run
|
|||
|
||||
### Build and run new project for Windows 8.1 and Windows Phone 8.1 ###
|
||||
|
||||
$ cocos new MyGame -p com.bar.foo -l cpp -d projects
|
||||
$ cocos new MyGame -p com.your_company.mygame -l cpp -d projects
|
||||
|
||||
With the Cocos2d-x v3.3, you can create Universal App (Two projects at the same time: Windows(Tablet) and Windows Phone 8.1 )
|
||||
Visual Studio 2013 Update 4 or later is required.
|
||||
|
||||
Starting with Cocos2d-x v3.3, you can create Windows 8.1 Universal Apps (Windows Store and Windows Phone 8.1)
|
||||
See more info on How to install and Create games on Windows RT (Windows and Windows Phone 8.1) at http://msopentech.github.io/cocos2d-x/
|
||||
|
||||
Starting with Cocos2d-x v3.6 there will no longer be support for Windows Phone 8.0
|
||||
|
||||
Main features
|
||||
-------------
|
||||
* Scene management (workflow)
|
||||
|
|
@ -184,6 +188,10 @@ $ bin/lua-empty-test/lua-empty-test
|
|||
|
||||
Open the `cocos2d-x/build/cocos2d-win32.vc2012.sln`
|
||||
|
||||
* For Windows 8.1 Universal Apps (Phone and Store)
|
||||
|
||||
Open the `cocos2d-x/build/cocos2d-win8.1-universal.sln`
|
||||
|
||||
* For Android
|
||||
|
||||
```
|
||||
|
|
|
|||
|
|
@ -1,247 +0,0 @@
|
|||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio 2013
|
||||
VisualStudioVersion = 12.0.30723.0
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSpine", "..\cocos\editor-support\spine\proj.wp8\libSpine.vcxproj", "{7D4FC6EB-9497-4804-98F3-3EAEDC896154}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Box2D", "..\external\Box2D\proj.wp8\Box2D.vcxproj", "{C55734A3-702C-4FA1-B950-32C8E169302F}"
|
||||
EndProject
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "cpp-tests-wp8-xaml", "cpp-tests-wp8-xaml", "{671E147E-1DBD-41FC-99B3-2119CA828C8A}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "cpp-tests", "..\tests\cpp-tests\proj.wp8-xaml\cpp-tests\cpp-tests.csproj", "{60D53713-1675-4466-81DC-D67A031C3D21}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{86B2C23C-3A6C-4C4E-AB0E-16A8CC1523E9} = {86B2C23C-3A6C-4C4E-AB0E-16A8CC1523E9}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cpp-testsComponent", "..\tests\cpp-tests\proj.wp8-xaml\cpp-testsComponent\cpp-testsComponent.vcxproj", "{86B2C23C-3A6C-4C4E-AB0E-16A8CC1523E9}"
|
||||
EndProject
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "cpp-empty-test-wp8-xaml", "cpp-empty-test-wp8-xaml", "{2C306303-EB4F-4058-8CA0-1F28A4FECE39}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "cpp-empty-test", "..\tests\cpp-empty-test\proj-wp8-xaml\cpp-empty-test\cpp-empty-test.csproj", "{5921FE12-7EF3-4847-8453-42EF286DDBE7}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{F5D665F8-AE19-4F3F-99A7-230A1E8305D2} = {F5D665F8-AE19-4F3F-99A7-230A1E8305D2}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cpp-empty-testComponent", "..\tests\cpp-empty-test\proj-wp8-xaml\cpp-empty-testComponent\cpp-empty-testComponent.vcxproj", "{F5D665F8-AE19-4F3F-99A7-230A1E8305D2}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CopyTemplateFiles", "..\cocos\platform\wp8-xaml\CopyTemplateFiles.vcxproj", "{271FEE84-9198-4C26-8567-4247C563B0B1}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{5921FE12-7EF3-4847-8453-42EF286DDBE7} = {5921FE12-7EF3-4847-8453-42EF286DDBE7}
|
||||
{60D53713-1675-4466-81DC-D67A031C3D21} = {60D53713-1675-4466-81DC-D67A031C3D21}
|
||||
{86B2C23C-3A6C-4C4E-AB0E-16A8CC1523E9} = {86B2C23C-3A6C-4C4E-AB0E-16A8CC1523E9}
|
||||
{F5D665F8-AE19-4F3F-99A7-230A1E8305D2} = {F5D665F8-AE19-4F3F-99A7-230A1E8305D2}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d_wp8", "..\cocos\2d\libcocos2d_wp8.vcxproj", "{7C5DBC42-27F6-4978-AABC-02BA77E2A7F0}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
Debug|ARM = Debug|ARM
|
||||
Debug|Mixed Platforms = Debug|Mixed Platforms
|
||||
Debug|Win32 = Debug|Win32
|
||||
Debug|x64 = Debug|x64
|
||||
Debug|x86 = Debug|x86
|
||||
Release|Any CPU = Release|Any CPU
|
||||
Release|ARM = Release|ARM
|
||||
Release|Mixed Platforms = Release|Mixed Platforms
|
||||
Release|Win32 = Release|Win32
|
||||
Release|x64 = Release|x64
|
||||
Release|x86 = Release|x86
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{7D4FC6EB-9497-4804-98F3-3EAEDC896154}.Debug|Any CPU.ActiveCfg = Debug|Win32
|
||||
{7D4FC6EB-9497-4804-98F3-3EAEDC896154}.Debug|ARM.ActiveCfg = Debug|ARM
|
||||
{7D4FC6EB-9497-4804-98F3-3EAEDC896154}.Debug|ARM.Build.0 = Debug|ARM
|
||||
{7D4FC6EB-9497-4804-98F3-3EAEDC896154}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
|
||||
{7D4FC6EB-9497-4804-98F3-3EAEDC896154}.Debug|Mixed Platforms.Build.0 = Debug|Win32
|
||||
{7D4FC6EB-9497-4804-98F3-3EAEDC896154}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{7D4FC6EB-9497-4804-98F3-3EAEDC896154}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{7D4FC6EB-9497-4804-98F3-3EAEDC896154}.Debug|x64.ActiveCfg = Debug|Win32
|
||||
{7D4FC6EB-9497-4804-98F3-3EAEDC896154}.Debug|x86.ActiveCfg = Debug|Win32
|
||||
{7D4FC6EB-9497-4804-98F3-3EAEDC896154}.Debug|x86.Build.0 = Debug|Win32
|
||||
{7D4FC6EB-9497-4804-98F3-3EAEDC896154}.Release|Any CPU.ActiveCfg = Release|Win32
|
||||
{7D4FC6EB-9497-4804-98F3-3EAEDC896154}.Release|ARM.ActiveCfg = Release|ARM
|
||||
{7D4FC6EB-9497-4804-98F3-3EAEDC896154}.Release|ARM.Build.0 = Release|ARM
|
||||
{7D4FC6EB-9497-4804-98F3-3EAEDC896154}.Release|Mixed Platforms.ActiveCfg = Release|Win32
|
||||
{7D4FC6EB-9497-4804-98F3-3EAEDC896154}.Release|Mixed Platforms.Build.0 = Release|Win32
|
||||
{7D4FC6EB-9497-4804-98F3-3EAEDC896154}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{7D4FC6EB-9497-4804-98F3-3EAEDC896154}.Release|Win32.Build.0 = Release|Win32
|
||||
{7D4FC6EB-9497-4804-98F3-3EAEDC896154}.Release|x64.ActiveCfg = Release|Win32
|
||||
{7D4FC6EB-9497-4804-98F3-3EAEDC896154}.Release|x86.ActiveCfg = Release|Win32
|
||||
{7D4FC6EB-9497-4804-98F3-3EAEDC896154}.Release|x86.Build.0 = Release|Win32
|
||||
{C55734A3-702C-4FA1-B950-32C8E169302F}.Debug|Any CPU.ActiveCfg = Debug|Win32
|
||||
{C55734A3-702C-4FA1-B950-32C8E169302F}.Debug|ARM.ActiveCfg = Debug|ARM
|
||||
{C55734A3-702C-4FA1-B950-32C8E169302F}.Debug|ARM.Build.0 = Debug|ARM
|
||||
{C55734A3-702C-4FA1-B950-32C8E169302F}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
|
||||
{C55734A3-702C-4FA1-B950-32C8E169302F}.Debug|Mixed Platforms.Build.0 = Debug|Win32
|
||||
{C55734A3-702C-4FA1-B950-32C8E169302F}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{C55734A3-702C-4FA1-B950-32C8E169302F}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{C55734A3-702C-4FA1-B950-32C8E169302F}.Debug|x64.ActiveCfg = Debug|Win32
|
||||
{C55734A3-702C-4FA1-B950-32C8E169302F}.Debug|x86.ActiveCfg = Debug|Win32
|
||||
{C55734A3-702C-4FA1-B950-32C8E169302F}.Debug|x86.Build.0 = Debug|Win32
|
||||
{C55734A3-702C-4FA1-B950-32C8E169302F}.Release|Any CPU.ActiveCfg = Release|Win32
|
||||
{C55734A3-702C-4FA1-B950-32C8E169302F}.Release|ARM.ActiveCfg = Release|ARM
|
||||
{C55734A3-702C-4FA1-B950-32C8E169302F}.Release|ARM.Build.0 = Release|ARM
|
||||
{C55734A3-702C-4FA1-B950-32C8E169302F}.Release|Mixed Platforms.ActiveCfg = Release|Win32
|
||||
{C55734A3-702C-4FA1-B950-32C8E169302F}.Release|Mixed Platforms.Build.0 = Release|Win32
|
||||
{C55734A3-702C-4FA1-B950-32C8E169302F}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{C55734A3-702C-4FA1-B950-32C8E169302F}.Release|Win32.Build.0 = Release|Win32
|
||||
{C55734A3-702C-4FA1-B950-32C8E169302F}.Release|x64.ActiveCfg = Release|Win32
|
||||
{C55734A3-702C-4FA1-B950-32C8E169302F}.Release|x86.ActiveCfg = Release|Win32
|
||||
{C55734A3-702C-4FA1-B950-32C8E169302F}.Release|x86.Build.0 = Release|Win32
|
||||
{60D53713-1675-4466-81DC-D67A031C3D21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{60D53713-1675-4466-81DC-D67A031C3D21}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{60D53713-1675-4466-81DC-D67A031C3D21}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
|
||||
{60D53713-1675-4466-81DC-D67A031C3D21}.Debug|ARM.ActiveCfg = Debug|ARM
|
||||
{60D53713-1675-4466-81DC-D67A031C3D21}.Debug|ARM.Build.0 = Debug|ARM
|
||||
{60D53713-1675-4466-81DC-D67A031C3D21}.Debug|ARM.Deploy.0 = Debug|ARM
|
||||
{60D53713-1675-4466-81DC-D67A031C3D21}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
|
||||
{60D53713-1675-4466-81DC-D67A031C3D21}.Debug|Mixed Platforms.Build.0 = Debug|x86
|
||||
{60D53713-1675-4466-81DC-D67A031C3D21}.Debug|Mixed Platforms.Deploy.0 = Debug|x86
|
||||
{60D53713-1675-4466-81DC-D67A031C3D21}.Debug|Win32.ActiveCfg = Debug|x86
|
||||
{60D53713-1675-4466-81DC-D67A031C3D21}.Debug|Win32.Build.0 = Debug|x86
|
||||
{60D53713-1675-4466-81DC-D67A031C3D21}.Debug|Win32.Deploy.0 = Debug|x86
|
||||
{60D53713-1675-4466-81DC-D67A031C3D21}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{60D53713-1675-4466-81DC-D67A031C3D21}.Debug|x86.ActiveCfg = Debug|x86
|
||||
{60D53713-1675-4466-81DC-D67A031C3D21}.Debug|x86.Build.0 = Debug|x86
|
||||
{60D53713-1675-4466-81DC-D67A031C3D21}.Debug|x86.Deploy.0 = Debug|x86
|
||||
{60D53713-1675-4466-81DC-D67A031C3D21}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{60D53713-1675-4466-81DC-D67A031C3D21}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{60D53713-1675-4466-81DC-D67A031C3D21}.Release|Any CPU.Deploy.0 = Release|Any CPU
|
||||
{60D53713-1675-4466-81DC-D67A031C3D21}.Release|ARM.ActiveCfg = Release|ARM
|
||||
{60D53713-1675-4466-81DC-D67A031C3D21}.Release|ARM.Build.0 = Release|ARM
|
||||
{60D53713-1675-4466-81DC-D67A031C3D21}.Release|ARM.Deploy.0 = Release|ARM
|
||||
{60D53713-1675-4466-81DC-D67A031C3D21}.Release|Mixed Platforms.ActiveCfg = Release|x86
|
||||
{60D53713-1675-4466-81DC-D67A031C3D21}.Release|Mixed Platforms.Build.0 = Release|x86
|
||||
{60D53713-1675-4466-81DC-D67A031C3D21}.Release|Mixed Platforms.Deploy.0 = Release|x86
|
||||
{60D53713-1675-4466-81DC-D67A031C3D21}.Release|Win32.ActiveCfg = Release|x86
|
||||
{60D53713-1675-4466-81DC-D67A031C3D21}.Release|Win32.Build.0 = Release|x86
|
||||
{60D53713-1675-4466-81DC-D67A031C3D21}.Release|Win32.Deploy.0 = Release|x86
|
||||
{60D53713-1675-4466-81DC-D67A031C3D21}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{60D53713-1675-4466-81DC-D67A031C3D21}.Release|x86.ActiveCfg = Release|x86
|
||||
{60D53713-1675-4466-81DC-D67A031C3D21}.Release|x86.Build.0 = Release|x86
|
||||
{60D53713-1675-4466-81DC-D67A031C3D21}.Release|x86.Deploy.0 = Release|x86
|
||||
{86B2C23C-3A6C-4C4E-AB0E-16A8CC1523E9}.Debug|Any CPU.ActiveCfg = Debug|Win32
|
||||
{86B2C23C-3A6C-4C4E-AB0E-16A8CC1523E9}.Debug|ARM.ActiveCfg = Debug|ARM
|
||||
{86B2C23C-3A6C-4C4E-AB0E-16A8CC1523E9}.Debug|ARM.Build.0 = Debug|ARM
|
||||
{86B2C23C-3A6C-4C4E-AB0E-16A8CC1523E9}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
|
||||
{86B2C23C-3A6C-4C4E-AB0E-16A8CC1523E9}.Debug|Mixed Platforms.Build.0 = Debug|Win32
|
||||
{86B2C23C-3A6C-4C4E-AB0E-16A8CC1523E9}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{86B2C23C-3A6C-4C4E-AB0E-16A8CC1523E9}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{86B2C23C-3A6C-4C4E-AB0E-16A8CC1523E9}.Debug|x64.ActiveCfg = Debug|Win32
|
||||
{86B2C23C-3A6C-4C4E-AB0E-16A8CC1523E9}.Debug|x86.ActiveCfg = Debug|Win32
|
||||
{86B2C23C-3A6C-4C4E-AB0E-16A8CC1523E9}.Debug|x86.Build.0 = Debug|Win32
|
||||
{86B2C23C-3A6C-4C4E-AB0E-16A8CC1523E9}.Release|Any CPU.ActiveCfg = Release|Win32
|
||||
{86B2C23C-3A6C-4C4E-AB0E-16A8CC1523E9}.Release|ARM.ActiveCfg = Release|ARM
|
||||
{86B2C23C-3A6C-4C4E-AB0E-16A8CC1523E9}.Release|ARM.Build.0 = Release|ARM
|
||||
{86B2C23C-3A6C-4C4E-AB0E-16A8CC1523E9}.Release|Mixed Platforms.ActiveCfg = Release|Win32
|
||||
{86B2C23C-3A6C-4C4E-AB0E-16A8CC1523E9}.Release|Mixed Platforms.Build.0 = Release|Win32
|
||||
{86B2C23C-3A6C-4C4E-AB0E-16A8CC1523E9}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{86B2C23C-3A6C-4C4E-AB0E-16A8CC1523E9}.Release|Win32.Build.0 = Release|Win32
|
||||
{86B2C23C-3A6C-4C4E-AB0E-16A8CC1523E9}.Release|x64.ActiveCfg = Release|Win32
|
||||
{86B2C23C-3A6C-4C4E-AB0E-16A8CC1523E9}.Release|x86.ActiveCfg = Release|Win32
|
||||
{86B2C23C-3A6C-4C4E-AB0E-16A8CC1523E9}.Release|x86.Build.0 = Release|Win32
|
||||
{5921FE12-7EF3-4847-8453-42EF286DDBE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{5921FE12-7EF3-4847-8453-42EF286DDBE7}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{5921FE12-7EF3-4847-8453-42EF286DDBE7}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
|
||||
{5921FE12-7EF3-4847-8453-42EF286DDBE7}.Debug|ARM.ActiveCfg = Debug|ARM
|
||||
{5921FE12-7EF3-4847-8453-42EF286DDBE7}.Debug|ARM.Build.0 = Debug|ARM
|
||||
{5921FE12-7EF3-4847-8453-42EF286DDBE7}.Debug|ARM.Deploy.0 = Debug|ARM
|
||||
{5921FE12-7EF3-4847-8453-42EF286DDBE7}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
|
||||
{5921FE12-7EF3-4847-8453-42EF286DDBE7}.Debug|Mixed Platforms.Build.0 = Debug|x86
|
||||
{5921FE12-7EF3-4847-8453-42EF286DDBE7}.Debug|Mixed Platforms.Deploy.0 = Debug|x86
|
||||
{5921FE12-7EF3-4847-8453-42EF286DDBE7}.Debug|Win32.ActiveCfg = Debug|x86
|
||||
{5921FE12-7EF3-4847-8453-42EF286DDBE7}.Debug|Win32.Build.0 = Debug|x86
|
||||
{5921FE12-7EF3-4847-8453-42EF286DDBE7}.Debug|Win32.Deploy.0 = Debug|x86
|
||||
{5921FE12-7EF3-4847-8453-42EF286DDBE7}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{5921FE12-7EF3-4847-8453-42EF286DDBE7}.Debug|x86.ActiveCfg = Debug|x86
|
||||
{5921FE12-7EF3-4847-8453-42EF286DDBE7}.Debug|x86.Build.0 = Debug|x86
|
||||
{5921FE12-7EF3-4847-8453-42EF286DDBE7}.Debug|x86.Deploy.0 = Debug|x86
|
||||
{5921FE12-7EF3-4847-8453-42EF286DDBE7}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{5921FE12-7EF3-4847-8453-42EF286DDBE7}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{5921FE12-7EF3-4847-8453-42EF286DDBE7}.Release|Any CPU.Deploy.0 = Release|Any CPU
|
||||
{5921FE12-7EF3-4847-8453-42EF286DDBE7}.Release|ARM.ActiveCfg = Release|ARM
|
||||
{5921FE12-7EF3-4847-8453-42EF286DDBE7}.Release|ARM.Build.0 = Release|ARM
|
||||
{5921FE12-7EF3-4847-8453-42EF286DDBE7}.Release|ARM.Deploy.0 = Release|ARM
|
||||
{5921FE12-7EF3-4847-8453-42EF286DDBE7}.Release|Mixed Platforms.ActiveCfg = Release|x86
|
||||
{5921FE12-7EF3-4847-8453-42EF286DDBE7}.Release|Mixed Platforms.Build.0 = Release|x86
|
||||
{5921FE12-7EF3-4847-8453-42EF286DDBE7}.Release|Mixed Platforms.Deploy.0 = Release|x86
|
||||
{5921FE12-7EF3-4847-8453-42EF286DDBE7}.Release|Win32.ActiveCfg = Release|x86
|
||||
{5921FE12-7EF3-4847-8453-42EF286DDBE7}.Release|Win32.Build.0 = Release|x86
|
||||
{5921FE12-7EF3-4847-8453-42EF286DDBE7}.Release|Win32.Deploy.0 = Release|x86
|
||||
{5921FE12-7EF3-4847-8453-42EF286DDBE7}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{5921FE12-7EF3-4847-8453-42EF286DDBE7}.Release|x86.ActiveCfg = Release|x86
|
||||
{5921FE12-7EF3-4847-8453-42EF286DDBE7}.Release|x86.Build.0 = Release|x86
|
||||
{5921FE12-7EF3-4847-8453-42EF286DDBE7}.Release|x86.Deploy.0 = Release|x86
|
||||
{F5D665F8-AE19-4F3F-99A7-230A1E8305D2}.Debug|Any CPU.ActiveCfg = Debug|Win32
|
||||
{F5D665F8-AE19-4F3F-99A7-230A1E8305D2}.Debug|ARM.ActiveCfg = Debug|ARM
|
||||
{F5D665F8-AE19-4F3F-99A7-230A1E8305D2}.Debug|ARM.Build.0 = Debug|ARM
|
||||
{F5D665F8-AE19-4F3F-99A7-230A1E8305D2}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
|
||||
{F5D665F8-AE19-4F3F-99A7-230A1E8305D2}.Debug|Mixed Platforms.Build.0 = Debug|Win32
|
||||
{F5D665F8-AE19-4F3F-99A7-230A1E8305D2}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{F5D665F8-AE19-4F3F-99A7-230A1E8305D2}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{F5D665F8-AE19-4F3F-99A7-230A1E8305D2}.Debug|x64.ActiveCfg = Debug|Win32
|
||||
{F5D665F8-AE19-4F3F-99A7-230A1E8305D2}.Debug|x86.ActiveCfg = Debug|Win32
|
||||
{F5D665F8-AE19-4F3F-99A7-230A1E8305D2}.Debug|x86.Build.0 = Debug|Win32
|
||||
{F5D665F8-AE19-4F3F-99A7-230A1E8305D2}.Release|Any CPU.ActiveCfg = Release|Win32
|
||||
{F5D665F8-AE19-4F3F-99A7-230A1E8305D2}.Release|ARM.ActiveCfg = Release|ARM
|
||||
{F5D665F8-AE19-4F3F-99A7-230A1E8305D2}.Release|ARM.Build.0 = Release|ARM
|
||||
{F5D665F8-AE19-4F3F-99A7-230A1E8305D2}.Release|Mixed Platforms.ActiveCfg = Release|Win32
|
||||
{F5D665F8-AE19-4F3F-99A7-230A1E8305D2}.Release|Mixed Platforms.Build.0 = Release|Win32
|
||||
{F5D665F8-AE19-4F3F-99A7-230A1E8305D2}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{F5D665F8-AE19-4F3F-99A7-230A1E8305D2}.Release|Win32.Build.0 = Release|Win32
|
||||
{F5D665F8-AE19-4F3F-99A7-230A1E8305D2}.Release|x64.ActiveCfg = Release|Win32
|
||||
{F5D665F8-AE19-4F3F-99A7-230A1E8305D2}.Release|x86.ActiveCfg = Release|Win32
|
||||
{F5D665F8-AE19-4F3F-99A7-230A1E8305D2}.Release|x86.Build.0 = Release|Win32
|
||||
{271FEE84-9198-4C26-8567-4247C563B0B1}.Debug|Any CPU.ActiveCfg = Debug|Win32
|
||||
{271FEE84-9198-4C26-8567-4247C563B0B1}.Debug|ARM.ActiveCfg = Debug|ARM
|
||||
{271FEE84-9198-4C26-8567-4247C563B0B1}.Debug|ARM.Build.0 = Debug|ARM
|
||||
{271FEE84-9198-4C26-8567-4247C563B0B1}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
|
||||
{271FEE84-9198-4C26-8567-4247C563B0B1}.Debug|Mixed Platforms.Build.0 = Debug|Win32
|
||||
{271FEE84-9198-4C26-8567-4247C563B0B1}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{271FEE84-9198-4C26-8567-4247C563B0B1}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{271FEE84-9198-4C26-8567-4247C563B0B1}.Debug|x64.ActiveCfg = Debug|Win32
|
||||
{271FEE84-9198-4C26-8567-4247C563B0B1}.Debug|x86.ActiveCfg = Debug|Win32
|
||||
{271FEE84-9198-4C26-8567-4247C563B0B1}.Debug|x86.Build.0 = Debug|Win32
|
||||
{271FEE84-9198-4C26-8567-4247C563B0B1}.Release|Any CPU.ActiveCfg = Release|Win32
|
||||
{271FEE84-9198-4C26-8567-4247C563B0B1}.Release|ARM.ActiveCfg = Release|ARM
|
||||
{271FEE84-9198-4C26-8567-4247C563B0B1}.Release|ARM.Build.0 = Release|ARM
|
||||
{271FEE84-9198-4C26-8567-4247C563B0B1}.Release|Mixed Platforms.ActiveCfg = Release|Win32
|
||||
{271FEE84-9198-4C26-8567-4247C563B0B1}.Release|Mixed Platforms.Build.0 = Release|Win32
|
||||
{271FEE84-9198-4C26-8567-4247C563B0B1}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{271FEE84-9198-4C26-8567-4247C563B0B1}.Release|Win32.Build.0 = Release|Win32
|
||||
{271FEE84-9198-4C26-8567-4247C563B0B1}.Release|x64.ActiveCfg = Release|Win32
|
||||
{271FEE84-9198-4C26-8567-4247C563B0B1}.Release|x86.ActiveCfg = Release|Win32
|
||||
{271FEE84-9198-4C26-8567-4247C563B0B1}.Release|x86.Build.0 = Release|Win32
|
||||
{7C5DBC42-27F6-4978-AABC-02BA77E2A7F0}.Debug|Any CPU.ActiveCfg = Debug|Win32
|
||||
{7C5DBC42-27F6-4978-AABC-02BA77E2A7F0}.Debug|ARM.ActiveCfg = Debug|ARM
|
||||
{7C5DBC42-27F6-4978-AABC-02BA77E2A7F0}.Debug|ARM.Build.0 = Debug|ARM
|
||||
{7C5DBC42-27F6-4978-AABC-02BA77E2A7F0}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
|
||||
{7C5DBC42-27F6-4978-AABC-02BA77E2A7F0}.Debug|Mixed Platforms.Build.0 = Debug|Win32
|
||||
{7C5DBC42-27F6-4978-AABC-02BA77E2A7F0}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{7C5DBC42-27F6-4978-AABC-02BA77E2A7F0}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{7C5DBC42-27F6-4978-AABC-02BA77E2A7F0}.Debug|x64.ActiveCfg = Debug|Win32
|
||||
{7C5DBC42-27F6-4978-AABC-02BA77E2A7F0}.Debug|x86.ActiveCfg = Debug|Win32
|
||||
{7C5DBC42-27F6-4978-AABC-02BA77E2A7F0}.Debug|x86.Build.0 = Debug|Win32
|
||||
{7C5DBC42-27F6-4978-AABC-02BA77E2A7F0}.Release|Any CPU.ActiveCfg = Release|Win32
|
||||
{7C5DBC42-27F6-4978-AABC-02BA77E2A7F0}.Release|ARM.ActiveCfg = Release|ARM
|
||||
{7C5DBC42-27F6-4978-AABC-02BA77E2A7F0}.Release|ARM.Build.0 = Release|ARM
|
||||
{7C5DBC42-27F6-4978-AABC-02BA77E2A7F0}.Release|Mixed Platforms.ActiveCfg = Release|Win32
|
||||
{7C5DBC42-27F6-4978-AABC-02BA77E2A7F0}.Release|Mixed Platforms.Build.0 = Release|Win32
|
||||
{7C5DBC42-27F6-4978-AABC-02BA77E2A7F0}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{7C5DBC42-27F6-4978-AABC-02BA77E2A7F0}.Release|Win32.Build.0 = Release|Win32
|
||||
{7C5DBC42-27F6-4978-AABC-02BA77E2A7F0}.Release|x64.ActiveCfg = Release|Win32
|
||||
{7C5DBC42-27F6-4978-AABC-02BA77E2A7F0}.Release|x86.ActiveCfg = Release|Win32
|
||||
{7C5DBC42-27F6-4978-AABC-02BA77E2A7F0}.Release|x86.Build.0 = Release|Win32
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
EndGlobalSection
|
||||
GlobalSection(NestedProjects) = preSolution
|
||||
{60D53713-1675-4466-81DC-D67A031C3D21} = {671E147E-1DBD-41FC-99B3-2119CA828C8A}
|
||||
{86B2C23C-3A6C-4C4E-AB0E-16A8CC1523E9} = {671E147E-1DBD-41FC-99B3-2119CA828C8A}
|
||||
{5921FE12-7EF3-4847-8453-42EF286DDBE7} = {2C306303-EB4F-4058-8CA0-1F28A4FECE39}
|
||||
{F5D665F8-AE19-4F3F-99A7-230A1E8305D2} = {2C306303-EB4F-4058-8CA0-1F28A4FECE39}
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
|
|
@ -1770,12 +1770,8 @@
|
|||
50ED2BDB19BE76D500A0AB90 /* UIVideoPlayer-ios.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3EA0FB6A191C841D00B170C8 /* UIVideoPlayer-ios.mm */; };
|
||||
50ED2BE019BEAF7900A0AB90 /* UIEditBoxImpl-win32.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ED2BDC19BEAF7900A0AB90 /* UIEditBoxImpl-win32.h */; };
|
||||
50ED2BE119BEAF7900A0AB90 /* UIEditBoxImpl-win32.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ED2BDC19BEAF7900A0AB90 /* UIEditBoxImpl-win32.h */; };
|
||||
50ED2BE219BEAF7900A0AB90 /* UIEditBoxImpl-wp8.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ED2BDD19BEAF7900A0AB90 /* UIEditBoxImpl-wp8.h */; };
|
||||
50ED2BE319BEAF7900A0AB90 /* UIEditBoxImpl-wp8.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ED2BDD19BEAF7900A0AB90 /* UIEditBoxImpl-wp8.h */; };
|
||||
50ED2BE419BEAF7900A0AB90 /* UIEditBoxImpl-win32.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ED2BDE19BEAF7900A0AB90 /* UIEditBoxImpl-win32.cpp */; };
|
||||
50ED2BE519BEAF7900A0AB90 /* UIEditBoxImpl-win32.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ED2BDE19BEAF7900A0AB90 /* UIEditBoxImpl-win32.cpp */; };
|
||||
50ED2BE619BEAF7900A0AB90 /* UIEditBoxImpl-wp8.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ED2BDF19BEAF7900A0AB90 /* UIEditBoxImpl-wp8.cpp */; };
|
||||
50ED2BE719BEAF7900A0AB90 /* UIEditBoxImpl-wp8.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ED2BDF19BEAF7900A0AB90 /* UIEditBoxImpl-wp8.cpp */; };
|
||||
52B47A2E1A5349A3004E4C60 /* HttpAsynConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = 52B47A291A5349A3004E4C60 /* HttpAsynConnection.h */; };
|
||||
52B47A2F1A5349A3004E4C60 /* HttpAsynConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = 52B47A2A1A5349A3004E4C60 /* HttpAsynConnection.m */; };
|
||||
52B47A301A5349A3004E4C60 /* HttpClient-apple.mm in Sources */ = {isa = PBXBuildFile; fileRef = 52B47A2B1A5349A3004E4C60 /* HttpClient-apple.mm */; };
|
||||
|
|
@ -3545,9 +3541,7 @@
|
|||
50E6D33218E174130051CA34 /* UIVBox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UIVBox.cpp; sourceTree = "<group>"; };
|
||||
50E6D33318E174130051CA34 /* UIVBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIVBox.h; sourceTree = "<group>"; };
|
||||
50ED2BDC19BEAF7900A0AB90 /* UIEditBoxImpl-win32.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIEditBoxImpl-win32.h"; sourceTree = "<group>"; };
|
||||
50ED2BDD19BEAF7900A0AB90 /* UIEditBoxImpl-wp8.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIEditBoxImpl-wp8.h"; sourceTree = "<group>"; };
|
||||
50ED2BDE19BEAF7900A0AB90 /* UIEditBoxImpl-win32.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "UIEditBoxImpl-win32.cpp"; sourceTree = "<group>"; };
|
||||
50ED2BDF19BEAF7900A0AB90 /* UIEditBoxImpl-wp8.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "UIEditBoxImpl-wp8.cpp"; sourceTree = "<group>"; };
|
||||
50FCEB6A18C72017004AD434 /* ButtonReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ButtonReader.cpp; sourceTree = "<group>"; };
|
||||
50FCEB6B18C72017004AD434 /* ButtonReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ButtonReader.h; sourceTree = "<group>"; };
|
||||
50FCEB6D18C72017004AD434 /* CheckBoxReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CheckBoxReader.cpp; sourceTree = "<group>"; };
|
||||
|
|
@ -5216,9 +5210,7 @@
|
|||
isa = PBXGroup;
|
||||
children = (
|
||||
50ED2BDC19BEAF7900A0AB90 /* UIEditBoxImpl-win32.h */,
|
||||
50ED2BDD19BEAF7900A0AB90 /* UIEditBoxImpl-wp8.h */,
|
||||
50ED2BDE19BEAF7900A0AB90 /* UIEditBoxImpl-win32.cpp */,
|
||||
50ED2BDF19BEAF7900A0AB90 /* UIEditBoxImpl-wp8.cpp */,
|
||||
292DB12F19B4574100A80320 /* UIEditBox.cpp */,
|
||||
292DB13019B4574100A80320 /* UIEditBox.h */,
|
||||
292DB13119B4574100A80320 /* UIEditBoxImpl.h */,
|
||||
|
|
@ -6767,7 +6759,6 @@
|
|||
1A57011D180BC90D0088DEC7 /* CCGrabber.h in Headers */,
|
||||
B665E3C81AA80A6600DDB1C5 /* CCPUScaleVelocityAffector.h in Headers */,
|
||||
B29A7E2B19EE1B7700872B35 /* AtlasAttachmentLoader.h in Headers */,
|
||||
50ED2BE219BEAF7900A0AB90 /* UIEditBoxImpl-wp8.h in Headers */,
|
||||
B665E3781AA80A6500DDB1C5 /* CCPUParticleFollowerTranslator.h in Headers */,
|
||||
15AE1B6819AADA9900C27E9E /* UIScale9Sprite.h in Headers */,
|
||||
1A570121180BC90D0088DEC7 /* CCGrid.h in Headers */,
|
||||
|
|
@ -7744,7 +7735,6 @@
|
|||
15AE1A9519AAD40300C27E9E /* b2BlockAllocator.h in Headers */,
|
||||
5034CA48191D591100CE6051 /* ccShader_Label_normal.frag in Headers */,
|
||||
15AE183F19AAD2F700C27E9E /* CCSkeleton3D.h in Headers */,
|
||||
50ED2BE319BEAF7900A0AB90 /* UIEditBoxImpl-wp8.h in Headers */,
|
||||
50ABBD531925AB0000A911A9 /* Quaternion.h in Headers */,
|
||||
15AE19B119AAD39700C27E9E /* ScrollViewReader.h in Headers */,
|
||||
503DD8E81926736A00CD74DD /* CCES2Renderer-ios.h in Headers */,
|
||||
|
|
@ -8607,7 +8597,6 @@
|
|||
B665E20A1AA80A6500DDB1C5 /* CCPUBaseColliderTranslator.cpp in Sources */,
|
||||
B665E3E61AA80A6600DDB1C5 /* CCPUSineForceAffectorTranslator.cpp in Sources */,
|
||||
15AE1B5119AADA9900C27E9E /* UIPageView.cpp in Sources */,
|
||||
50ED2BE619BEAF7900A0AB90 /* UIEditBoxImpl-wp8.cpp in Sources */,
|
||||
15AE18EC19AAD35000C27E9E /* CCActionObject.cpp in Sources */,
|
||||
296BF6181A4405CB0038EC44 /* UIShaders.cpp in Sources */,
|
||||
B665E2821AA80A6500DDB1C5 /* CCPUDoStopSystemEventHandler.cpp in Sources */,
|
||||
|
|
@ -8897,7 +8886,6 @@
|
|||
B665E3471AA80A6500DDB1C5 /* CCPUOnExpireObserverTranslator.cpp in Sources */,
|
||||
15AE1AA519AAD40300C27E9E /* b2Fixture.cpp in Sources */,
|
||||
B29A7DE219EE1B7700872B35 /* MeshAttachment.c in Sources */,
|
||||
50ED2BE719BEAF7900A0AB90 /* UIEditBoxImpl-wp8.cpp in Sources */,
|
||||
B6D38B8F1AC3AFAC00043997 /* CCTextureCube.cpp in Sources */,
|
||||
15AE1BAD19AADFDF00C27E9E /* UILayoutParameter.cpp in Sources */,
|
||||
3823843E1A259140002C4610 /* SingleNodeReader.cpp in Sources */,
|
||||
|
|
|
|||
|
|
@ -1,63 +0,0 @@
|
|||
set IN_DIR=.\..\..\..\angle\src\WP8\redist\vs2012\ARM\Release
|
||||
|
||||
set OUT_DIR=.\..\..\external\wp8-specific\angle\prebuilt\ARM\
|
||||
xcopy "%IN_DIR%\libGLESv2_phone\libGLESv2_phone.dll" "%OUT_DIR%" /iycq
|
||||
|
||||
xcopy "%IN_DIR%\libGLESv2_phone\libGLESv2_phone.lib" "%OUT_DIR%" /iycq
|
||||
|
||||
xcopy "%IN_DIR%\libEGL_phone\libEGL_phone.dll" "%OUT_DIR%" /iycq
|
||||
|
||||
xcopy "%IN_DIR%\libEGL_phone\libEGL_phone.lib" "%OUT_DIR%" /iycq
|
||||
|
||||
xcopy "%IN_DIR%\esUtil_phone\esUtil_phone.lib" "%OUT_DIR%" /iycq
|
||||
|
||||
|
||||
|
||||
set IN_DIR=.\..\..\..\angle\src\WP8\redist\vs2012\Win32\Release
|
||||
|
||||
set OUT_DIR=.\..\..\external\wp8-specific\angle\prebuilt\Win32\
|
||||
|
||||
|
||||
xcopy "%IN_DIR%\libGLESv2_phone\libGLESv2_phone.dll" "%OUT_DIR%" /iycq
|
||||
|
||||
xcopy "%IN_DIR%\libGLESv2_phone\libGLESv2_phone.lib" "%OUT_DIR%" /iycq
|
||||
|
||||
xcopy "%IN_DIR%\libEGL_phone\libEGL_phone.dll" "%OUT_DIR%" /iycq
|
||||
|
||||
xcopy "%IN_DIR%\libEGL_phone\libEGL_phone.lib" "%OUT_DIR%" /iycq
|
||||
|
||||
xcopy "%IN_DIR%\esUtil_phone\esUtil_phone.lib" "%OUT_DIR%" /iycq
|
||||
|
||||
|
||||
|
||||
set IN_DIR=.\..\..\..\angle\src\WinRT\redist\vs2013\ARM\Release\
|
||||
set OUT_DIR=.\..\..\external\winrt-specific\angle\prebuilt\ARM\
|
||||
xcopy "%IN_DIR%\libGLESv2_winrt_2013\libGLESv2.dll" "%OUT_DIR%" /iycq
|
||||
|
||||
xcopy "%IN_DIR%\libGLESv2_winrt_2013\libGLESv2.lib" "%OUT_DIR%" /iycq
|
||||
|
||||
xcopy "%IN_DIR%\libEGL_winrt_2013\libEGL.dll" "%OUT_DIR%" /iycq
|
||||
|
||||
xcopy "%IN_DIR%\libEGL_winrt_2013\libEGL.lib" "%OUT_DIR%" /iycq
|
||||
|
||||
xcopy "%IN_DIR%\esUtil_winrt_2013\esUtil.lib" "%OUT_DIR%" /iycq
|
||||
|
||||
|
||||
set IN_DIR=.\..\..\..\angle\src\WinRT\redist\vs2013\Win32\Release\
|
||||
set OUT_DIR=.\..\..\external\winrt-specific\angle\prebuilt\Win32\
|
||||
xcopy "%IN_DIR%\libGLESv2_winrt_2013\libGLESv2.dll" "%OUT_DIR%" /iycq
|
||||
|
||||
xcopy "%IN_DIR%\libGLESv2_winrt_2013\libGLESv2.lib" "%OUT_DIR%" /iycq
|
||||
|
||||
xcopy "%IN_DIR%\libEGL_winrt_2013\libEGL.dll" "%OUT_DIR%" /iycq
|
||||
|
||||
xcopy "%IN_DIR%\libEGL_winrt_2013\libEGL.lib" "%OUT_DIR%" /iycq
|
||||
|
||||
xcopy "%IN_DIR%\esUtil_winrt_2013\esUtil.lib" "%OUT_DIR%" /iycq
|
||||
|
||||
|
||||
set OUT_DIR=.\..\..\external\winrt-specific\angle\include
|
||||
xcopy ".\..\..\..\angle\include" "%OUT_DIR%" /eiycq
|
||||
xcopy ".\..\..\..\angle\src\common\winrtangle.h" "%OUT_DIR%" /iycq
|
||||
xcopy ".\..\..\..\angle\samples\gles2_book\Common\esUtil.h" "%OUT_DIR%" /iycq
|
||||
|
||||
|
|
@ -1,83 +0,0 @@
|
|||
. ".\scripts\createsln.ps1"
|
||||
. ".\scripts\converterutils.ps1"
|
||||
. ".\scripts\winrtconverter.ps1"
|
||||
|
||||
|
||||
$workingDir = $PSScriptRoot
|
||||
|
||||
|
||||
$cocosDir = join-path $workingDir "..\..\cocos" -Resolve
|
||||
$libGUI = join-path $cocosDir "\gui\proj.wp8\libGUI.vcxproj"
|
||||
$in = join-path $cocosDir "\gui\proj.win32\libGUI.vcxproj"
|
||||
#WinrtConverter $in $libGUI "wp8" >> $null
|
||||
|
||||
$c2dLib = join-path $cocosDir "\2d\cocos2d_wp8.vcxproj"
|
||||
$in = join-path $cocosDir "\2d\cocos2d.vcxproj"
|
||||
#WinrtConverter $in $c2dLib "wp8" >> $null
|
||||
|
||||
$c2dLib = join-path $cocosDir "\2d\cocos2d_winrt.vcxproj"
|
||||
$in = join-path $cocosDir "\2d\cocos2d.vcxproj"
|
||||
#WinrtConverter $in $c2dLib "winrt" >> $null
|
||||
|
||||
$libNetwork = join-path $cocosDir "\network\proj.wp8\libNetwork.vcxproj"
|
||||
$in = join-path $cocosDir "\network\proj.win32\libNetwork.vcxproj"
|
||||
#WinrtConverter $in $libNetwork "wp8" >> $null
|
||||
|
||||
$libLocalStorage = join-path $cocosDir "\storage\local-storage\proj.wp8\libLocalStorage.vcxproj"
|
||||
$in = join-path $cocosDir "\storage\local-storage\proj.win32\libLocalStorage.vcxproj"
|
||||
#WinrtConverter $in $libLocalStorage "wp8" >> $null
|
||||
|
||||
$libAudio = join-path $cocosDir "\audio\proj.wp8\CocosDenshion.vcxproj"
|
||||
$in = join-path $cocosDir "\audio\proj.win32\CocosDenshion.vcxproj"
|
||||
#WinrtConverter $in $libAudio "wp8" >> $null
|
||||
|
||||
$libSpine = join-path $cocosDir "\editor-support\spine\proj.wp8\libSpine.vcxproj"
|
||||
$in = join-path $cocosDir "\editor-support\spine\proj.win32\libSpine.vcxproj"
|
||||
#WinrtConverter $in $libSpine "wp8" >> $null
|
||||
|
||||
$libCocosStudio = join-path $cocosDir "\editor-support\cocostudio\proj.wp8\libCocosStudio.vcxproj"
|
||||
$in = join-path $cocosDir "\editor-support\cocostudio\proj.win32\libCocosStudio.vcxproj"
|
||||
#WinrtConverter $in $libCocosStudio "wp8" >> $null
|
||||
|
||||
$libCocosBuilder = join-path $cocosDir "\editor-support\cocosbuilder\proj.wp8\libCocosBuilder.vcxproj"
|
||||
$in = join-path $cocosDir "\editor-support\cocosbuilder\proj.win32\libCocosBuilder.vcxproj"
|
||||
#WinrtConverter $in $libCocosBuilder "wp8" >> $null
|
||||
|
||||
$extensionsDir = join-path $workingDir "..\..\extensions" -Resolve
|
||||
$libExtensions = join-path $extensionsDir "\proj.wp8\libExtensions.vcxproj"
|
||||
#$in = join-path $extensionsDir "\proj.win32\libExtensions.vcxproj"
|
||||
#WinrtConverter $in $libExtensions "wp8" >> $null
|
||||
|
||||
$externalDir = join-path $workingDir "..\..\external" -Resolve
|
||||
$box2dDir = join-path $workingDir "..\..\external\Box2D" -Resolve
|
||||
$libBox2d = join-path $box2dDir "\proj.wp8\Box2D.vcxproj"
|
||||
$in = join-path $box2dDir "\proj.win32\Box2D.vcxproj"
|
||||
#WinrtConverter $in $libBox2d "wp8" >> $null
|
||||
|
||||
$freetypeDir = join-path $workingDir "..\..\external\freetype2\include\wp8" -Resolve
|
||||
$libFreetype = join-path $freetypeDir "\freetype-2.5.3\builds\windows\vc2010\freetype_wp8.vcxproj"
|
||||
$in = join-path $freetypeDir "\freetype-2.5.3\builds\windows\vc2010\freetype.vcxproj"
|
||||
#WinrtConverter $in $libFreetype "wp8" >> $null
|
||||
|
||||
|
||||
$chipmunkDir = join-path $workingDir "..\..\external\chipmunk" -Resolve
|
||||
$libChipmunk = join-path $chipmunkDir "\proj.wp8\chipmunk.vcxproj"
|
||||
$in = join-path $chipmunkDir "\proj.win32\chipmunk.vcxproj"
|
||||
#WinrtConverter $in $libChipmunk "wp8" >> $null
|
||||
|
||||
$chipmunkDir = join-path $workingDir "..\..\external\chipmunk" -Resolve
|
||||
$libChipmunk = join-path $chipmunkDir "\proj.winrt\chipmunk.vcxproj"
|
||||
$in = join-path $chipmunkDir "\proj.win32\chipmunk.vcxproj"
|
||||
#WinrtConverter $in $libChipmunk "winrt" >> $null
|
||||
|
||||
|
||||
$testDir = join-path $workingDir "..\..\tests" -Resolve
|
||||
$testApp = join-path $testDir "\proj.wp8\TestCpp.vcxproj"
|
||||
$in = join-path $testDir "\proj.win32\TestCpp.vcxproj"
|
||||
#WinrtConverter $in $testApp "wp8" >> $null
|
||||
|
||||
#create opencv sln
|
||||
$solutionDir = join-path $workingDir "..\" -Resolve
|
||||
$solution = join-path $solutionDir "cocos2d-wp8.vc2012.sln"
|
||||
#CreateSolutionFile $solution "wp8" ($c2dLib, $libGUI, $libSpine, $libCocosStudio, $libCocosBuilder, $libExtensions, $libBox2d, $libChipmunk, $libLocalStorage, $libAudio, $testApp)
|
||||
|
||||
|
|
@ -1,157 +0,0 @@
|
|||
. ".\scripts\createsln.ps1"
|
||||
|
||||
#use MSBuild namespace
|
||||
$ms = 'http://schemas.microsoft.com/developer/msbuild/2003'
|
||||
$ns = @{ ms = $ms }
|
||||
|
||||
Function GetDirectoryName($path)
|
||||
{
|
||||
return [System.IO.Path]::GetFileName($path)
|
||||
}
|
||||
|
||||
Function GetFileName($path)
|
||||
{
|
||||
return [System.IO.Path]::GetFileName($path)
|
||||
}
|
||||
|
||||
Function Get-RelativePath($Folder, $FilePath)
|
||||
{
|
||||
Write-Verbose "Resolving paths relative to '$Folder'"
|
||||
$from = $Folder = split-path $Folder -NoQualifier -Resolve:$Resolve
|
||||
$to = $filePath = split-path $filePath -NoQualifier -Resolve:$Resolve
|
||||
|
||||
while($from -and $to -and ($from -ne $to)) {
|
||||
if($from.Length -gt $to.Length) {
|
||||
$from = split-path $from
|
||||
} else {
|
||||
$to = split-path $to
|
||||
}
|
||||
}
|
||||
|
||||
$filepath = $filepath -replace "^"+[regex]::Escape($to)+"\\"
|
||||
$from = $Folder
|
||||
while($from -and $to -and $from -gt $to ) {
|
||||
$from = split-path $from
|
||||
$filepath = join-path ".." $filepath
|
||||
}
|
||||
return $filepath
|
||||
}
|
||||
|
||||
|
||||
Function ReplaceText($path, $text, $replace)
|
||||
{
|
||||
(Get-Content $path) |
|
||||
Foreach-Object {$_ -replace $text, $replace} |
|
||||
Set-Content $path
|
||||
}
|
||||
|
||||
|
||||
|
||||
Function LoadXmlFile($path)
|
||||
{
|
||||
$xml = New-Object -TypeName XML
|
||||
$xml.Load($path)
|
||||
return $xml
|
||||
}
|
||||
|
||||
Function AddElement($xml, $root, $name, $value, $namespace)
|
||||
{
|
||||
$newEl = $xml.CreateElement($name, $namespace)
|
||||
$xmlText = $xml.CreateTextNode($value)
|
||||
$newEl.AppendChild($xmlText)
|
||||
$root.AppendChild($newEl)
|
||||
return $newEl
|
||||
}
|
||||
|
||||
Function GetProjectGlobals($path, $namespace)
|
||||
{
|
||||
$xml = LoadXmlFile($path)
|
||||
$globals = Select-XML -Xml $xml -XPath '//ms:PropertyGroup[@Label="Globals"]' -Namespace $namespace
|
||||
return $globals
|
||||
}
|
||||
|
||||
Function AddProjectReference($toProject, $projects)
|
||||
{
|
||||
$xml = LoadXmlFile($toProject)
|
||||
$xdNS = $xml.DocumentElement.NamespaceURI
|
||||
|
||||
foreach($fromProject in $projects)
|
||||
{
|
||||
$globals = GetProjectGlobals $fromProject $ns
|
||||
$itemGroup = $xml.CreateElement("ItemGroup", $xdNS)
|
||||
$projectReference = $xml.CreateElement("ProjectReference", $xdNS)
|
||||
$project = $xml.CreateElement("Project", $xdNS)
|
||||
$xmlText = $xml.CreateTextNode($globals.Node.ProjectGuid)
|
||||
$project.AppendChild($xmlText)
|
||||
$projectReference.AppendChild($project)
|
||||
|
||||
$include = $xml.CreateAttribute("Include")
|
||||
|
||||
$dir = Split-Path -parent $toProject
|
||||
$include.Value = Get-RelativePath $dir $fromProject
|
||||
$projectReference.Attributes.Append($include)
|
||||
|
||||
|
||||
$itemGroup.AppendChild($projectReference)
|
||||
|
||||
$root = Select-XML -Xml $xml -XPath '//ms:Project[@DefaultTargets="Build"]' -Namespace $ns
|
||||
$root.Node.AppendChild($itemGroup)
|
||||
}
|
||||
$xml.Save($toProject)
|
||||
}
|
||||
|
||||
Function AddPreprocessorDefine($xml, $define)
|
||||
{
|
||||
foreach($item in (Select-XML -Xml $xml -XPath '//ms:ItemDefinitionGroup' -Namespace $ns))
|
||||
{
|
||||
if(!($item.Node.ClCompile.PreprocessorDefinitions -match ($define + ';')))
|
||||
{
|
||||
$item.Node.ClCompile.PreprocessorDefinitions = $define + ";" + $item.Node.ClCompile.PreprocessorDefinitions
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
<#
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\3rdparty\zlib\zlib.vcxproj">
|
||||
<Project>{c38fab57-9dec-4546-bd9a-6c1dbba6c077}</Project>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
#>
|
||||
|
||||
|
||||
|
||||
|
||||
Function RemoveNode($xml, $xpath)
|
||||
{
|
||||
$item = Select-XML -Xml $xml -XPath $xpath -Namespace $ns
|
||||
if($item)
|
||||
{
|
||||
$item.Node.ParentNode.RemoveChild($item.node)
|
||||
}
|
||||
}
|
||||
|
||||
Function RemoveProjectFile($path, $filename)
|
||||
{
|
||||
$xml = LoadXmlFile($path)
|
||||
$xpath = '//ms:ClCompile [@Include="' + $filename + '"]'
|
||||
RemoveNode $xml $xpath
|
||||
$xml.Save($path)
|
||||
$xml = LoadXmlFile($path + ".filters")
|
||||
RemoveNode $xml $xpath
|
||||
$xml.Save($path + ".filters")
|
||||
}
|
||||
|
||||
Function CreateSolutionFile($path, $platform, $projects)
|
||||
{
|
||||
$solution = CreateSolution
|
||||
$solution.solutionDir = Split-Path -parent $path
|
||||
foreach($project in $projects)
|
||||
{
|
||||
$solution.AddProject($project)
|
||||
}
|
||||
$solution.Save($path, $platform)
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
|
@ -1,98 +0,0 @@
|
|||
Function CreateSolution()
|
||||
{
|
||||
$solution = New-Module -AsCustomObject -ScriptBlock {
|
||||
. ".\scripts\converterutils.ps1"
|
||||
|
||||
#use MSBuild namespace
|
||||
$ms = 'http://schemas.microsoft.com/developer/msbuild/2003'
|
||||
$ns = @{ ms = $ms }
|
||||
|
||||
$projects = @()
|
||||
$solutionDir = ""
|
||||
|
||||
|
||||
Function AddProject($path) {
|
||||
$globals = GetProjectGlobals $path $ns
|
||||
$guid = $globals.Node.ProjectGuid
|
||||
$relativePath = Get-RelativePath $this.solutionDir $path
|
||||
$project = New-Object –TypeName PSObject
|
||||
$project | Add-Member –MemberType NoteProperty –Name guid –Value $globals.Node.ProjectGuid
|
||||
$project | Add-Member –MemberType NoteProperty –Name path –Value $relativePath
|
||||
if($globals.Node.ProjectName)
|
||||
{
|
||||
$project | Add-Member –MemberType NoteProperty –Name name –Value $globals.Node.ProjectName
|
||||
}
|
||||
else
|
||||
{
|
||||
$project | Add-Member –MemberType NoteProperty –Name name –Value $globals.Node.RootNamespace
|
||||
}
|
||||
|
||||
$this.projects += $project
|
||||
}
|
||||
|
||||
Function Save($path, $platform) {
|
||||
$output = New-Item $path -type file -force
|
||||
|
||||
if($platform -eq "winrt")
|
||||
{
|
||||
$template = join-path $PSScriptRoot "templates\winrt_sln_header_template.txt"
|
||||
}
|
||||
elseif($platform -eq "wp8")
|
||||
{
|
||||
$template = join-path $PSScriptRoot "templates\wp8_sln_header_template.txt"
|
||||
}
|
||||
else
|
||||
{
|
||||
throw "Unknown platform argument (winrt or wp8)"
|
||||
}
|
||||
|
||||
(Get-Content $template) |
|
||||
Add-Content $path
|
||||
|
||||
foreach($project in $this.projects)
|
||||
{
|
||||
$line = 'Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "' + $project.name + '", "' + $project.path + '", "' + $project.guid + '"'
|
||||
#Add-Content $path 'Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opencv_core", "opencv_core.vcxproj", "{8F928FE0-8A06-4F93-99FE-53B9C7A006CA}"'
|
||||
Add-Content $path $line
|
||||
Add-Content $path 'EndProject'
|
||||
}
|
||||
|
||||
$template = join-path $PSScriptRoot "templates\global_start_template.txt"
|
||||
(Get-Content $template) |
|
||||
Add-Content $path
|
||||
|
||||
$template = join-path $PSScriptRoot "templates\globalsection_template.txt"
|
||||
foreach($project in $this.projects)
|
||||
{
|
||||
(Get-Content $template) |
|
||||
Foreach-Object {$_ -replace "REPLACE_GUID", $project.guid} |
|
||||
Add-Content $path
|
||||
}
|
||||
|
||||
$template = join-path $PSScriptRoot "templates\global_end_template.txt"
|
||||
(Get-Content $template) |
|
||||
Add-Content $path
|
||||
}
|
||||
|
||||
Export-ModuleMember -Variable * -Function *
|
||||
}
|
||||
return $solution
|
||||
}
|
||||
|
||||
<#
|
||||
$solutionDir = join-path $WorkingDir ".\modules\core"
|
||||
$path = join-path $solutionDir "opencv_core.vcxproj"
|
||||
$output = join-path $solutionDir "opencv_core2.sln"
|
||||
|
||||
|
||||
$solution = CreateSolution
|
||||
$solution.solutionDir = $solutionDir
|
||||
$solution.AddProject($path)
|
||||
|
||||
$path = join-path $WorkingDir ".\3rdparty\zlib\zlib.vcxproj"
|
||||
$solution.AddProject($path)
|
||||
|
||||
$solution.Save($output)
|
||||
notepad $output
|
||||
#>
|
||||
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|ARM = Debug|ARM
|
||||
Debug|Win32 = Debug|Win32
|
||||
Debug|x64 = Debug|x64
|
||||
Release|ARM = Release|ARM
|
||||
Release|Win32 = Release|Win32
|
||||
Release|x64 = Release|x64
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
REPLACE_GUID.Debug|ARM.ActiveCfg = Debug|ARM
|
||||
REPLACE_GUID.Debug|ARM.Build.0 = Debug|ARM
|
||||
REPLACE_GUID.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
REPLACE_GUID.Debug|Win32.Build.0 = Debug|Win32
|
||||
REPLACE_GUID.Debug|x64.ActiveCfg = Debug|x64
|
||||
REPLACE_GUID.Debug|x64.Build.0 = Debug|x64
|
||||
REPLACE_GUID.Release|ARM.ActiveCfg = Release|ARM
|
||||
REPLACE_GUID.Release|ARM.Build.0 = Release|ARM
|
||||
REPLACE_GUID.Release|Win32.ActiveCfg = Release|Win32
|
||||
REPLACE_GUID.Release|Win32.Build.0 = Release|Win32
|
||||
REPLACE_GUID.Release|x64.ActiveCfg = Release|x64
|
||||
REPLACE_GUID.Release|x64.Build.0 = Release|x64
|
||||
|
|
@ -1,188 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<ItemGroup Label="ProjectConfigurations">
|
||||
<ProjectConfiguration Include="Debug|ARM">
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>ARM</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Debug|Win32">
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Debug|x64">
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>x64</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release|ARM">
|
||||
<Configuration>Release</Configuration>
|
||||
<Platform>ARM</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release|Win32">
|
||||
<Configuration>Release</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release|x64">
|
||||
<Configuration>Release</Configuration>
|
||||
<Platform>x64</Platform>
|
||||
</ProjectConfiguration>
|
||||
</ItemGroup>
|
||||
<PropertyGroup Label="Globals">
|
||||
<ProjectGuid>{9c7946f4-84fe-4b1c-b715-50083798b41c}</ProjectGuid>
|
||||
<Keyword>Win32Proj</Keyword>
|
||||
<ProjectName>Dll1</ProjectName>
|
||||
<RootNamespace>Dll1</RootNamespace>
|
||||
<DefaultLanguage>en-US</DefaultLanguage>
|
||||
<MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
|
||||
<AppContainerApplication>true</AppContainerApplication>
|
||||
<ApplicationType>Windows Store</ApplicationType>
|
||||
<ApplicationTypeRevision>8.1</ApplicationTypeRevision>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||
<UseDebugLibraries>true</UseDebugLibraries>
|
||||
<PlatformToolset>v120</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
|
||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||
<UseDebugLibraries>true</UseDebugLibraries>
|
||||
<PlatformToolset>v120</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||
<UseDebugLibraries>true</UseDebugLibraries>
|
||||
<PlatformToolset>v120</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||
<PlatformToolset>v120</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
|
||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||
<PlatformToolset>v120</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||
<PlatformToolset>v120</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<PropertyGroup Label="UserMacros" />
|
||||
<PropertyGroup />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<GenerateManifest>false</GenerateManifest>
|
||||
<IgnoreImportLibrary>false</IgnoreImportLibrary>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<GenerateManifest>false</GenerateManifest>
|
||||
<IgnoreImportLibrary>false</IgnoreImportLibrary>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
|
||||
<GenerateManifest>false</GenerateManifest>
|
||||
<IgnoreImportLibrary>false</IgnoreImportLibrary>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
|
||||
<GenerateManifest>false</GenerateManifest>
|
||||
<IgnoreImportLibrary>false</IgnoreImportLibrary>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
<GenerateManifest>false</GenerateManifest>
|
||||
<IgnoreImportLibrary>false</IgnoreImportLibrary>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
<GenerateManifest>false</GenerateManifest>
|
||||
<IgnoreImportLibrary>false</IgnoreImportLibrary>
|
||||
</PropertyGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<ClCompile>
|
||||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||||
<CompileAsWinRT>false</CompileAsWinRT>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
|
||||
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<ClCompile>
|
||||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||||
<CompileAsWinRT>false</CompileAsWinRT>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
|
||||
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|arm'">
|
||||
<ClCompile>
|
||||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||||
<CompileAsWinRT>false</CompileAsWinRT>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
|
||||
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|arm'">
|
||||
<ClCompile>
|
||||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||||
<CompileAsWinRT>false</CompileAsWinRT>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
|
||||
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
<ClCompile>
|
||||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||||
<CompileAsWinRT>false</CompileAsWinRT>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
|
||||
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
<ClCompile>
|
||||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||||
<CompileAsWinRT>false</CompileAsWinRT>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
|
||||
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
</ImportGroup>
|
||||
</Project>
|
||||
|
|
@ -1,188 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<ItemGroup Label="ProjectConfigurations">
|
||||
<ProjectConfiguration Include="Debug|ARM">
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>ARM</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Debug|Win32">
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Debug|x64">
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>x64</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release|ARM">
|
||||
<Configuration>Release</Configuration>
|
||||
<Platform>ARM</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release|Win32">
|
||||
<Configuration>Release</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release|x64">
|
||||
<Configuration>Release</Configuration>
|
||||
<Platform>x64</Platform>
|
||||
</ProjectConfiguration>
|
||||
</ItemGroup>
|
||||
<PropertyGroup Label="Globals">
|
||||
<ProjectGuid>{8597d6ff-2d26-4f86-a7d4-72d102a7a8b6}</ProjectGuid>
|
||||
<Keyword>Win32Proj</Keyword>
|
||||
<ProjectName>WinRTStatic</ProjectName>
|
||||
<RootNamespace>WinRTStatic</RootNamespace>
|
||||
<DefaultLanguage>en-US</DefaultLanguage>
|
||||
<MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
|
||||
<AppContainerApplication>true</AppContainerApplication>
|
||||
<ApplicationType>Windows Store</ApplicationType>
|
||||
<ApplicationTypeRevision>8.1</ApplicationTypeRevision>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||
<UseDebugLibraries>true</UseDebugLibraries>
|
||||
<PlatformToolset>v120</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
|
||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||
<UseDebugLibraries>true</UseDebugLibraries>
|
||||
<PlatformToolset>v120</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||
<UseDebugLibraries>true</UseDebugLibraries>
|
||||
<PlatformToolset>v120</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||
<PlatformToolset>v120</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
|
||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||
<PlatformToolset>v120</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||
<PlatformToolset>v120</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<PropertyGroup Label="UserMacros" />
|
||||
<PropertyGroup />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<GenerateManifest>false</GenerateManifest>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<GenerateManifest>false</GenerateManifest>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
|
||||
<GenerateManifest>false</GenerateManifest>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
|
||||
<GenerateManifest>false</GenerateManifest>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
<GenerateManifest>false</GenerateManifest>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
<GenerateManifest>false</GenerateManifest>
|
||||
</PropertyGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<ClCompile>
|
||||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||||
<CompileAsWinRT>false</CompileAsWinRT>
|
||||
<SDLCheck>true</SDLCheck>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
|
||||
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<ClCompile>
|
||||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||||
<CompileAsWinRT>false</CompileAsWinRT>
|
||||
<SDLCheck>true</SDLCheck>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
|
||||
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|arm'">
|
||||
<ClCompile>
|
||||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||||
<CompileAsWinRT>false</CompileAsWinRT>
|
||||
<SDLCheck>true</SDLCheck>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
|
||||
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|arm'">
|
||||
<ClCompile>
|
||||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||||
<CompileAsWinRT>false</CompileAsWinRT>
|
||||
<SDLCheck>true</SDLCheck>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
|
||||
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
<ClCompile>
|
||||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||||
<CompileAsWinRT>false</CompileAsWinRT>
|
||||
<SDLCheck>true</SDLCheck>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
|
||||
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
<ClCompile>
|
||||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||||
<CompileAsWinRT>false</CompileAsWinRT>
|
||||
<SDLCheck>true</SDLCheck>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
|
||||
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
</ImportGroup>
|
||||
</Project>
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio 2013
|
||||
VisualStudioVersion = 12.0.21005.1
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
|
|
@ -1,135 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<ItemGroup Label="ProjectConfigurations">
|
||||
<ProjectConfiguration Include="Debug|Win32">
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Debug|ARM">
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>ARM</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release|Win32">
|
||||
<Configuration>Release</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release|ARM">
|
||||
<Configuration>Release</Configuration>
|
||||
<Platform>ARM</Platform>
|
||||
</ProjectConfiguration>
|
||||
</ItemGroup>
|
||||
<PropertyGroup Label="Globals">
|
||||
<ProjectGuid>{03008f82-0317-416a-88d1-068f2c3158e4}</ProjectGuid>
|
||||
<RootNamespace>PhoneDLL1</RootNamespace>
|
||||
<DefaultLanguage>en-US</DefaultLanguage>
|
||||
<MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||
<UseDebugLibraries>true</UseDebugLibraries>
|
||||
<PlatformToolset>v110_wp80</PlatformToolset>
|
||||
<IgnoreImportLibrary>false</IgnoreImportLibrary>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
|
||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||
<UseDebugLibraries>true</UseDebugLibraries>
|
||||
<PlatformToolset>v110_wp80</PlatformToolset>
|
||||
<IgnoreImportLibrary>false</IgnoreImportLibrary>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||
<PlatformToolset>v110_wp80</PlatformToolset>
|
||||
<IgnoreImportLibrary>false</IgnoreImportLibrary>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
|
||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||
<PlatformToolset>v110_wp80</PlatformToolset>
|
||||
<IgnoreImportLibrary>false</IgnoreImportLibrary>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
||||
<ImportGroup Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<PropertyGroup Label="UserMacros" />
|
||||
<PropertyGroup>
|
||||
<GenerateManifest>false</GenerateManifest>
|
||||
</PropertyGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<ClCompile>
|
||||
<PreprocessorDefinitions>_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
|
||||
<CompileAsWinRT>false</CompileAsWinRT>
|
||||
<AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
|
||||
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<ClCompile>
|
||||
<PreprocessorDefinitions>_USRDLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
|
||||
<CompileAsWinRT>false</CompileAsWinRT>
|
||||
<AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
|
||||
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
|
||||
<ClCompile>
|
||||
<PreprocessorDefinitions>_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
|
||||
<CompileAsWinRT>false</CompileAsWinRT>
|
||||
<AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
|
||||
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
|
||||
<ClCompile>
|
||||
<PreprocessorDefinitions>_USRDLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
|
||||
<CompileAsWinRT>false</CompileAsWinRT>
|
||||
<AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
|
||||
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="Windows">
|
||||
<IsWinMDFile>true</IsWinMDFile>
|
||||
</Reference>
|
||||
<Reference Include="platform.winmd">
|
||||
<IsWinMDFile>true</IsWinMDFile>
|
||||
<Private>false</Private>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsPhone\v$(TargetPlatformVersion)\Microsoft.Cpp.WindowsPhone.$(TargetPlatformVersion).targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
</ImportGroup>
|
||||
</Project>
|
||||
|
|
@ -1,119 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<ItemGroup Label="ProjectConfigurations">
|
||||
<ProjectConfiguration Include="Debug|Win32">
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Debug|ARM">
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>ARM</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release|Win32">
|
||||
<Configuration>Release</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release|ARM">
|
||||
<Configuration>Release</Configuration>
|
||||
<Platform>ARM</Platform>
|
||||
</ProjectConfiguration>
|
||||
</ItemGroup>
|
||||
<PropertyGroup Label="Globals">
|
||||
<ProjectGuid>{5c48b0d3-dcad-4bfd-a77f-0dac7316f57a}</ProjectGuid>
|
||||
<RootNamespace>PhoneLib1</RootNamespace>
|
||||
<DefaultLanguage>en-US</DefaultLanguage>
|
||||
<MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||
<UseDebugLibraries>true</UseDebugLibraries>
|
||||
<PlatformToolset>v110_wp80</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
|
||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||
<UseDebugLibraries>true</UseDebugLibraries>
|
||||
<PlatformToolset>v110_wp80</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||
<PlatformToolset>v110_wp80</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
|
||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||
<PlatformToolset>v110_wp80</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
||||
<ImportGroup Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<PropertyGroup Label="UserMacros" />
|
||||
<PropertyGroup>
|
||||
<GenerateManifest>false</GenerateManifest>
|
||||
</PropertyGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<ClCompile>
|
||||
<PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
|
||||
<AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<ClCompile>
|
||||
<PreprocessorDefinitions>_LIB;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
|
||||
<AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
|
||||
<ClCompile>
|
||||
<PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
|
||||
<AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
|
||||
<ClCompile>
|
||||
<PreprocessorDefinitions>_LIB;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
|
||||
<AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="Windows">
|
||||
<IsWinMDFile>true</IsWinMDFile>
|
||||
</Reference>
|
||||
<Reference Include="platform.winmd">
|
||||
<IsWinMDFile>true</IsWinMDFile>
|
||||
<Private>false</Private>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsPhone\v$(TargetPlatformVersion)\Microsoft.Cpp.WindowsPhone.$(TargetPlatformVersion).targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
</ImportGroup>
|
||||
</Project>
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio 2012
|
||||
|
|
@ -1,259 +0,0 @@
|
|||
. ".\scripts\converterutils.ps1"
|
||||
|
||||
#use MSBuild namespace
|
||||
$ms = 'http://schemas.microsoft.com/developer/msbuild/2003'
|
||||
$ns = @{ ms = $ms }
|
||||
|
||||
|
||||
|
||||
|
||||
Function ConvertAdditionalIncludesToRelativePaths($paths, $folder)
|
||||
{
|
||||
$result = ""
|
||||
$tokens = $paths.replace(' ','').split(';')
|
||||
foreach($token in $tokens)
|
||||
{
|
||||
if($token -ne "%(AdditionalIncludeDirectories)")
|
||||
{
|
||||
$result += (Get-RelativePath $folder $token) + ';'
|
||||
}
|
||||
else
|
||||
{
|
||||
$result += "%(AdditionalIncludeDirectories);"
|
||||
}
|
||||
|
||||
}
|
||||
return $result
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
Function WinrtConverter($inFile, $outFile, $platform)
|
||||
{
|
||||
$InputDirPath = Split-Path -parent $inFile
|
||||
$InputDir = [System.IO.Path]::GetFileNameWithoutExtension($InputDirPath)
|
||||
$fileName = [System.IO.Path]::GetFileNameWithoutExtension($inFile)
|
||||
$OutDir = Split-Path -parent $outFile
|
||||
|
||||
#create output dir
|
||||
New-Item -ItemType Directory -Force -Path $OutDir
|
||||
|
||||
<#
|
||||
Try to load the output file.
|
||||
If successful, copy the guid out of the globals section
|
||||
#>
|
||||
|
||||
$guid =$null
|
||||
|
||||
try
|
||||
{
|
||||
$xml = New-Object -TypeName XML
|
||||
$xml.Load($outFile)
|
||||
$globals = Select-XML -Xml $xml -XPath '//ms:PropertyGroup[@Label="Globals"]' -Namespace $ns
|
||||
$guid = $globals.Node.ProjectGuid
|
||||
}
|
||||
catch
|
||||
{
|
||||
$guid = '{' + [guid]::NewGuid().toString().ToUpper() + '}'
|
||||
}
|
||||
|
||||
# load input file into an XML object:
|
||||
$xml_win32 = New-Object -TypeName XML
|
||||
$xml_win32.Load($inFile)
|
||||
|
||||
$configs = Select-XML -Xml $xml_win32 -XPath '//ms:PropertyGroup[@Label="Configuration"]' -Namespace $ns
|
||||
|
||||
$Template = $null
|
||||
|
||||
if($platform -eq "winrt")
|
||||
{
|
||||
if($configs[0].Node.ConfigurationType -eq "DynamicLibrary")
|
||||
{
|
||||
$Template = join-path $PSScriptRoot "templates\winrt_dll_template.vcxproj"
|
||||
}
|
||||
elseif($configs[0].Node.ConfigurationType -eq "StaticLibrary")
|
||||
{
|
||||
$Template = join-path $PSScriptRoot "templates\winrt_lib_template.vcxproj"
|
||||
}
|
||||
else
|
||||
{
|
||||
throw "Unknown vcxproj type"
|
||||
}
|
||||
}
|
||||
elseif($platform -eq "wp8")
|
||||
{
|
||||
if($configs[0].Node.ConfigurationType -eq "DynamicLibrary")
|
||||
{
|
||||
$Template = join-path $PSScriptRoot "templates\wp8_dll_template.vcxproj"
|
||||
}
|
||||
elseif($configs[0].Node.ConfigurationType -eq "StaticLibrary")
|
||||
{
|
||||
$Template = join-path $PSScriptRoot "templates\wp8_lib_template.vcxproj"
|
||||
}
|
||||
elseif($configs[0].Node.ConfigurationType -eq "Application")
|
||||
{
|
||||
$Template = join-path $PSScriptRoot "templates\wp8_lib_template.vcxproj"
|
||||
}
|
||||
else
|
||||
{
|
||||
throw "Unknown vcxproj type"
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
throw "Unknown platform argument -p (winrt or wp8)"
|
||||
}
|
||||
|
||||
$xml_template = New-Object -TypeName XML
|
||||
$xml_template.Load($Template)
|
||||
|
||||
|
||||
#Update Project Guid and Name
|
||||
$win32_globals = Select-XML -Xml $xml_win32 -XPath '//ms:PropertyGroup[@Label="Globals"]' -Namespace $ns
|
||||
|
||||
$winrt_globals = Select-XML -Xml $xml_template -XPath '//ms:PropertyGroup[@Label="Globals"]' -Namespace $ns
|
||||
$winrt_globals.Node.ProjectGuid = $guid
|
||||
|
||||
|
||||
if($win32_globals.Node.ProjectName)
|
||||
{
|
||||
$winrt_globals.Node.RootNamespace = $win32_globals.Node.ProjectName
|
||||
|
||||
if($winrt_globals.Node.ProjectName)
|
||||
{
|
||||
$winrt_globals.Node.ProjectName = $win32_globals.Node.ProjectName
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
if($win32_globals.Node.RootNamespace)
|
||||
{
|
||||
$winrt_globals.Node.RootNamespace = $win32_globals.Node.RootNamespace
|
||||
}
|
||||
|
||||
$project = Select-XML -Xml $xml_template -XPath '//ms:Project' -Namespace $ns
|
||||
|
||||
|
||||
|
||||
foreach($item in (Select-XML -Xml $xml_win32 -XPath '//ms:ItemGroup' -Namespace $ns))
|
||||
{
|
||||
if ($item.node.ClInclude -or $item.node.ClCompile)
|
||||
{
|
||||
$newNode = $xml_template.ImportNode($item.Node, $true)
|
||||
$project.Node.AppendChild($newNode)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
#Copy ItemDefinitionGroup properties
|
||||
$debug_properties = $null
|
||||
$release_properties = $null
|
||||
|
||||
|
||||
foreach($item in (Select-XML -Xml $xml_win32 -XPath '//ms:ItemDefinitionGroup' -Namespace $ns))
|
||||
{
|
||||
if($item.node.Condition -match "debug")
|
||||
{
|
||||
$debug_properties = $item
|
||||
}
|
||||
else
|
||||
{
|
||||
$release_properties = $item
|
||||
}
|
||||
}
|
||||
|
||||
$debug_includes = $debug_properties.Node.ClCompile.AdditionalIncludeDirectories
|
||||
$release_includes = $release_properties.Node.ClCompile.AdditionalIncludeDirectories
|
||||
|
||||
|
||||
foreach($item in (Select-XML -Xml $xml_template -XPath '//ms:ItemDefinitionGroup' -Namespace $ns))
|
||||
{
|
||||
$includes = $release_includes;
|
||||
$properties = $release_properties
|
||||
|
||||
if($item.node.Condition -match "debug")
|
||||
{
|
||||
$includes = $debug_includes;
|
||||
$properties = $debug_properties
|
||||
}
|
||||
|
||||
AddElement $xml_template $item.Node.ClCompile 'AdditionalIncludeDirectories' $includes $ms
|
||||
AddElement $xml_template $item.Node.ClCompile 'PreprocessorDefinitions' $properties.Node.ClCompile.PreprocessorDefinitions $ms
|
||||
if($properties.Node.ClCompile.PrecompiledHeader)
|
||||
{
|
||||
$item.Node.ClCompile.PrecompiledHeader = $properties.Node.ClCompile.PrecompiledHeader
|
||||
}
|
||||
|
||||
if($properties.Node.ClCompile.PrecompiledHeaderFile)
|
||||
{
|
||||
AddElement $xml_template $item.Node.ClCompile 'PrecompiledHeaderFile' "precomp.hpp" $ms
|
||||
}
|
||||
|
||||
|
||||
|
||||
if($properties.Node.ClCompile.ForcedIncludeFiles)
|
||||
{
|
||||
AddElement $xml_template $item.Node.ClCompile 'ForcedIncludeFiles' "precomp.hpp" $ms
|
||||
}
|
||||
|
||||
|
||||
if($properties.Node.ClCompile.DisableSpecificWarnings)
|
||||
{
|
||||
AddElement $xml_template $item.Node.ClCompile 'DisableSpecificWarnings' $properties.Node.ClCompile.DisableSpecificWarnings $ms
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
#save output file
|
||||
$xml_template.Save($outFile)
|
||||
|
||||
|
||||
|
||||
|
||||
foreach($item in (Select-XML -Xml $xml_template -XPath '//ms:Project//ms:ItemGroup//ms:ClCompile//ms:PrecompiledHeader' -Namespace $ns))
|
||||
{
|
||||
$newNode = $xml_template.ImportNode($item.Node, $true)
|
||||
$newNode.Condition = $newNode.Condition.replace("Win32", "ARM")
|
||||
$item.Node.parentNode.AppendChild($newNode)
|
||||
$newNode = $xml_template.ImportNode($item.Node, $true)
|
||||
$newNode.Condition = $newNode.Condition.replace("Win32", "x64")
|
||||
$item.Node.parentNode.AppendChild($newNode)
|
||||
}
|
||||
|
||||
foreach($item in (Select-XML -Xml $xml_template -XPath '//ms:Project//ms:ItemGroup//ms:ClCompile//ms:PrecompiledHeaderFile' -Namespace $ns))
|
||||
{
|
||||
$item.Node."#text" = "precomp.hpp"
|
||||
$newNode = $xml_template.ImportNode($item.Node, $true)
|
||||
$newNode.Condition = $newNode.Condition.replace("Win32", "ARM")
|
||||
$item.Node.parentNode.AppendChild($newNode)
|
||||
$newNode = $xml_template.ImportNode($item.Node, $true)
|
||||
$newNode.Condition = $newNode.Condition.replace("Win32", "x64")
|
||||
$item.Node.parentNode.AppendChild($newNode)
|
||||
}
|
||||
|
||||
$xml_template.selectNodes('//data/value[contains(.,"precomp.hpp")]')|
|
||||
ForEach-Object{
|
||||
$_.'#text' = 'precomp.hpp'
|
||||
}
|
||||
|
||||
$xml_template.Save($outFile)
|
||||
|
||||
|
||||
#copy .filters file
|
||||
try
|
||||
{
|
||||
$filters = $inFile + ".filters"
|
||||
$xml_filters = New-Object -TypeName XML
|
||||
$xml_filters.Load($filters)
|
||||
$xml_filters.Save($outFile + ".filters")
|
||||
}
|
||||
catch
|
||||
{
|
||||
Write-Host "No .filters file"
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
How to compile precompiled shaders for Windows Phone 8.0 (WP8)
|
||||
|
||||
1. Open the VS project Cocos2dShaderCompiler\Cocos2dShaderCompiler.sln
|
||||
2. Build and run the project
|
||||
3. Click the Compile button
|
||||
4. Select the file cocos\platform\wp8\shaders\precompiledshaders.h in the file dialog box
|
||||
5. Program will precompile all of the cached cocos2d-x shaders.
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
<Application
|
||||
x:Class="Cocos2dShaderCompiler.App"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:local="using:Cocos2dShaderCompiler">
|
||||
|
||||
</Application>
|
||||
|
|
@ -1,89 +0,0 @@
|
|||
//
|
||||
// App.xaml.cpp
|
||||
// Implementation of the App class.
|
||||
//
|
||||
|
||||
#include "pch.h"
|
||||
#include "DirectXPage.xaml.h"
|
||||
|
||||
using namespace Cocos2dShaderCompiler;
|
||||
|
||||
using namespace Platform;
|
||||
using namespace Windows::ApplicationModel;
|
||||
using namespace Windows::ApplicationModel::Activation;
|
||||
using namespace Windows::Foundation;
|
||||
using namespace Windows::Foundation::Collections;
|
||||
using namespace Windows::Storage;
|
||||
using namespace Windows::UI::Xaml;
|
||||
using namespace Windows::UI::Xaml::Controls;
|
||||
using namespace Windows::UI::Xaml::Controls::Primitives;
|
||||
using namespace Windows::UI::Xaml::Data;
|
||||
using namespace Windows::UI::Xaml::Input;
|
||||
using namespace Windows::UI::Xaml::Interop;
|
||||
using namespace Windows::UI::Xaml::Media;
|
||||
using namespace Windows::UI::Xaml::Navigation;
|
||||
/// <summary>
|
||||
/// Initializes the singleton application object. This is the first line of authored code
|
||||
/// executed, and as such is the logical equivalent of main() or WinMain().
|
||||
/// </summary>
|
||||
App::App()
|
||||
{
|
||||
InitializeComponent();
|
||||
Suspending += ref new SuspendingEventHandler(this, &App::OnSuspending);
|
||||
Resuming += ref new EventHandler<Object^>(this, &App::OnResuming);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Invoked when the application is launched normally by the end user. Other entry points
|
||||
/// will be used when the application is launched to open a specific file, to display
|
||||
/// search results, and so forth.
|
||||
/// </summary>
|
||||
/// <param name="e">Details about the launch request and process.</param>
|
||||
void App::OnLaunched(Windows::ApplicationModel::Activation::LaunchActivatedEventArgs^ e)
|
||||
{
|
||||
#if _DEBUG
|
||||
if (IsDebuggerPresent())
|
||||
{
|
||||
DebugSettings->EnableFrameRateCounter = true;
|
||||
}
|
||||
#endif
|
||||
|
||||
m_directXPage = ref new DirectXPage();
|
||||
|
||||
if (e->PreviousExecutionState == ApplicationExecutionState::Terminated)
|
||||
{
|
||||
m_directXPage->LoadInternalState(ApplicationData::Current->LocalSettings->Values);
|
||||
}
|
||||
|
||||
// Place the page in the current window and ensure that it is active.
|
||||
Window::Current->Content = m_directXPage;
|
||||
Window::Current->Activate();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Invoked when application execution is being suspended. Application state is saved
|
||||
/// without knowing whether the application will be terminated or resumed with the contents
|
||||
/// of memory still intact.
|
||||
/// </summary>
|
||||
/// <param name="sender">The source of the suspend request.</param>
|
||||
/// <param name="e">Details about the suspend request.</param>
|
||||
void App::OnSuspending(Object^ sender, SuspendingEventArgs^ e)
|
||||
{
|
||||
(void) sender; // Unused parameter
|
||||
(void) e; // Unused parameter
|
||||
|
||||
m_directXPage->SaveInternalState(ApplicationData::Current->LocalSettings->Values);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Invoked when application execution is being resumed.
|
||||
/// </summary>
|
||||
/// <param name="sender">The source of the resume request.</param>
|
||||
/// <param name="args">Details about the resume request.</param>
|
||||
void App::OnResuming(Object ^sender, Object ^args)
|
||||
{
|
||||
(void) sender; // Unused parameter
|
||||
(void) args; // Unused parameter
|
||||
|
||||
m_directXPage->LoadInternalState(ApplicationData::Current->LocalSettings->Values);
|
||||
}
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
//
|
||||
// App.xaml.h
|
||||
// Declaration of the App class.
|
||||
//
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "App.g.h"
|
||||
#include "DirectXPage.xaml.h"
|
||||
|
||||
namespace Cocos2dShaderCompiler
|
||||
{
|
||||
/// <summary>
|
||||
/// Provides application-specific behavior to supplement the default Application class.
|
||||
/// </summary>
|
||||
ref class App sealed
|
||||
{
|
||||
public:
|
||||
App();
|
||||
virtual void OnLaunched(Windows::ApplicationModel::Activation::LaunchActivatedEventArgs^ e) override;
|
||||
|
||||
private:
|
||||
void OnSuspending(Platform::Object^ sender, Windows::ApplicationModel::SuspendingEventArgs^ e);
|
||||
void OnResuming(Platform::Object ^sender, Platform::Object ^args);
|
||||
DirectXPage^ m_directXPage;
|
||||
};
|
||||
}
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 801 B |
Binary file not shown.
|
Before Width: | Height: | Size: 329 B |
Binary file not shown.
|
Before Width: | Height: | Size: 103 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 429 B |
|
|
@ -1,92 +0,0 @@
|
|||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio 2013
|
||||
VisualStudioVersion = 12.0.31101.0
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Cocos2dShaderCompiler", "Cocos2dShaderCompiler.vcxproj", "{4F6DEF20-AC4C-487F-85B8-5993519E3911}"
|
||||
EndProject
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "External", "External", "{ECA7A2AA-8501-4177-8360-322A569B6C3E}"
|
||||
EndProject
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Box2D", "Box2D", "{7CA66464-6A5E-493B-82EF-DBD84F91766F}"
|
||||
EndProject
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libSpine", "libSpine", "{8F8A69D6-BD64-4BAD-AE20-2D07E7BD57BA}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbox2d.Shared", "..\..\..\external\Box2D\proj.win8.1-universal\libbox2d.Shared\libbox2d.Shared.vcxitems", "{4A3C6BA8-C227-498B-AA21-40BDA27B461F}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbox2d.Windows", "..\..\..\external\Box2D\proj.win8.1-universal\libbox2d.Windows\libbox2d.Windows.vcxproj", "{3B26A12D-3A44-47EA-82D2-282660FC844D}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSpine.Shared", "..\..\..\cocos\editor-support\spine\proj.win8.1-universal\libSpine.Shared\libSpine.Shared.vcxitems", "{ADAFD00D-A0D6-46EF-9F0B-EA2880BFE1DE}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSpine.Windows", "..\..\..\cocos\editor-support\spine\proj.win8.1-universal\libSpine.Windows\libSpine.Windows.vcxproj", "{F3550FE0-C795-44F6-8FEB-093EB68143AE}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SharedMSBuildProjectFiles) = preSolution
|
||||
..\..\..\external\Box2D\proj.win8.1-universal\libbox2d.Shared\libbox2d.Shared.vcxitems*{4a3c6ba8-c227-498b-aa21-40bda27b461f}*SharedItemsImports = 9
|
||||
..\..\..\cocos\editor-support\spine\proj.win8.1-universal\libSpine.Shared\libSpine.Shared.vcxitems*{adafd00d-a0d6-46ef-9f0b-ea2880bfe1de}*SharedItemsImports = 9
|
||||
..\..\..\external\Box2D\proj.win8.1-universal\libbox2d.Shared\libbox2d.Shared.vcxitems*{3b26a12d-3a44-47ea-82d2-282660fc844d}*SharedItemsImports = 4
|
||||
..\..\..\cocos\editor-support\spine\proj.win8.1-universal\libSpine.Shared\libSpine.Shared.vcxitems*{f3550fe0-c795-44f6-8feb-093eb68143ae}*SharedItemsImports = 4
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|ARM = Debug|ARM
|
||||
Debug|Win32 = Debug|Win32
|
||||
Debug|x64 = Debug|x64
|
||||
Release|ARM = Release|ARM
|
||||
Release|Win32 = Release|Win32
|
||||
Release|x64 = Release|x64
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{4F6DEF20-AC4C-487F-85B8-5993519E3911}.Debug|ARM.ActiveCfg = Debug|ARM
|
||||
{4F6DEF20-AC4C-487F-85B8-5993519E3911}.Debug|ARM.Build.0 = Debug|ARM
|
||||
{4F6DEF20-AC4C-487F-85B8-5993519E3911}.Debug|ARM.Deploy.0 = Debug|ARM
|
||||
{4F6DEF20-AC4C-487F-85B8-5993519E3911}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{4F6DEF20-AC4C-487F-85B8-5993519E3911}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{4F6DEF20-AC4C-487F-85B8-5993519E3911}.Debug|Win32.Deploy.0 = Debug|Win32
|
||||
{4F6DEF20-AC4C-487F-85B8-5993519E3911}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{4F6DEF20-AC4C-487F-85B8-5993519E3911}.Debug|x64.Build.0 = Debug|x64
|
||||
{4F6DEF20-AC4C-487F-85B8-5993519E3911}.Debug|x64.Deploy.0 = Debug|x64
|
||||
{4F6DEF20-AC4C-487F-85B8-5993519E3911}.Release|ARM.ActiveCfg = Release|ARM
|
||||
{4F6DEF20-AC4C-487F-85B8-5993519E3911}.Release|ARM.Build.0 = Release|ARM
|
||||
{4F6DEF20-AC4C-487F-85B8-5993519E3911}.Release|ARM.Deploy.0 = Release|ARM
|
||||
{4F6DEF20-AC4C-487F-85B8-5993519E3911}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{4F6DEF20-AC4C-487F-85B8-5993519E3911}.Release|Win32.Build.0 = Release|Win32
|
||||
{4F6DEF20-AC4C-487F-85B8-5993519E3911}.Release|Win32.Deploy.0 = Release|Win32
|
||||
{4F6DEF20-AC4C-487F-85B8-5993519E3911}.Release|x64.ActiveCfg = Release|x64
|
||||
{4F6DEF20-AC4C-487F-85B8-5993519E3911}.Release|x64.Build.0 = Release|x64
|
||||
{4F6DEF20-AC4C-487F-85B8-5993519E3911}.Release|x64.Deploy.0 = Release|x64
|
||||
{3B26A12D-3A44-47EA-82D2-282660FC844D}.Debug|ARM.ActiveCfg = Debug|ARM
|
||||
{3B26A12D-3A44-47EA-82D2-282660FC844D}.Debug|ARM.Build.0 = Debug|ARM
|
||||
{3B26A12D-3A44-47EA-82D2-282660FC844D}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{3B26A12D-3A44-47EA-82D2-282660FC844D}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{3B26A12D-3A44-47EA-82D2-282660FC844D}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{3B26A12D-3A44-47EA-82D2-282660FC844D}.Debug|x64.Build.0 = Debug|x64
|
||||
{3B26A12D-3A44-47EA-82D2-282660FC844D}.Release|ARM.ActiveCfg = Release|ARM
|
||||
{3B26A12D-3A44-47EA-82D2-282660FC844D}.Release|ARM.Build.0 = Release|ARM
|
||||
{3B26A12D-3A44-47EA-82D2-282660FC844D}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{3B26A12D-3A44-47EA-82D2-282660FC844D}.Release|Win32.Build.0 = Release|Win32
|
||||
{3B26A12D-3A44-47EA-82D2-282660FC844D}.Release|x64.ActiveCfg = Release|x64
|
||||
{3B26A12D-3A44-47EA-82D2-282660FC844D}.Release|x64.Build.0 = Release|x64
|
||||
{F3550FE0-C795-44F6-8FEB-093EB68143AE}.Debug|ARM.ActiveCfg = Debug|ARM
|
||||
{F3550FE0-C795-44F6-8FEB-093EB68143AE}.Debug|ARM.Build.0 = Debug|ARM
|
||||
{F3550FE0-C795-44F6-8FEB-093EB68143AE}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{F3550FE0-C795-44F6-8FEB-093EB68143AE}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{F3550FE0-C795-44F6-8FEB-093EB68143AE}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{F3550FE0-C795-44F6-8FEB-093EB68143AE}.Debug|x64.Build.0 = Debug|x64
|
||||
{F3550FE0-C795-44F6-8FEB-093EB68143AE}.Release|ARM.ActiveCfg = Release|ARM
|
||||
{F3550FE0-C795-44F6-8FEB-093EB68143AE}.Release|ARM.Build.0 = Release|ARM
|
||||
{F3550FE0-C795-44F6-8FEB-093EB68143AE}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{F3550FE0-C795-44F6-8FEB-093EB68143AE}.Release|Win32.Build.0 = Release|Win32
|
||||
{F3550FE0-C795-44F6-8FEB-093EB68143AE}.Release|x64.ActiveCfg = Release|x64
|
||||
{F3550FE0-C795-44F6-8FEB-093EB68143AE}.Release|x64.Build.0 = Release|x64
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
EndGlobalSection
|
||||
GlobalSection(NestedProjects) = preSolution
|
||||
{7CA66464-6A5E-493B-82EF-DBD84F91766F} = {ECA7A2AA-8501-4177-8360-322A569B6C3E}
|
||||
{8F8A69D6-BD64-4BAD-AE20-2D07E7BD57BA} = {ECA7A2AA-8501-4177-8360-322A569B6C3E}
|
||||
{4A3C6BA8-C227-498B-AA21-40BDA27B461F} = {7CA66464-6A5E-493B-82EF-DBD84F91766F}
|
||||
{3B26A12D-3A44-47EA-82D2-282660FC844D} = {7CA66464-6A5E-493B-82EF-DBD84F91766F}
|
||||
{ADAFD00D-A0D6-46EF-9F0B-EA2880BFE1DE} = {8F8A69D6-BD64-4BAD-AE20-2D07E7BD57BA}
|
||||
{F3550FE0-C795-44F6-8FEB-093EB68143AE} = {8F8A69D6-BD64-4BAD-AE20-2D07E7BD57BA}
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
|
|
@ -1,698 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<ItemGroup Label="ProjectConfigurations">
|
||||
<ProjectConfiguration Include="Debug|Win32">
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release|Win32">
|
||||
<Configuration>Release</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Debug|x64">
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>x64</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release|x64">
|
||||
<Configuration>Release</Configuration>
|
||||
<Platform>x64</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Debug|ARM">
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>ARM</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release|ARM">
|
||||
<Configuration>Release</Configuration>
|
||||
<Platform>ARM</Platform>
|
||||
</ProjectConfiguration>
|
||||
</ItemGroup>
|
||||
<PropertyGroup Label="Globals">
|
||||
<ProjectGuid>{4f6def20-ac4c-487f-85b8-5993519e3911}</ProjectGuid>
|
||||
<RootNamespace>Cocos2dShaderCompiler</RootNamespace>
|
||||
<DefaultLanguage>en-US</DefaultLanguage>
|
||||
<MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
|
||||
<AppContainerApplication>true</AppContainerApplication>
|
||||
<ApplicationType>Windows Store</ApplicationType>
|
||||
<ApplicationTypeRevision>8.1</ApplicationTypeRevision>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseDebugLibraries>true</UseDebugLibraries>
|
||||
<PlatformToolset>v120</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseDebugLibraries>true</UseDebugLibraries>
|
||||
<PlatformToolset>v120</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseDebugLibraries>true</UseDebugLibraries>
|
||||
<PlatformToolset>v120</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||
<PlatformToolset>v120</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||
<PlatformToolset>v120</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||
<PlatformToolset>v120</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
||||
<ImportGroup Label="ExtensionSettings">
|
||||
<Import Project="$(VSINSTALLDIR)\Common7\IDE\Extensions\Microsoft\VsGraphics\ImageContentTask.props" />
|
||||
<Import Project="$(VSINSTALLDIR)\Common7\IDE\Extensions\Microsoft\VsGraphics\MeshContentTask.props" />
|
||||
<Import Project="$(VSINSTALLDIR)\Common7\IDE\Extensions\Microsoft\VsGraphics\ShaderGraphContentTask.props" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
<Import Project="..\..\..\cocos\2d\winrt_props\cocos2d_winrt.props" />
|
||||
<Import Project="..\..\..\cocos\2d\winrt_props\cocos2d_winrt_app.props" />
|
||||
<Import Project="..\..\..\cocos\2d\winrt_props\cocos2d_winrt_platform.props" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
<Import Project="..\..\..\cocos\2d\winrt_props\cocos2d_winrt.props" />
|
||||
<Import Project="..\..\..\cocos\2d\winrt_props\cocos2d_winrt_app.props" />
|
||||
<Import Project="..\..\..\cocos\2d\winrt_props\cocos2d_winrt_platform.props" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
<Import Project="..\..\..\cocos\2d\winrt_props\cocos2d_winrt.props" />
|
||||
<Import Project="..\..\..\cocos\2d\winrt_props\cocos2d_winrt_app.props" />
|
||||
<Import Project="..\..\..\cocos\2d\winrt_props\cocos2d_winrt_platform.props" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
<Import Project="..\..\..\cocos\2d\winrt_props\cocos2d_winrt.props" />
|
||||
<Import Project="..\..\..\cocos\2d\winrt_props\cocos2d_winrt_app.props" />
|
||||
<Import Project="..\..\..\cocos\2d\winrt_props\cocos2d_winrt_platform.props" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
<Import Project="..\..\..\cocos\2d\winrt_props\cocos2d_winrt.props" />
|
||||
<Import Project="..\..\..\cocos\2d\winrt_props\cocos2d_winrt_app.props" />
|
||||
<Import Project="..\..\..\cocos\2d\winrt_props\cocos2d_winrt_platform.props" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
<Import Project="..\..\..\cocos\2d\winrt_props\cocos2d_winrt.props" />
|
||||
<Import Project="..\..\..\cocos\2d\winrt_props\cocos2d_winrt_app.props" />
|
||||
<Import Project="..\..\..\cocos\2d\winrt_props\cocos2d_winrt_platform.props" />
|
||||
</ImportGroup>
|
||||
<PropertyGroup Label="UserMacros" />
|
||||
<PropertyGroup>
|
||||
<PackageCertificateKeyFile>Cocos2dShaderCompiler_TemporaryKey.pfx</PackageCertificateKeyFile>
|
||||
<PackageCertificateThumbprint>2371BAA26A4995D58B8E87430D9BE585C3507553</PackageCertificateThumbprint>
|
||||
</PropertyGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
|
||||
<Link>
|
||||
<AdditionalDependencies>d2d1.lib;d3d11.lib;dwrite.lib;dxguid.lib;dxgi.lib;ole32.lib;windowscodecs.lib;libGLESv2.lib;libEGL.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalLibraryDirectories>$(ProjectDir)..\..\..\external\winrt-specific\zlib\prebuilt\$(Platform);$(ProjectDir)..\..\..\external\winrt-specific\angle\prebuilt\$(Platform);%(AdditionalLibraryDirectories); $(VCInstallDir)\lib\store\arm; $(VCInstallDir)\lib\arm</AdditionalLibraryDirectories>
|
||||
</Link>
|
||||
<ClCompile>
|
||||
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
|
||||
<PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
|
||||
<AdditionalIncludeDirectories>$(ProjectDir);$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\wp8;$(EngineRoot)external\jpeg\include\wp8;$(EngineRoot)external\tiff\include\wp8;$(EngineRoot)external\freetype2\include\wp8\freetype;$(EngineRoot)external\wp8-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(IntermediateOutputPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
|
||||
<PreprocessorDefinitions>WP8_SHADER_COMPILER;CC_USE_PHYSICS=0;CC_STATIC;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||||
<ForcedIncludeFiles>
|
||||
</ForcedIncludeFiles>
|
||||
</ClCompile>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
|
||||
<Link>
|
||||
<AdditionalDependencies>d2d1.lib;d3d11.lib;dwrite.lib;dxguid.lib;dxgi.lib;ole32.lib;windowscodecs.lib;libGLESv2.lib;libEGL.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalLibraryDirectories>$(ProjectDir)..\..\..\external\winrt-specific\zlib\prebuilt\$(Platform);$(ProjectDir)..\..\..\external\winrt-specific\angle\prebuilt\$(Platform);%(AdditionalLibraryDirectories); $(VCInstallDir)\lib\store\arm; $(VCInstallDir)\lib\arm</AdditionalLibraryDirectories>
|
||||
</Link>
|
||||
<ClCompile>
|
||||
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
|
||||
<PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
|
||||
<AdditionalIncludeDirectories>$(ProjectDir);$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\wp8;$(EngineRoot)external\jpeg\include\wp8;$(EngineRoot)external\tiff\include\wp8;$(EngineRoot)external\freetype2\include\wp8\freetype;$(EngineRoot)external\wp8-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(IntermediateOutputPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
|
||||
<PreprocessorDefinitions>WP8_SHADER_COMPILER;CC_USE_PHYSICS=0;CC_STATIC;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||||
<ForcedIncludeFiles>
|
||||
</ForcedIncludeFiles>
|
||||
</ClCompile>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<Link>
|
||||
<AdditionalDependencies>d2d1.lib;d3d11.lib;dwrite.lib;dxguid.lib;dxgi.lib;ole32.lib;windowscodecs.lib;libGLESv2.lib;libEGL.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalLibraryDirectories>$(ProjectDir)..\..\..\external\winrt-specific\zlib\prebuilt\$(Platform);$(ProjectDir)..\..\..\external\winrt-specific\angle\prebuilt\$(Platform);%(AdditionalLibraryDirectories);$(VCInstallDir)\lib\store;$(VCInstallDir)\lib</AdditionalLibraryDirectories>
|
||||
</Link>
|
||||
<ClCompile>
|
||||
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
|
||||
<PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
|
||||
<AdditionalIncludeDirectories>$(ProjectDir);$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\wp8;$(EngineRoot)external\jpeg\include\wp8;$(EngineRoot)external\tiff\include\wp8;$(EngineRoot)external\freetype2\include\wp8\freetype;$(EngineRoot)external\wp8-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(IntermediateOutputPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
|
||||
<PreprocessorDefinitions>WP8_SHADER_COMPILER;CC_USE_PHYSICS=0;CC_STATIC;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||||
<ForcedIncludeFiles>
|
||||
</ForcedIncludeFiles>
|
||||
</ClCompile>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<Link>
|
||||
<AdditionalDependencies>d2d1.lib;d3d11.lib;dwrite.lib;dxguid.lib;dxgi.lib;ole32.lib;windowscodecs.lib;libGLESv2.lib;libEGL.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalLibraryDirectories>$(ProjectDir)..\..\..\external\winrt-specific\zlib\prebuilt\$(Platform);$(ProjectDir)..\..\..\external\winrt-specific\angle\prebuilt\$(Platform);%(AdditionalLibraryDirectories); $(VCInstallDir)\lib\store; $(VCInstallDir)\lib</AdditionalLibraryDirectories>
|
||||
</Link>
|
||||
<ClCompile>
|
||||
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
|
||||
<PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
|
||||
<AdditionalIncludeDirectories>$(ProjectDir);$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\wp8;$(EngineRoot)external\jpeg\include\wp8;$(EngineRoot)external\tiff\include\wp8;$(EngineRoot)external\freetype2\include\wp8\freetype;$(EngineRoot)external\wp8-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(IntermediateOutputPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
|
||||
<PreprocessorDefinitions>WP8_SHADER_COMPILER;CC_USE_PHYSICS=0;CC_STATIC;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||||
<ForcedIncludeFiles>
|
||||
</ForcedIncludeFiles>
|
||||
</ClCompile>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
<Link>
|
||||
<AdditionalDependencies>d2d1.lib;d3d11.lib;dwrite.lib;dxguid.lib;dxgi.lib;ole32.lib;windowscodecs.lib;libGLESv2.lib;libEGL.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalLibraryDirectories>$(ProjectDir)..\..\..\external\winrt-specific\zlib\prebuilt\$(Platform);$(ProjectDir)..\..\..\external\winrt-specific\angle\prebuilt\$(Platform);%(AdditionalLibraryDirectories); $(VCInstallDir)\lib\store\amd64; $(VCInstallDir)\lib\amd64</AdditionalLibraryDirectories>
|
||||
</Link>
|
||||
<ClCompile>
|
||||
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
|
||||
<PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
|
||||
<AdditionalIncludeDirectories>$(ProjectDir);$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\wp8;$(EngineRoot)external\jpeg\include\wp8;$(EngineRoot)external\tiff\include\wp8;$(EngineRoot)external\freetype2\include\wp8\freetype;$(EngineRoot)external\wp8-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(IntermediateOutputPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
|
||||
<PreprocessorDefinitions>WP8_SHADER_COMPILER;CC_USE_PHYSICS=0;CC_STATIC;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||||
<ForcedIncludeFiles>
|
||||
</ForcedIncludeFiles>
|
||||
</ClCompile>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
<Link>
|
||||
<AdditionalDependencies>d2d1.lib;d3d11.lib;dwrite.lib;dxguid.lib;dxgi.lib;ole32.lib;windowscodecs.lib;libGLESv2.lib;libEGL.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalLibraryDirectories>$(ProjectDir)..\..\..\external\winrt-specific\zlib\prebuilt\$(Platform);$(ProjectDir)..\..\..\external\winrt-specific\angle\prebuilt\$(Platform);%(AdditionalLibraryDirectories); $(VCInstallDir)\lib\store\amd64; $(VCInstallDir)\lib\amd64</AdditionalLibraryDirectories>
|
||||
</Link>
|
||||
<ClCompile>
|
||||
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
|
||||
<PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
|
||||
<AdditionalIncludeDirectories>$(ProjectDir);$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\wp8;$(EngineRoot)external\jpeg\include\wp8;$(EngineRoot)external\tiff\include\wp8;$(EngineRoot)external\freetype2\include\wp8\freetype;$(EngineRoot)external\wp8-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(IntermediateOutputPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
|
||||
<PreprocessorDefinitions>WP8_SHADER_COMPILER;CC_USE_PHYSICS=0;CC_STATIC;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||||
<ForcedIncludeFiles>
|
||||
</ForcedIncludeFiles>
|
||||
</ClCompile>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemGroup>
|
||||
<Image Include="Assets\Logo.png" />
|
||||
<Image Include="Assets\SmallLogo.png" />
|
||||
<Image Include="Assets\StoreLogo.png" />
|
||||
<Image Include="Assets\SplashScreen.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="..\..\..\cocos\2d\CCAction.h" />
|
||||
<ClInclude Include="..\..\..\cocos\2d\CCActionCamera.h" />
|
||||
<ClInclude Include="..\..\..\cocos\2d\CCActionCatmullRom.h" />
|
||||
<ClInclude Include="..\..\..\cocos\2d\CCActionEase.h" />
|
||||
<ClInclude Include="..\..\..\cocos\2d\CCActionGrid.h" />
|
||||
<ClInclude Include="..\..\..\cocos\2d\CCActionGrid3D.h" />
|
||||
<ClInclude Include="..\..\..\cocos\2d\CCActionInstant.h" />
|
||||
<ClInclude Include="..\..\..\cocos\2d\CCActionInterval.h" />
|
||||
<ClInclude Include="..\..\..\cocos\2d\CCActionManager.h" />
|
||||
<ClInclude Include="..\..\..\cocos\2d\CCActionPageTurn3D.h" />
|
||||
<ClInclude Include="..\..\..\cocos\2d\CCActionProgressTimer.h" />
|
||||
<ClInclude Include="..\..\..\cocos\2d\CCActionTiledGrid.h" />
|
||||
<ClInclude Include="..\..\..\cocos\2d\CCActionTween.h" />
|
||||
<ClInclude Include="..\..\..\cocos\2d\CCAnimation.h" />
|
||||
<ClInclude Include="..\..\..\cocos\2d\CCAnimationCache.h" />
|
||||
<ClInclude Include="..\..\..\cocos\2d\CCAtlasNode.h" />
|
||||
<ClInclude Include="..\..\..\cocos\2d\CCCamera.h" />
|
||||
<ClInclude Include="..\..\..\cocos\2d\CCClippingNode.h" />
|
||||
<ClInclude Include="..\..\..\cocos\2d\CCComponent.h" />
|
||||
<ClInclude Include="..\..\..\cocos\2d\CCComponentContainer.h" />
|
||||
<ClInclude Include="..\..\..\cocos\2d\CCDrawingPrimitives.h" />
|
||||
<ClInclude Include="..\..\..\cocos\2d\CCDrawNode.h" />
|
||||
<ClInclude Include="..\..\..\cocos\2d\CCFastTMXLayer.h" />
|
||||
<ClInclude Include="..\..\..\cocos\2d\CCFastTMXTiledMap.h" />
|
||||
<ClInclude Include="..\..\..\cocos\2d\CCFont.h" />
|
||||
<ClInclude Include="..\..\..\cocos\2d\CCFontAtlas.h" />
|
||||
<ClInclude Include="..\..\..\cocos\2d\CCFontAtlasCache.h" />
|
||||
<ClInclude Include="..\..\..\cocos\2d\CCFontCharMap.h" />
|
||||
<ClInclude Include="..\..\..\cocos\2d\CCFontFNT.h" />
|
||||
<ClInclude Include="..\..\..\cocos\2d\CCFontFreeType.h" />
|
||||
<ClInclude Include="..\..\..\cocos\2d\CCGLBufferedNode.h" />
|
||||
<ClInclude Include="..\..\..\cocos\2d\CCGrabber.h" />
|
||||
<ClInclude Include="..\..\..\cocos\2d\CCGrid.h" />
|
||||
<ClInclude Include="..\..\..\cocos\2d\CCLabel.h" />
|
||||
<ClInclude Include="..\..\..\cocos\2d\CCLabelAtlas.h" />
|
||||
<ClInclude Include="..\..\..\cocos\2d\CCLabelBMFont.h" />
|
||||
<ClInclude Include="..\..\..\cocos\2d\CCLabelTextFormatter.h" />
|
||||
<ClInclude Include="..\..\..\cocos\2d\CCLabelTTF.h" />
|
||||
<ClInclude Include="..\..\..\cocos\2d\CCLayer.h" />
|
||||
<ClInclude Include="..\..\..\cocos\2d\CCLight.h" />
|
||||
<ClInclude Include="..\..\..\cocos\2d\CCMenu.h" />
|
||||
<ClInclude Include="..\..\..\cocos\2d\CCMenuItem.h" />
|
||||
<ClInclude Include="..\..\..\cocos\2d\CCMotionStreak.h" />
|
||||
<ClInclude Include="..\..\..\cocos\2d\CCNode.h" />
|
||||
<ClInclude Include="..\..\..\cocos\2d\CCNodeGrid.h" />
|
||||
<ClInclude Include="..\..\..\cocos\2d\CCParallaxNode.h" />
|
||||
<ClInclude Include="..\..\..\cocos\2d\CCParticleBatchNode.h" />
|
||||
<ClInclude Include="..\..\..\cocos\2d\CCParticleExamples.h" />
|
||||
<ClInclude Include="..\..\..\cocos\2d\CCParticleSystem.h" />
|
||||
<ClInclude Include="..\..\..\cocos\2d\CCParticleSystemQuad.h" />
|
||||
<ClInclude Include="..\..\..\cocos\2d\CCProgressTimer.h" />
|
||||
<ClInclude Include="..\..\..\cocos\2d\CCProtectedNode.h" />
|
||||
<ClInclude Include="..\..\..\cocos\2d\CCRenderTexture.h" />
|
||||
<ClInclude Include="..\..\..\cocos\2d\CCScene.h" />
|
||||
<ClInclude Include="..\..\..\cocos\2d\CCSprite.h" />
|
||||
<ClInclude Include="..\..\..\cocos\2d\CCSpriteBatchNode.h" />
|
||||
<ClInclude Include="..\..\..\cocos\2d\CCSpriteFrame.h" />
|
||||
<ClInclude Include="..\..\..\cocos\2d\CCSpriteFrameCache.h" />
|
||||
<ClInclude Include="..\..\..\cocos\2d\CCTextFieldTTF.h" />
|
||||
<ClInclude Include="..\..\..\cocos\2d\CCTileMapAtlas.h" />
|
||||
<ClInclude Include="..\..\..\cocos\2d\CCTMXLayer.h" />
|
||||
<ClInclude Include="..\..\..\cocos\2d\CCTMXObjectGroup.h" />
|
||||
<ClInclude Include="..\..\..\cocos\2d\CCTMXTiledMap.h" />
|
||||
<ClInclude Include="..\..\..\cocos\2d\CCTMXXMLParser.h" />
|
||||
<ClInclude Include="..\..\..\cocos\2d\CCTransition.h" />
|
||||
<ClInclude Include="..\..\..\cocos\2d\CCTransitionPageTurn.h" />
|
||||
<ClInclude Include="..\..\..\cocos\2d\CCTransitionProgress.h" />
|
||||
<ClInclude Include="..\..\..\cocos\2d\CCTweenFunction.h" />
|
||||
<ClInclude Include="..\..\..\cocos\3d\CCAABB.h" />
|
||||
<ClInclude Include="..\..\..\cocos\3d\CCAnimate3D.h" />
|
||||
<ClInclude Include="..\..\..\cocos\3d\CCAnimation3D.h" />
|
||||
<ClInclude Include="..\..\..\cocos\3d\CCAnimationCurve.h" />
|
||||
<ClInclude Include="..\..\..\cocos\3d\CCAttachNode.h" />
|
||||
<ClInclude Include="..\..\..\cocos\3d\CCBillBoard.h" />
|
||||
<ClInclude Include="..\..\..\cocos\3d\CCBundle3D.h" />
|
||||
<ClInclude Include="..\..\..\cocos\3d\CCBundle3DData.h" />
|
||||
<ClInclude Include="..\..\..\cocos\3d\CCBundleReader.h" />
|
||||
<ClInclude Include="..\..\..\cocos\3d\CCFrustum.h" />
|
||||
<ClInclude Include="..\..\..\cocos\3d\CCMesh.h" />
|
||||
<ClInclude Include="..\..\..\cocos\3d\CCMeshSkin.h" />
|
||||
<ClInclude Include="..\..\..\cocos\3d\CCMeshVertexIndexData.h" />
|
||||
<ClInclude Include="..\..\..\cocos\3d\CCOBB.h" />
|
||||
<ClInclude Include="..\..\..\cocos\3d\CCObjLoader.h" />
|
||||
<ClInclude Include="..\..\..\cocos\3d\CCPlane.h" />
|
||||
<ClInclude Include="..\..\..\cocos\3d\CCRay.h" />
|
||||
<ClInclude Include="..\..\..\cocos\3d\CCSkeleton3D.h" />
|
||||
<ClInclude Include="..\..\..\cocos\3d\CCSprite3D.h" />
|
||||
<ClInclude Include="..\..\..\cocos\3d\CCSprite3DMaterial.h" />
|
||||
<ClInclude Include="..\..\..\cocos\3d\cocos3d.h" />
|
||||
<ClInclude Include="..\..\..\cocos\base\allocator\CCAllocatorBase.h" />
|
||||
<ClInclude Include="..\..\..\cocos\base\allocator\CCAllocatorDiagnostics.h" />
|
||||
<ClInclude Include="..\..\..\cocos\base\allocator\CCAllocatorGlobal.h" />
|
||||
<ClInclude Include="..\..\..\cocos\base\allocator\CCAllocatorMacros.h" />
|
||||
<ClInclude Include="..\..\..\cocos\base\allocator\CCAllocatorMutex.h" />
|
||||
<ClInclude Include="..\..\..\cocos\base\allocator\CCAllocatorStrategyDefault.h" />
|
||||
<ClInclude Include="..\..\..\cocos\base\allocator\CCAllocatorStrategyFixedBlock.h" />
|
||||
<ClInclude Include="..\..\..\cocos\base\allocator\CCAllocatorStrategyGlobalSmallBlock.h" />
|
||||
<ClInclude Include="..\..\..\cocos\base\allocator\CCAllocatorStrategyPool.h" />
|
||||
<ClInclude Include="..\..\..\cocos\base\atitc.h" />
|
||||
<ClInclude Include="..\..\..\cocos\base\base64.h" />
|
||||
<ClInclude Include="..\..\..\cocos\base\CCAsyncTaskPool.h" />
|
||||
<ClInclude Include="..\..\..\cocos\base\CCAutoreleasePool.h" />
|
||||
<ClInclude Include="..\..\..\cocos\base\ccCArray.h" />
|
||||
<ClInclude Include="..\..\..\cocos\base\ccConfig.h" />
|
||||
<ClInclude Include="..\..\..\cocos\base\CCConfiguration.h" />
|
||||
<ClInclude Include="..\..\..\cocos\base\CCConsole.h" />
|
||||
<ClInclude Include="..\..\..\cocos\base\CCController.h" />
|
||||
<ClInclude Include="..\..\..\cocos\base\CCData.h" />
|
||||
<ClInclude Include="..\..\..\cocos\base\CCDataVisitor.h" />
|
||||
<ClInclude Include="..\..\..\cocos\base\CCDirector.h" />
|
||||
<ClInclude Include="..\..\..\cocos\base\CCEvent.h" />
|
||||
<ClInclude Include="..\..\..\cocos\base\CCEventAcceleration.h" />
|
||||
<ClInclude Include="..\..\..\cocos\base\CCEventController.h" />
|
||||
<ClInclude Include="..\..\..\cocos\base\CCEventCustom.h" />
|
||||
<ClInclude Include="..\..\..\cocos\base\CCEventDispatcher.h" />
|
||||
<ClInclude Include="..\..\..\cocos\base\CCEventFocus.h" />
|
||||
<ClInclude Include="..\..\..\cocos\base\CCEventKeyboard.h" />
|
||||
<ClInclude Include="..\..\..\cocos\base\CCEventListener.h" />
|
||||
<ClInclude Include="..\..\..\cocos\base\CCEventListenerAcceleration.h" />
|
||||
<ClInclude Include="..\..\..\cocos\base\CCEventListenerController.h" />
|
||||
<ClInclude Include="..\..\..\cocos\base\CCEventListenerCustom.h" />
|
||||
<ClInclude Include="..\..\..\cocos\base\CCEventListenerFocus.h" />
|
||||
<ClInclude Include="..\..\..\cocos\base\CCEventListenerKeyboard.h" />
|
||||
<ClInclude Include="..\..\..\cocos\base\CCEventListenerMouse.h" />
|
||||
<ClInclude Include="..\..\..\cocos\base\CCEventListenerTouch.h" />
|
||||
<ClInclude Include="..\..\..\cocos\base\CCEventMouse.h" />
|
||||
<ClInclude Include="..\..\..\cocos\base\CCEventTouch.h" />
|
||||
<ClInclude Include="..\..\..\cocos\base\CCEventType.h" />
|
||||
<ClInclude Include="..\..\..\cocos\base\ccFPSImages.h" />
|
||||
<ClInclude Include="..\..\..\cocos\base\CCGameController.h" />
|
||||
<ClInclude Include="..\..\..\cocos\base\CCIMEDelegate.h" />
|
||||
<ClInclude Include="..\..\..\cocos\base\CCIMEDispatcher.h" />
|
||||
<ClInclude Include="..\..\..\cocos\base\ccMacros.h" />
|
||||
<ClInclude Include="..\..\..\cocos\base\CCMap.h" />
|
||||
<ClInclude Include="..\..\..\cocos\base\CCNS.h" />
|
||||
<ClInclude Include="..\..\..\cocos\base\CCProfiling.h" />
|
||||
<ClInclude Include="..\..\..\cocos\base\CCProtocols.h" />
|
||||
<ClInclude Include="..\..\..\cocos\base\ccRandom.h" />
|
||||
<ClInclude Include="..\..\..\cocos\base\CCRef.h" />
|
||||
<ClInclude Include="..\..\..\cocos\base\CCRefPtr.h" />
|
||||
<ClInclude Include="..\..\..\cocos\base\CCScheduler.h" />
|
||||
<ClInclude Include="..\..\..\cocos\base\CCScriptSupport.h" />
|
||||
<ClInclude Include="..\..\..\cocos\base\CCTouch.h" />
|
||||
<ClInclude Include="..\..\..\cocos\base\ccTypes.h" />
|
||||
<ClInclude Include="..\..\..\cocos\base\CCUserDefault.h" />
|
||||
<ClInclude Include="..\..\..\cocos\base\ccUTF8.h" />
|
||||
<ClInclude Include="..\..\..\cocos\base\ccUtils.h" />
|
||||
<ClInclude Include="..\..\..\cocos\base\CCValue.h" />
|
||||
<ClInclude Include="..\..\..\cocos\base\CCVector.h" />
|
||||
<ClInclude Include="..\..\..\cocos\base\etc1.h" />
|
||||
<ClInclude Include="..\..\..\cocos\base\firePngData.h" />
|
||||
<ClInclude Include="..\..\..\cocos\base\ObjectFactory.h" />
|
||||
<ClInclude Include="..\..\..\cocos\base\pvr.h" />
|
||||
<ClInclude Include="..\..\..\cocos\base\s3tc.h" />
|
||||
<ClInclude Include="..\..\..\cocos\base\TGAlib.h" />
|
||||
<ClInclude Include="..\..\..\cocos\base\uthash.h" />
|
||||
<ClInclude Include="..\..\..\cocos\base\utlist.h" />
|
||||
<ClInclude Include="..\..\..\cocos\base\ZipUtils.h" />
|
||||
<ClInclude Include="..\..\..\cocos\deprecated\CCArray.h" />
|
||||
<ClInclude Include="..\..\..\cocos\deprecated\CCBool.h" />
|
||||
<ClInclude Include="..\..\..\cocos\deprecated\CCDeprecated.h" />
|
||||
<ClInclude Include="..\..\..\cocos\deprecated\CCDictionary.h" />
|
||||
<ClInclude Include="..\..\..\cocos\deprecated\CCDouble.h" />
|
||||
<ClInclude Include="..\..\..\cocos\deprecated\CCFloat.h" />
|
||||
<ClInclude Include="..\..\..\cocos\deprecated\CCInteger.h" />
|
||||
<ClInclude Include="..\..\..\cocos\deprecated\CCNotificationCenter.h" />
|
||||
<ClInclude Include="..\..\..\cocos\deprecated\CCSet.h" />
|
||||
<ClInclude Include="..\..\..\cocos\deprecated\CCString.h" />
|
||||
<ClInclude Include="..\..\..\cocos\math\CCAffineTransform.h" />
|
||||
<ClInclude Include="..\..\..\cocos\math\CCGeometry.h" />
|
||||
<ClInclude Include="..\..\..\cocos\math\CCMath.h" />
|
||||
<ClInclude Include="..\..\..\cocos\math\CCMathBase.h" />
|
||||
<ClInclude Include="..\..\..\cocos\math\CCVertex.h" />
|
||||
<ClInclude Include="..\..\..\cocos\math\Mat4.h" />
|
||||
<ClInclude Include="..\..\..\cocos\math\MathUtil.h" />
|
||||
<ClInclude Include="..\..\..\cocos\math\Quaternion.h" />
|
||||
<ClInclude Include="..\..\..\cocos\math\TransformUtils.h" />
|
||||
<ClInclude Include="..\..\..\cocos\math\Vec2.h" />
|
||||
<ClInclude Include="..\..\..\cocos\math\Vec3.h" />
|
||||
<ClInclude Include="..\..\..\cocos\math\Vec4.h" />
|
||||
<ClInclude Include="..\..\..\cocos\platform\CCFileUtils.h" />
|
||||
<ClInclude Include="..\..\..\cocos\platform\CCImage.h" />
|
||||
<ClInclude Include="..\..\..\cocos\platform\CCSAXParser.h" />
|
||||
<ClInclude Include="..\..\..\cocos\platform\winrt\CCFileUtilsWinRT.h" />
|
||||
<ClInclude Include="..\..\..\cocos\platform\winrt\CCFreeTypeFont.h" />
|
||||
<ClInclude Include="..\..\..\cocos\platform\winrt\CCGL.h" />
|
||||
<ClInclude Include="..\..\..\cocos\platform\winrt\CCGL_Angle.h" />
|
||||
<ClInclude Include="..\..\..\cocos\platform\winrt\CCPrecompiledShaders.h" />
|
||||
<ClInclude Include="..\..\..\cocos\platform\winrt\CCStdC.h" />
|
||||
<ClInclude Include="..\..\..\cocos\platform\winrt\CCWinRTUtils.h" />
|
||||
<ClInclude Include="..\..\..\cocos\platform\winrt\sha1.h" />
|
||||
<ClInclude Include="..\..\..\cocos\renderer\CCBatchCommand.h" />
|
||||
<ClInclude Include="..\..\..\cocos\renderer\CCCustomCommand.h" />
|
||||
<ClInclude Include="..\..\..\cocos\renderer\CCGLProgram.h" />
|
||||
<ClInclude Include="..\..\..\cocos\renderer\CCGLProgramCache.h" />
|
||||
<ClInclude Include="..\..\..\cocos\renderer\CCGLProgramState.h" />
|
||||
<ClInclude Include="..\..\..\cocos\renderer\CCGLProgramStateCache.h" />
|
||||
<ClInclude Include="..\..\..\cocos\renderer\ccGLStateCache.h" />
|
||||
<ClInclude Include="..\..\..\cocos\renderer\CCGroupCommand.h" />
|
||||
<ClInclude Include="..\..\..\cocos\renderer\CCMeshCommand.h" />
|
||||
<ClInclude Include="..\..\..\cocos\renderer\CCPrimitive.h" />
|
||||
<ClInclude Include="..\..\..\cocos\renderer\CCPrimitiveCommand.h" />
|
||||
<ClInclude Include="..\..\..\cocos\renderer\CCQuadCommand.h" />
|
||||
<ClInclude Include="..\..\..\cocos\renderer\CCRenderCommand.h" />
|
||||
<ClInclude Include="..\..\..\cocos\renderer\CCRenderCommandPool.h" />
|
||||
<ClInclude Include="..\..\..\cocos\renderer\CCRenderer.h" />
|
||||
<ClInclude Include="..\..\..\cocos\renderer\ccShaders.h" />
|
||||
<ClInclude Include="..\..\..\cocos\renderer\CCTexture2D.h" />
|
||||
<ClInclude Include="..\..\..\cocos\renderer\CCTextureAtlas.h" />
|
||||
<ClInclude Include="..\..\..\cocos\renderer\CCTextureCache.h" />
|
||||
<ClInclude Include="..\..\..\cocos\renderer\CCTrianglesCommand.h" />
|
||||
<ClInclude Include="..\..\..\cocos\renderer\CCVertexIndexBuffer.h" />
|
||||
<ClInclude Include="..\..\..\cocos\renderer\CCVertexIndexData.h" />
|
||||
<ClInclude Include="..\..\..\cocos\ui\shaders\UIShaders.h" />
|
||||
<ClInclude Include="..\..\..\external\ConvertUTF\ConvertUTF.h" />
|
||||
<ClInclude Include="..\..\..\external\edtaa3func\edtaa3func.h" />
|
||||
<ClInclude Include="..\..\..\external\tinyxml2\tinyxml2.h" />
|
||||
<ClInclude Include="..\..\..\external\unzip\ioapi.h" />
|
||||
<ClInclude Include="..\..\..\external\unzip\ioapi_mem.h" />
|
||||
<ClInclude Include="..\..\..\external\unzip\unzip.h" />
|
||||
<ClInclude Include="..\..\..\external\xxhash\xxhash.h" />
|
||||
<ClInclude Include="App.xaml.h">
|
||||
<DependentUpon>App.xaml</DependentUpon>
|
||||
</ClInclude>
|
||||
<ClInclude Include="DirectXPage.xaml.h">
|
||||
<DependentUpon>DirectXPage.xaml</DependentUpon>
|
||||
</ClInclude>
|
||||
<ClInclude Include="ShaderCompiler.h" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="..\..\..\cocos\2d\CCAction.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\2d\CCActionCamera.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\2d\CCActionCatmullRom.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\2d\CCActionEase.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\2d\CCActionGrid.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\2d\CCActionGrid3D.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\2d\CCActionInstant.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\2d\CCActionInterval.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\2d\CCActionManager.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\2d\CCActionPageTurn3D.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\2d\CCActionProgressTimer.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\2d\CCActionTiledGrid.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\2d\CCActionTween.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\2d\CCAnimation.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\2d\CCAnimationCache.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\2d\CCAtlasNode.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\2d\CCCamera.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\2d\CCClippingNode.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\2d\CCComponent.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\2d\CCComponentContainer.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\2d\CCDrawingPrimitives.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\2d\CCDrawNode.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\2d\CCFastTMXLayer.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\2d\CCFastTMXTiledMap.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\2d\CCFont.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\2d\CCFontAtlas.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\2d\CCFontAtlasCache.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\2d\CCFontCharMap.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\2d\CCFontFNT.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\2d\CCFontFreeType.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\2d\CCGLBufferedNode.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\2d\CCGrabber.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\2d\CCGrid.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\2d\CCLabel.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\2d\CCLabelAtlas.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\2d\CCLabelBMFont.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\2d\CCLabelTextFormatter.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\2d\CCLabelTTF.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\2d\CCLayer.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\2d\CCLight.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\2d\CCMenu.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\2d\CCMenuItem.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\2d\CCMotionStreak.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\2d\CCNode.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\2d\CCNodeGrid.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\2d\CCParallaxNode.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\2d\CCParticleBatchNode.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\2d\CCParticleExamples.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\2d\CCParticleSystem.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\2d\CCParticleSystemQuad.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\2d\CCProgressTimer.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\2d\CCProtectedNode.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\2d\CCRenderTexture.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\2d\CCScene.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\2d\CCSprite.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\2d\CCSpriteBatchNode.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\2d\CCSpriteFrame.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\2d\CCSpriteFrameCache.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\2d\CCTextFieldTTF.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\2d\CCTileMapAtlas.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\2d\CCTMXLayer.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\2d\CCTMXObjectGroup.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\2d\CCTMXTiledMap.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\2d\CCTMXXMLParser.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\2d\CCTransition.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\2d\CCTransitionPageTurn.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\2d\CCTransitionProgress.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\2d\CCTweenFunction.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\3d\CCAABB.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\3d\CCAnimate3D.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\3d\CCAnimation3D.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\3d\CCAttachNode.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\3d\CCBillBoard.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\3d\CCBundle3D.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\3d\CCBundleReader.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\3d\CCFrustum.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\3d\CCMesh.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\3d\CCMeshSkin.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\3d\CCMeshVertexIndexData.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\3d\CCOBB.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\3d\CCObjLoader.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\3d\CCPlane.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\3d\CCRay.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\3d\CCSkeleton3D.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\3d\CCSprite3D.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\3d\CCSprite3DMaterial.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\base\allocator\CCAllocatorDiagnostics.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\base\allocator\CCAllocatorGlobal.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\base\allocator\CCAllocatorGlobalNewDelete.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\base\atitc.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\base\base64.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\base\CCAsyncTaskPool.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\base\CCAutoreleasePool.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\base\ccCArray.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\base\CCConfiguration.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\base\CCConsole.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\base\CCController.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\base\CCData.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\base\CCDataVisitor.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\base\CCDirector.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\base\CCEvent.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\base\CCEventAcceleration.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\base\CCEventController.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\base\CCEventCustom.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\base\CCEventDispatcher.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\base\CCEventFocus.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\base\CCEventKeyboard.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\base\CCEventListener.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\base\CCEventListenerAcceleration.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\base\CCEventListenerController.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\base\CCEventListenerCustom.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\base\CCEventListenerFocus.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\base\CCEventListenerKeyboard.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\base\CCEventListenerMouse.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\base\CCEventListenerTouch.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\base\CCEventMouse.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\base\CCEventTouch.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\base\ccFPSImages.c">
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</CompileAsWinRT>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\cocos\base\CCIMEDispatcher.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\base\CCNS.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\base\CCProfiling.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\base\ccRandom.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\base\CCRef.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\base\CCScheduler.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\base\CCScriptSupport.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\base\CCTouch.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\base\ccTypes.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\base\CCUserDefault.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\base\ccUTF8.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\base\ccUtils.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\base\CCValue.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\base\etc1.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\base\ObjectFactory.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\base\pvr.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\base\s3tc.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\base\TGAlib.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\base\ZipUtils.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\cocos2d.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\deprecated\CCArray.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\deprecated\CCDeprecated.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\deprecated\CCDictionary.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\deprecated\CCNotificationCenter.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\deprecated\CCSet.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\deprecated\CCString.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\math\CCAffineTransform.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\math\CCGeometry.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\math\CCVertex.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\math\Mat4.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\math\MathUtil.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\math\Quaternion.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\math\TransformUtils.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\math\Vec2.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\math\Vec3.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\math\Vec4.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\platform\CCFileUtils.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\platform\CCImage.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\platform\CCSAXParser.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\platform\winrt\CCCommon.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\platform\winrt\CCDevice.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\platform\winrt\CCFileUtilsWinRT.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\platform\winrt\CCFreeTypeFont.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\platform\winrt\CCPrecompiledShaders.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\platform\winrt\CCStdC.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\platform\winrt\CCWinRTUtils.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\platform\winrt\sha1.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\renderer\CCBatchCommand.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\renderer\CCCustomCommand.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\renderer\CCGLProgram.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\renderer\CCGLProgramCache.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\renderer\CCGLProgramState.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\renderer\CCGLProgramStateCache.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\renderer\ccGLStateCache.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\renderer\CCGroupCommand.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\renderer\CCMeshCommand.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\renderer\CCPrimitive.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\renderer\CCPrimitiveCommand.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\renderer\CCQuadCommand.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\renderer\CCRenderCommand.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\renderer\CCRenderer.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\renderer\ccShaders.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\renderer\CCTexture2D.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\renderer\CCTextureAtlas.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\renderer\CCTextureCache.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\renderer\CCTrianglesCommand.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\renderer\CCVertexIndexBuffer.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\renderer\CCVertexIndexData.cpp" />
|
||||
<ClCompile Include="..\..\..\cocos\ui\shaders\UIShaders.cpp" />
|
||||
<ClCompile Include="..\..\..\external\ConvertUTF\ConvertUTF.c">
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</CompileAsWinRT>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\external\ConvertUTF\ConvertUTFWrapper.cpp" />
|
||||
<ClCompile Include="..\..\..\external\edtaa3func\edtaa3func.cpp" />
|
||||
<ClCompile Include="..\..\..\external\tinyxml2\tinyxml2.cpp" />
|
||||
<ClCompile Include="..\..\..\external\unzip\ioapi.cpp" />
|
||||
<ClCompile Include="..\..\..\external\unzip\ioapi_mem.cpp" />
|
||||
<ClCompile Include="..\..\..\external\unzip\unzip.cpp" />
|
||||
<ClCompile Include="..\..\..\external\xxhash\xxhash.c">
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</CompileAsWinRT>
|
||||
</ClCompile>
|
||||
<ClCompile Include="App.xaml.cpp">
|
||||
<DependentUpon>App.xaml</DependentUpon>
|
||||
</ClCompile>
|
||||
<ClCompile Include="DirectXPage.xaml.cpp">
|
||||
<DependentUpon>DirectXPage.xaml</DependentUpon>
|
||||
</ClCompile>
|
||||
<ClCompile Include="ShaderCompiler.cpp" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<AppxManifest Include="Package.appxmanifest">
|
||||
<SubType>Designer</SubType>
|
||||
</AppxManifest>
|
||||
<None Include="..\..\..\cocos\3d\CCAnimationCurve.inl" />
|
||||
<None Include="..\..\..\cocos\math\MathUtil.inl" />
|
||||
<None Include="Cocos2dShaderCompiler_TemporaryKey.pfx" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ApplicationDefinition Include="App.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
</ApplicationDefinition>
|
||||
<Page Include="DirectXPage.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
</Page>
|
||||
</ItemGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
<Import Project="$(VSINSTALLDIR)\Common7\IDE\Extensions\Microsoft\VsGraphics\ImageContentTask.targets" />
|
||||
<Import Project="$(VSINSTALLDIR)\Common7\IDE\Extensions\Microsoft\VsGraphics\MeshContentTask.targets" />
|
||||
<Import Project="$(VSINSTALLDIR)\Common7\IDE\Extensions\Microsoft\VsGraphics\ShaderGraphContentTask.targets" />
|
||||
</ImportGroup>
|
||||
</Project>
|
||||
File diff suppressed because it is too large
Load Diff
Binary file not shown.
|
|
@ -1,23 +0,0 @@
|
|||
<Page
|
||||
x:Class="Cocos2dShaderCompiler.DirectXPage"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:local="using:Cocos2dShaderCompiler"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
mc:Ignorable="d">
|
||||
|
||||
<!--LayoutRoot is the root grid where all page content is placed-->
|
||||
<Grid x:Name="LayoutRoot" Background="Transparent">
|
||||
<StackPanel Orientation="Vertical">
|
||||
<StackPanel Orientation="Horizontal" Margin="40,100,0,0" Height="50" VerticalAlignment="Top">
|
||||
<TextBlock Text="Save file to cocos\platform\wp8\shaders\precompiledshaders.h" FontSize="36"/>
|
||||
</StackPanel>
|
||||
<StackPanel Orientation="Horizontal" Margin="40,100,0,0" Height="50" VerticalAlignment="Top">
|
||||
<TextBlock Text="Result: " FontSize="36"/>
|
||||
<TextBlock Text="" FontSize="36" x:Name="ResultText" />
|
||||
</StackPanel>
|
||||
<Button Margin="40,100,0,0" x:Name="compileButton" Content="Compile" Width="150" Click="OnCompile" />
|
||||
</StackPanel>
|
||||
</Grid>
|
||||
</Page>
|
||||
|
|
@ -1,126 +0,0 @@
|
|||
//
|
||||
// DirectXPage.xaml.cpp
|
||||
// Implementation of the DirectXPage class.
|
||||
//
|
||||
|
||||
#include "pch.h"
|
||||
#include "DirectXPage.xaml.h"
|
||||
|
||||
using namespace Cocos2dShaderCompiler;
|
||||
|
||||
using namespace Platform;
|
||||
using namespace Windows::Foundation;
|
||||
using namespace Windows::Foundation::Collections;
|
||||
using namespace Windows::Graphics::Display;
|
||||
using namespace Windows::System::Threading;
|
||||
using namespace Windows::UI::Core;
|
||||
using namespace Windows::UI::Input;
|
||||
using namespace Windows::UI::Xaml;
|
||||
using namespace Windows::UI::Xaml::Controls;
|
||||
using namespace Windows::UI::Xaml::Controls::Primitives;
|
||||
using namespace Windows::UI::Xaml::Data;
|
||||
using namespace Windows::UI::Xaml::Input;
|
||||
using namespace Windows::UI::Xaml::Media;
|
||||
using namespace Windows::UI::Xaml::Navigation;
|
||||
using namespace concurrency;
|
||||
|
||||
DirectXPage::DirectXPage():
|
||||
m_windowVisible(true),
|
||||
m_coreInput(nullptr)
|
||||
{
|
||||
InitializeComponent();
|
||||
|
||||
// Register event handlers for page lifecycle.
|
||||
CoreWindow^ window = Window::Current->CoreWindow;
|
||||
|
||||
window->VisibilityChanged +=
|
||||
ref new TypedEventHandler<CoreWindow^, VisibilityChangedEventArgs^>(this, &DirectXPage::OnVisibilityChanged);
|
||||
|
||||
DisplayInformation^ currentDisplayInformation = DisplayInformation::GetForCurrentView();
|
||||
|
||||
currentDisplayInformation->DpiChanged +=
|
||||
ref new TypedEventHandler<DisplayInformation^, Object^>(this, &DirectXPage::OnDpiChanged);
|
||||
|
||||
currentDisplayInformation->OrientationChanged +=
|
||||
ref new TypedEventHandler<DisplayInformation^, Object^>(this, &DirectXPage::OnOrientationChanged);
|
||||
|
||||
DisplayInformation::DisplayContentsInvalidated +=
|
||||
ref new TypedEventHandler<DisplayInformation^, Object^>(this, &DirectXPage::OnDisplayContentsInvalidated);
|
||||
|
||||
|
||||
// Disable all pointer visual feedback for better performance when touching.
|
||||
auto pointerVisualizationSettings = PointerVisualizationSettings::GetForCurrentView();
|
||||
pointerVisualizationSettings->IsContactFeedbackEnabled = false;
|
||||
pointerVisualizationSettings->IsBarrelButtonFeedbackEnabled = false;
|
||||
}
|
||||
|
||||
DirectXPage::~DirectXPage()
|
||||
{
|
||||
}
|
||||
|
||||
void DirectXPage::OnCompile(Object^ sender, RoutedEventArgs^ args)
|
||||
{
|
||||
compiler.Compile(ResultText);
|
||||
}
|
||||
|
||||
// Saves the current state of the app for suspend and terminate events.
|
||||
void DirectXPage::SaveInternalState(IPropertySet^ state)
|
||||
{
|
||||
//m_deviceResources->Trim();
|
||||
|
||||
}
|
||||
|
||||
// Loads the current state of the app for resume events.
|
||||
void DirectXPage::LoadInternalState(IPropertySet^ state)
|
||||
{
|
||||
// Put code to load app state here.
|
||||
|
||||
}
|
||||
|
||||
// Window event handlers.
|
||||
|
||||
void DirectXPage::OnVisibilityChanged(CoreWindow^ sender, VisibilityChangedEventArgs^ args)
|
||||
{
|
||||
m_windowVisible = args->Visible;
|
||||
|
||||
}
|
||||
|
||||
// DisplayInformation event handlers.
|
||||
|
||||
void DirectXPage::OnDpiChanged(DisplayInformation^ sender, Object^ args)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
void DirectXPage::OnOrientationChanged(DisplayInformation^ sender, Object^ args)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
|
||||
void DirectXPage::OnDisplayContentsInvalidated(DisplayInformation^ sender, Object^ args)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
|
||||
void DirectXPage::OnPointerPressed(Object^ sender, PointerEventArgs^ e)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
void DirectXPage::OnPointerMoved(Object^ sender, PointerEventArgs^ e)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
void DirectXPage::OnPointerReleased(Object^ sender, PointerEventArgs^ e)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
void DirectXPage::OnCompositionScaleChanged(SwapChainPanel^ sender, Object^ args)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -1,56 +0,0 @@
|
|||
//
|
||||
// DirectXPage.xaml.h
|
||||
// Declaration of the DirectXPage class.
|
||||
//
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "DirectXPage.g.h"
|
||||
#include "ShaderCompiler.h"
|
||||
|
||||
|
||||
namespace Cocos2dShaderCompiler
|
||||
{
|
||||
/// <summary>
|
||||
/// A page that hosts a DirectX SwapChainPanel.
|
||||
/// </summary>
|
||||
public ref class DirectXPage sealed
|
||||
{
|
||||
public:
|
||||
DirectXPage();
|
||||
virtual ~DirectXPage();
|
||||
|
||||
void SaveInternalState(Windows::Foundation::Collections::IPropertySet^ state);
|
||||
void LoadInternalState(Windows::Foundation::Collections::IPropertySet^ state);
|
||||
|
||||
private:
|
||||
// XAML low-level rendering event handler.
|
||||
void OnRendering(Platform::Object^ sender, Platform::Object^ args);
|
||||
|
||||
// Window event handlers.
|
||||
void OnVisibilityChanged(Windows::UI::Core::CoreWindow^ sender, Windows::UI::Core::VisibilityChangedEventArgs^ args);
|
||||
|
||||
// DisplayInformation event handlers.
|
||||
void OnDpiChanged(Windows::Graphics::Display::DisplayInformation^ sender, Platform::Object^ args);
|
||||
void OnOrientationChanged(Windows::Graphics::Display::DisplayInformation^ sender, Platform::Object^ args);
|
||||
void OnDisplayContentsInvalidated(Windows::Graphics::Display::DisplayInformation^ sender, Platform::Object^ args);
|
||||
|
||||
// Other event handlers.
|
||||
void OnCompositionScaleChanged(Windows::UI::Xaml::Controls::SwapChainPanel^ sender, Object^ args);
|
||||
void OnCompile(Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e);
|
||||
|
||||
// Track our independent input on a background worker thread.
|
||||
Windows::Foundation::IAsyncAction^ m_inputLoopWorker;
|
||||
Windows::UI::Core::CoreIndependentInputSource^ m_coreInput;
|
||||
|
||||
// Independent input handling functions.
|
||||
void OnPointerPressed(Platform::Object^ sender, Windows::UI::Core::PointerEventArgs^ e);
|
||||
void OnPointerMoved(Platform::Object^ sender, Windows::UI::Core::PointerEventArgs^ e);
|
||||
void OnPointerReleased(Platform::Object^ sender, Windows::UI::Core::PointerEventArgs^ e);
|
||||
|
||||
ShaderCompiler compiler;
|
||||
|
||||
bool m_windowVisible;
|
||||
};
|
||||
}
|
||||
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Package xmlns="http://schemas.microsoft.com/appx/2010/manifest" xmlns:m2="http://schemas.microsoft.com/appx/2013/manifest">
|
||||
<Identity Name="648a721b-11b5-48d7-816b-4d7fa8b140c0" Publisher="CN=msopentech" Version="1.0.0.0" />
|
||||
<Properties>
|
||||
<DisplayName>Cocos2dShaderCompiler</DisplayName>
|
||||
<PublisherDisplayName>msopentech</PublisherDisplayName>
|
||||
<Logo>Assets\StoreLogo.png</Logo>
|
||||
</Properties>
|
||||
<Prerequisites>
|
||||
<OSMinVersion>6.3.0</OSMinVersion>
|
||||
<OSMaxVersionTested>6.3.0</OSMaxVersionTested>
|
||||
</Prerequisites>
|
||||
<Resources>
|
||||
<Resource Language="x-generate" />
|
||||
</Resources>
|
||||
<Applications>
|
||||
<Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="Cocos2dShaderCompiler.App">
|
||||
<m2:VisualElements DisplayName="Cocos2dShaderCompiler" Description="Cocos2dShaderCompiler" BackgroundColor="#464646" ForegroundText="light" Square150x150Logo="Assets\Logo.png" Square30x30Logo="Assets\SmallLogo.png">
|
||||
<m2:DefaultTile>
|
||||
<m2:ShowNameOnTiles>
|
||||
<m2:ShowOn Tile="square150x150Logo" />
|
||||
</m2:ShowNameOnTiles>
|
||||
</m2:DefaultTile>
|
||||
<m2:SplashScreen Image="Assets\SplashScreen.png" />
|
||||
</m2:VisualElements>
|
||||
</Application>
|
||||
</Applications>
|
||||
<Capabilities>
|
||||
<Capability Name="internetClient" />
|
||||
</Capabilities>
|
||||
</Package>
|
||||
|
|
@ -1,168 +0,0 @@
|
|||
/****************************************************************************
|
||||
Copyright (c) 2013 cocos2d-x.org
|
||||
Copyright (c) Microsoft Open 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 "ShaderCompiler.h"
|
||||
#include "cocos2d.h"
|
||||
#include "CCPrecompiledShaders.h"
|
||||
|
||||
using namespace Concurrency;
|
||||
using namespace Microsoft::WRL;
|
||||
using namespace Windows::Foundation;
|
||||
using namespace Windows::UI::Core;
|
||||
|
||||
USING_NS_CC;
|
||||
|
||||
ShaderCompiler::ShaderCompiler()
|
||||
: m_display(nullptr),
|
||||
m_context(nullptr),
|
||||
m_initialized(false),
|
||||
m_resultText(nullptr)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
ShaderCompiler::~ShaderCompiler()
|
||||
{
|
||||
|
||||
CloseAngle();
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
bool ShaderCompiler::Compile(Windows::UI::Xaml::Controls::TextBlock^ resultText)
|
||||
{
|
||||
m_resultText = resultText;
|
||||
resultText->Text = "Compiling shaders...";
|
||||
|
||||
if (!InitializeAngle(ANGLE_D3D_FEATURE_LEVEL::ANGLE_D3D_FEATURE_LEVEL_9_3))
|
||||
{
|
||||
resultText->Text = "Unable to initialize Angle";
|
||||
return false;
|
||||
}
|
||||
|
||||
auto director = cocos2d::Director::getInstance();
|
||||
|
||||
//Director::getInstance()->setAnimationInterval(1.0 / 60.0);
|
||||
CCShaderCache::getInstance()->loadDefaultShaders();
|
||||
CCPrecompiledShaders::getInstance()->savePrecompiledShaders();
|
||||
resultText->Text = "Complete";
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
// Creates and restores Cocos2d-x after DirectX and Angle contexts are created or updated
|
||||
void ShaderCompiler::InitializeCocos2d()
|
||||
{
|
||||
|
||||
|
||||
}
|
||||
|
||||
void ShaderCompiler::CloseAngle()
|
||||
{
|
||||
eglMakeCurrent(NULL, NULL, NULL, NULL);
|
||||
|
||||
if (m_display && m_context)
|
||||
{
|
||||
eglDestroyContext(m_context, m_context);
|
||||
}
|
||||
if (m_display)
|
||||
{
|
||||
eglTerminate(m_display);
|
||||
}
|
||||
|
||||
m_eglWindow = nullptr;
|
||||
|
||||
}
|
||||
|
||||
bool ShaderCompiler::InitializeAngle(ANGLE_D3D_FEATURE_LEVEL featureLevel)
|
||||
{
|
||||
// setup EGL
|
||||
EGLint configAttribList[] = {
|
||||
EGL_RED_SIZE, 8,
|
||||
EGL_GREEN_SIZE, 8,
|
||||
EGL_BLUE_SIZE, 8,
|
||||
EGL_ALPHA_SIZE, 8,
|
||||
EGL_DEPTH_SIZE, 8,
|
||||
EGL_STENCIL_SIZE, 8,
|
||||
EGL_SAMPLE_BUFFERS, 0,
|
||||
EGL_NONE
|
||||
};
|
||||
|
||||
EGLint surfaceAttribList[] = {
|
||||
EGL_NONE, EGL_NONE
|
||||
};
|
||||
|
||||
EGLint numConfigs;
|
||||
EGLint majorVersion;
|
||||
EGLint minorVersion;
|
||||
EGLConfig config;
|
||||
EGLint contextAttribs[] = { EGL_CONTEXT_CLIENT_VERSION, 2, EGL_NONE, EGL_NONE };
|
||||
|
||||
IUnknown* dummy = nullptr;
|
||||
HRESULT result = CreateWinrtEglWindow(WINRT_EGL_IUNKNOWN(dummy), featureLevel, m_eglWindow.GetAddressOf());
|
||||
if (!SUCCEEDED(result))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
m_display = eglGetDisplay(m_eglWindow);
|
||||
if (m_display == EGL_NO_DISPLAY){
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!eglInitialize(m_display, &majorVersion, &minorVersion)){
|
||||
return false;
|
||||
}
|
||||
|
||||
// Get configs
|
||||
if (!eglGetConfigs(m_display, NULL, 0, &numConfigs)){
|
||||
return false;
|
||||
}
|
||||
|
||||
// Choose config
|
||||
if (!eglChooseConfig(m_display, configAttribList, &config, 1, &numConfigs)){
|
||||
return false;
|
||||
}
|
||||
|
||||
// Create a GL context
|
||||
m_context = eglCreateContext(m_display, config, EGL_NO_CONTEXT, contextAttribs);
|
||||
if (m_context == EGL_NO_CONTEXT){
|
||||
return false;
|
||||
}
|
||||
|
||||
// Make the context current
|
||||
// Note: we are not using a surface
|
||||
if (!eglMakeCurrent(m_display, NULL, NULL, m_context)){
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
@ -1,52 +0,0 @@
|
|||
/****************************************************************************
|
||||
Copyright (c) 2013 cocos2d-x.org
|
||||
Copyright (c) Microsoft Open 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.
|
||||
****************************************************************************/
|
||||
#pragma once
|
||||
|
||||
|
||||
#include "CCGL.h"
|
||||
|
||||
class ShaderCompiler
|
||||
|
||||
{
|
||||
public:
|
||||
ShaderCompiler();
|
||||
~ShaderCompiler();
|
||||
bool Compile(Windows::UI::Xaml::Controls::TextBlock^ resultText);
|
||||
|
||||
private:
|
||||
|
||||
Windows::UI::Xaml::Controls::TextBlock^ m_resultText;
|
||||
|
||||
|
||||
|
||||
void InitializeCocos2d();
|
||||
bool InitializeAngle(ANGLE_D3D_FEATURE_LEVEL featureLevel);
|
||||
void CloseAngle();
|
||||
|
||||
Microsoft::WRL::ComPtr<IWinrtEglWindow> m_eglWindow;
|
||||
EGLDisplay m_display;
|
||||
EGLContext m_context;
|
||||
bool m_initialized;
|
||||
};
|
||||
|
|
@ -1 +0,0 @@
|
|||
#include "pch.h"
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
#pragma once
|
||||
|
||||
#include <wrl.h>
|
||||
#include <wrl/client.h>
|
||||
#include <d3d11_2.h>
|
||||
#include <d2d1_2.h>
|
||||
#include <d2d1effects_1.h>
|
||||
#include <dwrite_2.h>
|
||||
#include <wincodec.h>
|
||||
#include <DirectXColors.h>
|
||||
#include <DirectXMath.h>
|
||||
#include <memory>
|
||||
#include <agile.h>
|
||||
#include <concrt.h>
|
||||
#include <collection.h>
|
||||
#include "App.xaml.h"
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
How to compile precompiled shaders for Windows Phone 8.0 (WP8)
|
||||
You need to use VS2013 with update 3.
|
||||
|
||||
1. Open the VS project Cocos2dShaderCompiler\Cocos2dShaderCompiler.sln
|
||||
2. Build and run the project
|
||||
3. Click the Compile button
|
||||
4. Select the file cocos\platform\wp8\shaders\precompiledshaders.h in the file dialog box
|
||||
5. Program will precompile all of the cached cocos2d-x shaders.
|
||||
|
|
@ -206,7 +206,7 @@ bool Follow::initWithTarget(Node *followedNode, const Rect& rect/* = Rect::ZERO*
|
|||
_boundaryFullyCovered = false;
|
||||
|
||||
Size winSize = Director::getInstance()->getWinSize();
|
||||
_fullScreenSize = Vec2(winSize.width, winSize.height);
|
||||
_fullScreenSize.set(winSize.width, winSize.height);
|
||||
_halfScreenSize = _fullScreenSize * 0.5f;
|
||||
|
||||
if (_boundarySet)
|
||||
|
|
|
|||
|
|
@ -96,7 +96,7 @@ void ActionCamera::updateTransform()
|
|||
|
||||
Vec2 anchorPoint = _target->getAnchorPointInPoints();
|
||||
|
||||
bool needsTranslation = !anchorPoint.equals(Vec2::ZERO);
|
||||
bool needsTranslation = !anchorPoint.isZero();
|
||||
|
||||
Mat4 mv = Mat4::IDENTITY;
|
||||
|
||||
|
|
|
|||
|
|
@ -274,7 +274,7 @@ void CardinalSplineTo::startWithTarget(cocos2d::Node *target)
|
|||
_deltaT = (float) 1 / (_points->count() - 1);
|
||||
|
||||
_previousPosition = target->getPosition();
|
||||
_accumulatedDiff = Vec2::ZERO;
|
||||
_accumulatedDiff.setZero();
|
||||
}
|
||||
|
||||
CardinalSplineTo* CardinalSplineTo::clone() const
|
||||
|
|
|
|||
|
|
@ -143,8 +143,8 @@ void FlipX3D::update(float time)
|
|||
|
||||
Vec3 v0, v1, v, diff;
|
||||
|
||||
v0 = getOriginalVertex(Vec2(1, 1));
|
||||
v1 = getOriginalVertex(Vec2(0, 0));
|
||||
v0 = getOriginalVertex(Vec2(1.0f, 1.0f));
|
||||
v1 = getOriginalVertex(Vec2());
|
||||
|
||||
float x0 = v0.x;
|
||||
float x1 = v1.x;
|
||||
|
|
@ -154,19 +154,19 @@ void FlipX3D::update(float time)
|
|||
if ( x0 > x1 )
|
||||
{
|
||||
// Normal Grid
|
||||
a = Vec2(0,0);
|
||||
b = Vec2(0,1);
|
||||
c = Vec2(1,0);
|
||||
d = Vec2(1,1);
|
||||
a.setZero();
|
||||
b.set(0.0f, 1.0f);
|
||||
c.set(1.0f, 0.0f);
|
||||
d.set(1.0f, 1.0f);
|
||||
x = x0;
|
||||
}
|
||||
else
|
||||
{
|
||||
// Reversed Grid
|
||||
c = Vec2(0,0);
|
||||
d = Vec2(0,1);
|
||||
a = Vec2(1,0);
|
||||
b = Vec2(1,1);
|
||||
c.setZero();
|
||||
d.set(0.0f, 1.0f);
|
||||
a.set(1.0f, 0.0f);
|
||||
b.set(1.0f, 1.0f);
|
||||
x = x1;
|
||||
}
|
||||
|
||||
|
|
@ -237,8 +237,8 @@ void FlipY3D::update(float time)
|
|||
|
||||
Vec3 v0, v1, v, diff;
|
||||
|
||||
v0 = getOriginalVertex(Vec2(1, 1));
|
||||
v1 = getOriginalVertex(Vec2(0, 0));
|
||||
v0 = getOriginalVertex(Vec2(1.0f, 1.0f));
|
||||
v1 = getOriginalVertex(Vec2());
|
||||
|
||||
float y0 = v0.y;
|
||||
float y1 = v1.y;
|
||||
|
|
@ -248,19 +248,19 @@ void FlipY3D::update(float time)
|
|||
if (y0 > y1)
|
||||
{
|
||||
// Normal Grid
|
||||
a = Vec2(0,0);
|
||||
b = Vec2(0,1);
|
||||
c = Vec2(1,0);
|
||||
d = Vec2(1,1);
|
||||
a.setZero();
|
||||
b.set(0.0f, 1.0f);
|
||||
c.set(1.0f, 0.0f);
|
||||
d.set(1.0f, 1.0f);
|
||||
y = y0;
|
||||
}
|
||||
else
|
||||
{
|
||||
// Reversed Grid
|
||||
b = Vec2(0,0);
|
||||
a = Vec2(0,1);
|
||||
d = Vec2(1,0);
|
||||
c = Vec2(1,1);
|
||||
b.setZero();
|
||||
a.set(0.0f, 1.0f);
|
||||
d.set(1.0f, 0.0f);
|
||||
c.set(1.0f, 1.0f);
|
||||
y = y1;
|
||||
}
|
||||
|
||||
|
|
@ -318,7 +318,7 @@ bool Lens3D::initWithDuration(float duration, const Size& gridSize, const Vec2&
|
|||
{
|
||||
if (Grid3DAction::initWithDuration(duration, gridSize))
|
||||
{
|
||||
_position = Vec2(-1, -1);
|
||||
_position.set(-1.0f, -1.0f);
|
||||
setPosition(position);
|
||||
_radius = radius;
|
||||
_lensEffect = 0.7f;
|
||||
|
|
@ -725,13 +725,13 @@ void Twirl::update(float time)
|
|||
{
|
||||
Vec3 v = getOriginalVertex(Vec2(i ,j));
|
||||
|
||||
Vec2 avg = Vec2(i-(_gridSize.width/2.0f), j-(_gridSize.height/2.0f));
|
||||
Vec2 avg(i-(_gridSize.width/2.0f), j-(_gridSize.height/2.0f));
|
||||
float r = avg.getLength();
|
||||
|
||||
float amp = 0.1f * _amplitude * _amplitudeRate;
|
||||
float a = r * cosf( (float)M_PI/2.0f + time * (float)M_PI * _twirls * 2 ) * amp;
|
||||
|
||||
Vec2 d = Vec2(
|
||||
Vec2 d(
|
||||
sinf(a) * (v.y-c.y) + cosf(a) * (v.x-c.x),
|
||||
cosf(a) * (v.y-c.y) - sinf(a) * (v.x-c.x));
|
||||
|
||||
|
|
|
|||
|
|
@ -1478,7 +1478,7 @@ JumpTo* JumpTo::reverse() const
|
|||
void JumpTo::startWithTarget(Node *target)
|
||||
{
|
||||
JumpBy::startWithTarget(target);
|
||||
_delta = Vec2(_endPosition.x - _startPosition.x, _endPosition.y - _startPosition.y);
|
||||
_delta.set(_endPosition.x - _startPosition.x, _endPosition.y - _startPosition.y);
|
||||
}
|
||||
|
||||
// Bezier cubic formula:
|
||||
|
|
|
|||
|
|
@ -325,8 +325,8 @@ void ShuffleTiles::startWithTarget(Node *target)
|
|||
{
|
||||
for ( int j = 0; j < _gridSize.height; ++j)
|
||||
{
|
||||
tileArray->position = Vec2((float)i, (float)j);
|
||||
tileArray->startPosition = Vec2((float)i, (float)j);
|
||||
tileArray->position.set((float)i, (float)j);
|
||||
tileArray->startPosition.set((float)i, (float)j);
|
||||
tileArray->delta = getDelta(Size(i, j));
|
||||
++tileArray;
|
||||
}
|
||||
|
|
@ -694,7 +694,7 @@ void TurnOffTiles::update(float time)
|
|||
for (unsigned int i = 0; i < _tilesCount; i++ )
|
||||
{
|
||||
t = _tilesOrder[i];
|
||||
Vec2 tilePos = Vec2( (unsigned int)(t / _gridSize.height), t % (unsigned int)_gridSize.height );
|
||||
Vec2 tilePos( (unsigned int)(t / _gridSize.height), t % (unsigned int)_gridSize.height );
|
||||
|
||||
if ( i < l )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -202,10 +202,10 @@ void ClippingNode::drawFullScreenQuadClearStencil()
|
|||
director->loadIdentityMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_PROJECTION);
|
||||
|
||||
Vec2 vertices[] = {
|
||||
Vec2(-1, -1),
|
||||
Vec2(1, -1),
|
||||
Vec2(1, 1),
|
||||
Vec2(-1, 1)
|
||||
Vec2(-1.0f, -1.0f),
|
||||
Vec2(1.0f, -1.0f),
|
||||
Vec2(1.0f, 1.0f),
|
||||
Vec2(-1.0f, 1.0f)
|
||||
};
|
||||
|
||||
auto glProgram = GLProgramCache::getInstance()->getGLProgram(GLProgram::SHADER_NAME_POSITION_U_COLOR);
|
||||
|
|
|
|||
|
|
@ -328,7 +328,7 @@ void drawSolidPoly(const Vec2 *poli, unsigned int numberOfPoints, Color4F color)
|
|||
// Mac on 64-bit
|
||||
for(unsigned int i = 0; i < numberOfPoints; i++)
|
||||
{
|
||||
newPoli[i] = Vec2( poli[i].x, poli[i].y );
|
||||
newPoli[i].set(poli[i].x, poli[i].y);
|
||||
}
|
||||
#ifdef EMSCRIPTEN
|
||||
setGLBufferData(newPoli, numberOfPoints * sizeof(Vec2));
|
||||
|
|
|
|||
|
|
@ -740,19 +740,19 @@ void TMXLayer::parseInternalProperties()
|
|||
//CCTMXLayer2 - obtaining positions, offset
|
||||
Vec2 TMXLayer::calculateLayerOffset(const Vec2& pos)
|
||||
{
|
||||
Vec2 ret = Vec2::ZERO;
|
||||
Vec2 ret;
|
||||
switch (_layerOrientation)
|
||||
{
|
||||
case FAST_TMX_ORIENTATION_ORTHO:
|
||||
ret = Vec2( pos.x * _mapTileSize.width, -pos.y *_mapTileSize.height);
|
||||
ret.set( pos.x * _mapTileSize.width, -pos.y *_mapTileSize.height);
|
||||
break;
|
||||
case FAST_TMX_ORIENTATION_ISO:
|
||||
ret = Vec2((_mapTileSize.width /2) * (pos.x - pos.y),
|
||||
ret.set((_mapTileSize.width /2) * (pos.x - pos.y),
|
||||
(_mapTileSize.height /2 ) * (-pos.x - pos.y));
|
||||
break;
|
||||
case FAST_TMX_ORIENTATION_HEX:
|
||||
default:
|
||||
CCASSERT(pos.equals(Vec2::ZERO), "offset for this map not implemented yet");
|
||||
CCASSERT(pos.isZero(), "offset for this map not implemented yet");
|
||||
break;
|
||||
}
|
||||
return ret;
|
||||
|
|
|
|||
|
|
@ -788,25 +788,32 @@ void Label::enableShadow(const Color4B& shadowColor /* = Color4B::BLACK */,const
|
|||
//TODO: support blur for shadow
|
||||
_shadowBlurRadius = 0;
|
||||
|
||||
if (_textSprite && _shadowNode)
|
||||
{
|
||||
if (shadowColor != _shadowColor4F)
|
||||
{
|
||||
Node::removeChild(_shadowNode, true);
|
||||
_shadowNode = nullptr;
|
||||
createShadowSpriteForSystemFont();
|
||||
}
|
||||
else
|
||||
{
|
||||
_shadowNode->setPosition(_shadowOffset.width, _shadowOffset.height);
|
||||
}
|
||||
}
|
||||
|
||||
_shadowColor3B.r = shadowColor.r;
|
||||
_shadowColor3B.g = shadowColor.g;
|
||||
_shadowColor3B.b = shadowColor.b;
|
||||
_shadowOpacity = shadowColor.a;
|
||||
|
||||
if (!_systemFontDirty && !_contentDirty && _textSprite)
|
||||
{
|
||||
if (_shadowNode)
|
||||
{
|
||||
if (shadowColor != _shadowColor4F)
|
||||
{
|
||||
Node::removeChild(_shadowNode, true);
|
||||
_shadowNode = nullptr;
|
||||
createShadowSpriteForSystemFont();
|
||||
}
|
||||
else
|
||||
{
|
||||
_shadowNode->setPosition(_shadowOffset.width, _shadowOffset.height);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
createShadowSpriteForSystemFont();
|
||||
}
|
||||
}
|
||||
|
||||
_shadowColor4F.r = shadowColor.r / 255.0f;
|
||||
_shadowColor4F.g = shadowColor.g / 255.0f;
|
||||
_shadowColor4F.b = shadowColor.b / 255.0f;
|
||||
|
|
@ -857,6 +864,13 @@ void Label::disableEffect(LabelEffect effect)
|
|||
updateShaderProgram();
|
||||
}
|
||||
break;
|
||||
case LabelEffect::ALL:
|
||||
{
|
||||
disableEffect(LabelEffect::SHADOW);
|
||||
disableEffect(LabelEffect::GLOW);
|
||||
disableEffect(LabelEffect::OUTLINE);
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
|
@ -1031,18 +1045,18 @@ void Label::createSpriteForSystemFont()
|
|||
|
||||
void Label::createShadowSpriteForSystemFont()
|
||||
{
|
||||
if (!_fontDefinition._stroke._strokeEnabled && _fontDefinition._fontFillColor == _shadowColor4F
|
||||
&& (_fontDefinition._fontAlpha == _shadowColor4F.a * 255))
|
||||
if (!_fontDefinition._stroke._strokeEnabled && _fontDefinition._fontFillColor == _shadowColor3B
|
||||
&& (_fontDefinition._fontAlpha == _shadowOpacity))
|
||||
{
|
||||
_shadowNode = Sprite::createWithTexture(_textSprite->getTexture());
|
||||
}
|
||||
else
|
||||
{
|
||||
auto shadowFontDefinition = _fontDefinition;
|
||||
shadowFontDefinition._fontFillColor.r = _shadowColor4F.r * 255;
|
||||
shadowFontDefinition._fontFillColor.g = _shadowColor4F.g * 255;
|
||||
shadowFontDefinition._fontFillColor.b = _shadowColor4F.b * 255;
|
||||
shadowFontDefinition._fontAlpha = _shadowColor4F.a * 255;
|
||||
shadowFontDefinition._fontFillColor.r = _shadowColor3B.r;
|
||||
shadowFontDefinition._fontFillColor.g = _shadowColor3B.g;
|
||||
shadowFontDefinition._fontFillColor.b = _shadowColor3B.b;
|
||||
shadowFontDefinition._fontAlpha = _shadowOpacity;
|
||||
|
||||
shadowFontDefinition._stroke._strokeColor = shadowFontDefinition._fontFillColor;
|
||||
shadowFontDefinition._stroke._strokeAlpha = shadowFontDefinition._fontAlpha;
|
||||
|
|
|
|||
|
|
@ -323,6 +323,7 @@ public:
|
|||
|
||||
/**
|
||||
* Disable all effect to Label.
|
||||
* @warning Please use disableEffect(LabelEffect::ALL) instead of this API.
|
||||
*/
|
||||
virtual void disableEffect();
|
||||
|
||||
|
|
|
|||
|
|
@ -714,7 +714,7 @@ void LayerGradient::updateColor()
|
|||
return;
|
||||
|
||||
float c = sqrtf(2.0f);
|
||||
Vec2 u = Vec2(_alongVector.x / h, _alongVector.y / h);
|
||||
Vec2 u(_alongVector.x / h, _alongVector.y / h);
|
||||
|
||||
// Compressed Interpolation mode
|
||||
if (_compressedInterpolation)
|
||||
|
|
|
|||
|
|
@ -549,7 +549,7 @@ MenuItem* Menu::getItemForTouch(Touch *touch)
|
|||
{
|
||||
Vec2 local = child->convertToNodeSpace(touchLocation);
|
||||
Rect r = child->rect();
|
||||
r.origin = Vec2::ZERO;
|
||||
r.origin.setZero();
|
||||
|
||||
if (r.containsPoint(local))
|
||||
{
|
||||
|
|
|
|||
|
|
@ -40,7 +40,6 @@ MotionStreak::MotionStreak()
|
|||
, _startingPositionInitialized(false)
|
||||
, _texture(nullptr)
|
||||
, _blendFunc(BlendFunc::ALPHA_NON_PREMULTIPLIED)
|
||||
, _positionR(Vec2::ZERO)
|
||||
, _stroke(0.0f)
|
||||
, _fadeDelta(0.0f)
|
||||
, _minSeg(0.0f)
|
||||
|
|
@ -106,7 +105,7 @@ bool MotionStreak::initWithFade(float fade, float minSeg, float stroke, const Co
|
|||
ignoreAnchorPointForPosition(true);
|
||||
_startingPositionInitialized = false;
|
||||
|
||||
_positionR = Vec2::ZERO;
|
||||
_positionR.setZero();
|
||||
_fastMode = true;
|
||||
_minSeg = (minSeg == -1.0f) ? stroke/5.0f : minSeg;
|
||||
_minSeg *= _minSeg;
|
||||
|
|
|
|||
|
|
@ -83,14 +83,11 @@ Node::Node(void)
|
|||
, _scaleX(1.0f)
|
||||
, _scaleY(1.0f)
|
||||
, _scaleZ(1.0f)
|
||||
, _position(Vec2::ZERO)
|
||||
, _positionZ(0.0f)
|
||||
, _usingNormalizedPosition(false)
|
||||
, _normalizedPositionDirty(false)
|
||||
, _skewX(0.0f)
|
||||
, _skewY(0.0f)
|
||||
, _anchorPointInPoints(Vec2::ZERO)
|
||||
, _anchorPoint(Vec2::ZERO)
|
||||
, _contentSize(Size::ZERO)
|
||||
, _contentSizeDirty(true)
|
||||
, _transformDirty(true)
|
||||
|
|
@ -723,7 +720,7 @@ void Node::setAnchorPoint(const Vec2& point)
|
|||
if (! point.equals(_anchorPoint))
|
||||
{
|
||||
_anchorPoint = point;
|
||||
_anchorPointInPoints = Vec2(_contentSize.width * _anchorPoint.x, _contentSize.height * _anchorPoint.y);
|
||||
_anchorPointInPoints.set(_contentSize.width * _anchorPoint.x, _contentSize.height * _anchorPoint.y);
|
||||
_transformUpdated = _transformDirty = _inverseDirty = true;
|
||||
}
|
||||
}
|
||||
|
|
@ -740,7 +737,7 @@ void Node::setContentSize(const Size & size)
|
|||
{
|
||||
_contentSize = size;
|
||||
|
||||
_anchorPointInPoints = Vec2(_contentSize.width * _anchorPoint.x, _contentSize.height * _anchorPoint.y);
|
||||
_anchorPointInPoints.set(_contentSize.width * _anchorPoint.x, _contentSize.height * _anchorPoint.y);
|
||||
_transformUpdated = _transformDirty = _inverseDirty = _contentSizeDirty = true;
|
||||
}
|
||||
}
|
||||
|
|
@ -1768,7 +1765,7 @@ const Mat4& Node::getNodeToParentTransform() const
|
|||
Vec2 anchorPoint(_anchorPointInPoints.x * _scaleX, _anchorPointInPoints.y * _scaleY);
|
||||
|
||||
// caculate real position
|
||||
if (! needsSkewMatrix && !_anchorPointInPoints.equals(Vec2::ZERO))
|
||||
if (! needsSkewMatrix && !_anchorPointInPoints.isZero())
|
||||
{
|
||||
x += -anchorPoint.x;
|
||||
y += -anchorPoint.y;
|
||||
|
|
@ -1831,7 +1828,7 @@ const Mat4& Node::getNodeToParentTransform() const
|
|||
_transform = _transform * skewMatrix;
|
||||
|
||||
// adjust anchor point
|
||||
if (!_anchorPointInPoints.equals(Vec2::ZERO))
|
||||
if (!_anchorPointInPoints.isZero())
|
||||
{
|
||||
// FIXME:: Argh, Mat4 needs a "translate" method.
|
||||
// FIXME:: Although this is faster than multiplying a vec4 * mat4
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@ private:
|
|||
ParallaxNode::ParallaxNode()
|
||||
{
|
||||
_parallaxArray = ccArrayNew(5);
|
||||
_lastPosition = Vec2(-100,-100);
|
||||
_lastPosition.set(-100.0f, -100.0f);
|
||||
}
|
||||
|
||||
ParallaxNode::~ParallaxNode()
|
||||
|
|
|
|||
|
|
@ -98,7 +98,7 @@ bool ParticleFire::initWithTotalParticles(int numberOfParticles)
|
|||
this->_emitterMode = Mode::GRAVITY;
|
||||
|
||||
// Gravity Mode: gravity
|
||||
this->modeA.gravity = Vec2(0,0);
|
||||
this->modeA.gravity.setZero();
|
||||
|
||||
// Gravity Mode: radial acceleration
|
||||
this->modeA.radialAccel = 0;
|
||||
|
|
@ -114,8 +114,8 @@ bool ParticleFire::initWithTotalParticles(int numberOfParticles)
|
|||
|
||||
// emitter position
|
||||
Size winSize = Director::getInstance()->getWinSize();
|
||||
this->setPosition(winSize.width/2, 60);
|
||||
this->_posVar = Vec2(40, 20);
|
||||
this->setPosition(winSize.width/2.0f, 60.0f);
|
||||
this->_posVar.set(40.0f, 20.0f);
|
||||
|
||||
// life of particles
|
||||
_life = 3;
|
||||
|
|
@ -203,27 +203,27 @@ bool ParticleFireworks::initWithTotalParticles(int numberOfParticles)
|
|||
this->_emitterMode = Mode::GRAVITY;
|
||||
|
||||
// Gravity Mode: gravity
|
||||
this->modeA.gravity = Vec2(0,-90);
|
||||
this->modeA.gravity.set(0.0f, -90.0f);
|
||||
|
||||
// Gravity Mode: radial
|
||||
this->modeA.radialAccel = 0;
|
||||
this->modeA.radialAccelVar = 0;
|
||||
this->modeA.radialAccel = 0.0f;
|
||||
this->modeA.radialAccelVar = 0.0f;
|
||||
|
||||
// Gravity Mode: speed of particles
|
||||
this->modeA.speed = 180;
|
||||
this->modeA.speedVar = 50;
|
||||
this->modeA.speed = 180.0f;
|
||||
this->modeA.speedVar = 50.0f;
|
||||
|
||||
// emitter position
|
||||
Size winSize = Director::getInstance()->getWinSize();
|
||||
this->setPosition(winSize.width/2, winSize.height/2);
|
||||
|
||||
// angle
|
||||
this->_angle= 90;
|
||||
this->_angleVar = 20;
|
||||
this->_angle= 90.0f;
|
||||
this->_angleVar = 20.0f;
|
||||
|
||||
// life of particles
|
||||
this->_life = 3.5f;
|
||||
this->_lifeVar = 1;
|
||||
this->_lifeVar = 1.0f;
|
||||
|
||||
// emits per frame
|
||||
this->_emissionRate = _totalParticles/_life;
|
||||
|
|
|
|||
|
|
@ -93,8 +93,6 @@ ParticleSystem::ParticleSystem()
|
|||
, _isActive(true)
|
||||
, _particleCount(0)
|
||||
, _duration(0)
|
||||
, _sourcePosition(Vec2::ZERO)
|
||||
, _posVar(Vec2::ZERO)
|
||||
, _life(0)
|
||||
, _lifeVar(0)
|
||||
, _angle(0)
|
||||
|
|
@ -116,7 +114,7 @@ ParticleSystem::ParticleSystem()
|
|||
, _yCoordFlipped(1)
|
||||
, _positionType(PositionType::FREE)
|
||||
{
|
||||
modeA.gravity = Vec2::ZERO;
|
||||
modeA.gravity.setZero();
|
||||
modeA.speed = 0;
|
||||
modeA.speedVar = 0;
|
||||
modeA.tangentialAccel = 0;
|
||||
|
|
@ -683,7 +681,7 @@ void ParticleSystem::update(float dt)
|
|||
|
||||
_particleIdx = 0;
|
||||
|
||||
Vec2 currentPosition = Vec2::ZERO;
|
||||
Vec2 currentPosition;
|
||||
if (_positionType == PositionType::FREE)
|
||||
{
|
||||
currentPosition = this->convertToWorldSpace(Vec2::ZERO);
|
||||
|
|
@ -710,7 +708,6 @@ void ParticleSystem::update(float dt)
|
|||
{
|
||||
Vec2 tmp, radial, tangential;
|
||||
|
||||
radial = Vec2::ZERO;
|
||||
// radial acceleration
|
||||
if (p->pos.x || p->pos.y)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -237,7 +237,7 @@ void ParticleSystemQuad::setTexture(Texture2D* texture)
|
|||
|
||||
void ParticleSystemQuad::setDisplayFrame(SpriteFrame *spriteFrame)
|
||||
{
|
||||
CCASSERT(spriteFrame->getOffsetInPixels().equals(Vec2::ZERO),
|
||||
CCASSERT(spriteFrame->getOffsetInPixels().isZero(),
|
||||
"QuadParticle only supports SpriteFrames with no offsets");
|
||||
|
||||
// update texture before updating texture rect
|
||||
|
|
|
|||
|
|
@ -157,8 +157,8 @@ Tex2F ProgressTimer::textureCoordFromAlphaPoint(Vec2 alpha)
|
|||
return ret;
|
||||
}
|
||||
V3F_C4B_T2F_Quad quad = _sprite->getQuad();
|
||||
Vec2 min = Vec2(quad.bl.texCoords.u,quad.bl.texCoords.v);
|
||||
Vec2 max = Vec2(quad.tr.texCoords.u,quad.tr.texCoords.v);
|
||||
Vec2 min(quad.bl.texCoords.u,quad.bl.texCoords.v);
|
||||
Vec2 max(quad.tr.texCoords.u,quad.tr.texCoords.v);
|
||||
// Fix bug #1303 so that progress timer handles sprite frame texture rotation
|
||||
if (_sprite->isTextureRectRotated()) {
|
||||
std::swap(alpha.x, alpha.y);
|
||||
|
|
@ -173,8 +173,8 @@ Vec2 ProgressTimer::vertexFromAlphaPoint(Vec2 alpha)
|
|||
return ret;
|
||||
}
|
||||
V3F_C4B_T2F_Quad quad = _sprite->getQuad();
|
||||
Vec2 min = Vec2(quad.bl.vertices.x,quad.bl.vertices.y);
|
||||
Vec2 max = Vec2(quad.tr.vertices.x,quad.tr.vertices.y);
|
||||
Vec2 min(quad.bl.vertices.x,quad.bl.vertices.y);
|
||||
Vec2 max(quad.tr.vertices.x,quad.tr.vertices.y);
|
||||
ret.x = min.x * (1.f - alpha.x) + max.x * alpha.x;
|
||||
ret.y = min.y * (1.f - alpha.y) + max.y * alpha.y;
|
||||
return ret;
|
||||
|
|
@ -269,12 +269,12 @@ void ProgressTimer::updateRadial(void)
|
|||
// We find the vector to do a hit detection based on the percentage
|
||||
// We know the first vector is the one @ 12 o'clock (top,mid) so we rotate
|
||||
// from that by the progress angle around the _midpoint pivot
|
||||
Vec2 topMid = Vec2(_midpoint.x, 1.f);
|
||||
Vec2 topMid(_midpoint.x, 1.f);
|
||||
Vec2 percentagePt = topMid.rotateByAngle(_midpoint, angle);
|
||||
|
||||
|
||||
int index = 0;
|
||||
Vec2 hit = Vec2::ZERO;
|
||||
Vec2 hit;
|
||||
|
||||
if (alpha == 0.f) {
|
||||
// More efficient since we don't always need to check intersection
|
||||
|
|
|
|||
|
|
@ -228,7 +228,7 @@ bool Sprite::initWithTexture(Texture2D *texture, const Rect& rect, bool rotated)
|
|||
setAnchorPoint(Vec2(0.5f, 0.5f));
|
||||
|
||||
// zwoptex default values
|
||||
_offsetPosition = Vec2::ZERO;
|
||||
_offsetPosition.setZero();
|
||||
|
||||
// clean the Quad
|
||||
memset(&_quad, 0, sizeof(_quad));
|
||||
|
|
|
|||
|
|
@ -605,18 +605,18 @@ void TMXLayer::removeTileAt(const Vec2& pos)
|
|||
//CCTMXLayer - obtaining positions, offset
|
||||
Vec2 TMXLayer::calculateLayerOffset(const Vec2& pos)
|
||||
{
|
||||
Vec2 ret = Vec2::ZERO;
|
||||
Vec2 ret;
|
||||
switch (_layerOrientation)
|
||||
{
|
||||
case TMXOrientationOrtho:
|
||||
ret = Vec2( pos.x * _mapTileSize.width, -pos.y *_mapTileSize.height);
|
||||
ret.set( pos.x * _mapTileSize.width, -pos.y *_mapTileSize.height);
|
||||
break;
|
||||
case TMXOrientationIso:
|
||||
ret = Vec2((_mapTileSize.width /2) * (pos.x - pos.y),
|
||||
ret.set((_mapTileSize.width /2) * (pos.x - pos.y),
|
||||
(_mapTileSize.height /2 ) * (-pos.x - pos.y));
|
||||
break;
|
||||
case TMXOrientationHex:
|
||||
CCASSERT(pos.equals(Vec2::ZERO), "offset for hexagonal map not implemented yet");
|
||||
CCASSERT(pos.isZero(), "offset for hexagonal map not implemented yet");
|
||||
break;
|
||||
case TMXOrientationStaggered:
|
||||
{
|
||||
|
|
@ -625,7 +625,7 @@ Vec2 TMXLayer::calculateLayerOffset(const Vec2& pos)
|
|||
{
|
||||
diffX = _mapTileSize.width/2;
|
||||
}
|
||||
ret = Vec2(pos.x * _mapTileSize.width + diffX,
|
||||
ret.set(pos.x * _mapTileSize.width + diffX,
|
||||
(-pos.y) * _mapTileSize.height/2);
|
||||
}
|
||||
break;
|
||||
|
|
@ -635,7 +635,7 @@ Vec2 TMXLayer::calculateLayerOffset(const Vec2& pos)
|
|||
|
||||
Vec2 TMXLayer::getPositionAt(const Vec2& pos)
|
||||
{
|
||||
Vec2 ret = Vec2::ZERO;
|
||||
Vec2 ret;
|
||||
switch (_layerOrientation)
|
||||
{
|
||||
case TMXOrientationOrtho:
|
||||
|
|
@ -675,7 +675,8 @@ Vec2 TMXLayer::getPositionForHexAt(const Vec2& pos)
|
|||
diffY = -_mapTileSize.height/2 ;
|
||||
}
|
||||
|
||||
Vec2 xy = Vec2(pos.x * _mapTileSize.width*3/4,
|
||||
Vec2 xy(
|
||||
pos.x * _mapTileSize.width*3/4,
|
||||
(_layerSize.height - pos.y - 1) * _mapTileSize.height + diffY);
|
||||
return xy;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -34,7 +34,6 @@ NS_CC_BEGIN
|
|||
|
||||
TMXObjectGroup::TMXObjectGroup()
|
||||
: _groupName("")
|
||||
, _positionOffset(Vec2::ZERO)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -44,7 +44,6 @@ TMXLayerInfo::TMXLayerInfo()
|
|||
: _name("")
|
||||
, _tiles(nullptr)
|
||||
, _ownTiles(true)
|
||||
, _offset(Vec2::ZERO)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -355,7 +354,7 @@ void TMXMapInfo::startElement(void *ctx, const char *name, const char **atts)
|
|||
|
||||
float x = attributeDict["x"].asFloat();
|
||||
float y = attributeDict["y"].asFloat();
|
||||
layer->_offset = Vec2(x,y);
|
||||
layer->_offset.set(x, y);
|
||||
|
||||
tmxMapInfo->getLayers().pushBack(layer);
|
||||
layer->release();
|
||||
|
|
|
|||
|
|
@ -472,6 +472,7 @@
|
|||
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\platform\winrt\Keyboard-winrt.h" />
|
||||
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\platform\winrt\pch.h" />
|
||||
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\platform\winrt\sha1.h" />
|
||||
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\platform\winrt\WICImageLoader-win.h" />
|
||||
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\renderer\CCBatchCommand.h" />
|
||||
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\renderer\CCCustomCommand.h" />
|
||||
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\renderer\CCGLProgram.h" />
|
||||
|
|
@ -1027,6 +1028,7 @@
|
|||
</ForcedIncludeFiles>
|
||||
</ClCompile>
|
||||
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\platform\winrt\sha1.cpp" />
|
||||
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\platform\winrt\WICImageLoader-win.cpp" />
|
||||
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\renderer\CCBatchCommand.cpp" />
|
||||
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\renderer\CCCustomCommand.cpp" />
|
||||
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\renderer\CCGLProgram.cpp" />
|
||||
|
|
|
|||
|
|
@ -1743,6 +1743,9 @@
|
|||
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\3d\CCTerrain.h">
|
||||
<Filter>3d</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\platform\winrt\WICImageLoader-win.h">
|
||||
<Filter>platform\winrt</Filter>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\cocos2d.cpp" />
|
||||
|
|
@ -3315,6 +3318,9 @@
|
|||
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\CocoStudio.cpp">
|
||||
<Filter>cocostudio\json</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\platform\winrt\WICImageLoader-win.cpp">
|
||||
<Filter>platform\winrt</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Filter Include="2d">
|
||||
|
|
|
|||
|
|
@ -146,7 +146,7 @@
|
|||
<CompileAsWinRT>true</CompileAsWinRT>
|
||||
<AdditionalOptions>/Zm384 /bigobj %(AdditionalOptions)</AdditionalOptions>
|
||||
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
|
||||
<AdditionalIncludeDirectories>$(EngineRoot)external\winrt_8.1-specific\zlib\include;$(EngineRoot)external\freetype2\include\winrt_8.1;$(EngineRoot)external\websockets\include\winrt_8.1;$(EngineRoot)external\curl\include\winrt_8.1;$(EngineRoot)external\tiff\include\winrt_8.1;$(EngineRoot)external\jpeg\include\winrt_8.1;$(EngineRoot)external\png\include\winrt_8.1;$(EngineRoot)external\protobuf-lite\src;$(EngineRoot)external\protobuf-lite\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>$(EngineRoot)external\winrt_8.1-specific\zlib\include;$(EngineRoot)external\freetype2\include\winrt_8.1\freetype2;$(EngineRoot)external\websockets\include\winrt_8.1;$(EngineRoot)external\curl\include\winrt_8.1;$(EngineRoot)external\tiff\include\winrt_8.1;$(EngineRoot)external\jpeg\include\winrt_8.1;$(EngineRoot)external\png\include\winrt_8.1;$(EngineRoot)external\protobuf-lite\src;$(EngineRoot)external\protobuf-lite\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>_USRDLL;_LIB;COCOS2DXWIN32_EXPORTS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_DEBUG;COCOS2D_DEBUG=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<SDLCheck>false</SDLCheck>
|
||||
<DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
|
||||
|
|
@ -166,7 +166,7 @@
|
|||
<CompileAsWinRT>true</CompileAsWinRT>
|
||||
<AdditionalOptions>/Zm384 /bigobj %(AdditionalOptions)</AdditionalOptions>
|
||||
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
|
||||
<AdditionalIncludeDirectories>$(EngineRoot)external\winrt_8.1-specific\zlib\include;$(EngineRoot)external\freetype2\include\winrt_8.1;$(EngineRoot)external\websockets\include\winrt_8.1;$(EngineRoot)external\curl\include\winrt_8.1;$(EngineRoot)external\tiff\include\winrt_8.1;$(EngineRoot)external\jpeg\include\winrt_8.1;$(EngineRoot)external\png\include\winrt_8.1;$(EngineRoot)external\protobuf-lite\src;$(EngineRoot)external\protobuf-lite\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>$(EngineRoot)external\winrt_8.1-specific\zlib\include;$(EngineRoot)external\freetype2\include\winrt_8.1\freetype2;$(EngineRoot)external\websockets\include\winrt_8.1;$(EngineRoot)external\curl\include\winrt_8.1;$(EngineRoot)external\tiff\include\winrt_8.1;$(EngineRoot)external\jpeg\include\winrt_8.1;$(EngineRoot)external\png\include\winrt_8.1;$(EngineRoot)external\protobuf-lite\src;$(EngineRoot)external\protobuf-lite\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>_USRDLL;_LIB;COCOS2DXWIN32_EXPORTS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<SDLCheck>false</SDLCheck>
|
||||
<DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
|
||||
|
|
@ -186,7 +186,7 @@
|
|||
<CompileAsWinRT>true</CompileAsWinRT>
|
||||
<AdditionalOptions>/Zm384 /bigobj %(AdditionalOptions)</AdditionalOptions>
|
||||
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
|
||||
<AdditionalIncludeDirectories>$(EngineRoot)external\winrt_8.1-specific\zlib\include;$(EngineRoot)external\freetype2\include\winrt_8.1;$(EngineRoot)external\websockets\include\winrt_8.1;$(EngineRoot)external\curl\include\winrt_8.1;$(EngineRoot)external\tiff\include\winrt_8.1;$(EngineRoot)external\jpeg\include\winrt_8.1;$(EngineRoot)external\png\include\winrt_8.1;$(EngineRoot)external\protobuf-lite\src;$(EngineRoot)external\protobuf-lite\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>$(EngineRoot)external\winrt_8.1-specific\zlib\include;$(EngineRoot)external\freetype2\include\winrt_8.1\freetype2;$(EngineRoot)external\websockets\include\winrt_8.1;$(EngineRoot)external\curl\include\winrt_8.1;$(EngineRoot)external\tiff\include\winrt_8.1;$(EngineRoot)external\jpeg\include\winrt_8.1;$(EngineRoot)external\png\include\winrt_8.1;$(EngineRoot)external\protobuf-lite\src;$(EngineRoot)external\protobuf-lite\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>_USRDLL;_LIB;COCOS2DXWIN32_EXPORTS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_DEBUG;COCOS2D_DEBUG=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<SDLCheck>false</SDLCheck>
|
||||
<DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
|
||||
|
|
@ -206,7 +206,7 @@
|
|||
<CompileAsWinRT>true</CompileAsWinRT>
|
||||
<AdditionalOptions>/Zm384 /bigobj %(AdditionalOptions)</AdditionalOptions>
|
||||
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
|
||||
<AdditionalIncludeDirectories>$(EngineRoot)external\winrt_8.1-specific\zlib\include;$(EngineRoot)external\freetype2\include\winrt_8.1;$(EngineRoot)external\websockets\include\winrt_8.1;$(EngineRoot)external\curl\include\winrt_8.1;$(EngineRoot)external\tiff\include\winrt_8.1;$(EngineRoot)external\jpeg\include\winrt_8.1;$(EngineRoot)external\png\include\winrt_8.1;$(EngineRoot)external\protobuf-lite\src;$(EngineRoot)external\protobuf-lite\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>$(EngineRoot)external\winrt_8.1-specific\zlib\include;$(EngineRoot)external\freetype2\include\winrt_8.1\freetype2;$(EngineRoot)external\websockets\include\winrt_8.1;$(EngineRoot)external\curl\include\winrt_8.1;$(EngineRoot)external\tiff\include\winrt_8.1;$(EngineRoot)external\jpeg\include\winrt_8.1;$(EngineRoot)external\png\include\winrt_8.1;$(EngineRoot)external\protobuf-lite\src;$(EngineRoot)external\protobuf-lite\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>_USRDLL;_LIB;COCOS2DXWIN32_EXPORTS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<SDLCheck>false</SDLCheck>
|
||||
<DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
|
||||
|
|
@ -226,7 +226,7 @@
|
|||
<CompileAsWinRT>true</CompileAsWinRT>
|
||||
<AdditionalOptions>/Zm384 /bigobj %(AdditionalOptions)</AdditionalOptions>
|
||||
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
|
||||
<AdditionalIncludeDirectories>$(EngineRoot)external\winrt_8.1-specific\zlib\include;$(EngineRoot)external\freetype2\include\winrt_8.1;$(EngineRoot)external\websockets\include\winrt_8.1;$(EngineRoot)external\curl\include\winrt_8.1;$(EngineRoot)external\tiff\include\winrt_8.1;$(EngineRoot)external\jpeg\include\winrt_8.1;$(EngineRoot)external\png\include\winrt_8.1;$(EngineRoot)external\protobuf-lite\src;$(EngineRoot)external\protobuf-lite\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>$(EngineRoot)external\winrt_8.1-specific\zlib\include;$(EngineRoot)external\freetype2\include\winrt_8.1\freetype2;$(EngineRoot)external\websockets\include\winrt_8.1;$(EngineRoot)external\curl\include\winrt_8.1;$(EngineRoot)external\tiff\include\winrt_8.1;$(EngineRoot)external\jpeg\include\winrt_8.1;$(EngineRoot)external\png\include\winrt_8.1;$(EngineRoot)external\protobuf-lite\src;$(EngineRoot)external\protobuf-lite\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>_USRDLL;_LIB;COCOS2DXWIN32_EXPORTS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_DEBUG;COCOS2D_DEBUG=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<SDLCheck>false</SDLCheck>
|
||||
<DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
|
||||
|
|
@ -246,7 +246,7 @@
|
|||
<CompileAsWinRT>true</CompileAsWinRT>
|
||||
<AdditionalOptions>/Zm384 /bigobj %(AdditionalOptions)</AdditionalOptions>
|
||||
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
|
||||
<AdditionalIncludeDirectories>$(EngineRoot)external\winrt_8.1-specific\zlib\include;$(EngineRoot)external\freetype2\include\winrt_8.1;$(EngineRoot)external\websockets\include\winrt_8.1;$(EngineRoot)external\curl\include\winrt_8.1;$(EngineRoot)external\tiff\include\winrt_8.1;$(EngineRoot)external\jpeg\include\winrt_8.1;$(EngineRoot)external\png\include\winrt_8.1;$(EngineRoot)external\protobuf-lite\src;$(EngineRoot)external\protobuf-lite\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>$(EngineRoot)external\winrt_8.1-specific\zlib\include;$(EngineRoot)external\freetype2\include\winrt_8.1\freetype2;$(EngineRoot)external\websockets\include\winrt_8.1;$(EngineRoot)external\curl\include\winrt_8.1;$(EngineRoot)external\tiff\include\winrt_8.1;$(EngineRoot)external\jpeg\include\winrt_8.1;$(EngineRoot)external\png\include\winrt_8.1;$(EngineRoot)external\protobuf-lite\src;$(EngineRoot)external\protobuf-lite\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>_USRDLL;_LIB;COCOS2DXWIN32_EXPORTS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<SDLCheck>false</SDLCheck>
|
||||
<DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
|
||||
|
|
|
|||
|
|
@ -108,7 +108,7 @@
|
|||
<CompileAsWinRT>true</CompileAsWinRT>
|
||||
<AdditionalOptions>/Zm384 /bigobj %(AdditionalOptions)</AdditionalOptions>
|
||||
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
|
||||
<AdditionalIncludeDirectories>$(EngineRoot)external\wp_8.1-specific\zlib\include;$(EngineRoot)external\freetype2\include\wp_8.1;$(EngineRoot)external\websockets\include\wp_8.1;$(EngineRoot)external\curl\include\wp_8.1;$(EngineRoot)external\tiff\include\wp_8.1;$(EngineRoot)external\jpeg\include\wp_8.1;$(EngineRoot)external\png\include\wp_8.1;$(EngineRoot)external\protobuf-lite\src;$(EngineRoot)external\protobuf-lite\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>$(EngineRoot)external\wp_8.1-specific\zlib\include;$(EngineRoot)external\freetype2\include\wp_8.1\freetype2;$(EngineRoot)external\websockets\include\wp_8.1;$(EngineRoot)external\curl\include\wp_8.1;$(EngineRoot)external\tiff\include\wp_8.1;$(EngineRoot)external\jpeg\include\wp_8.1;$(EngineRoot)external\png\include\wp_8.1;$(EngineRoot)external\protobuf-lite\src;$(EngineRoot)external\protobuf-lite\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>_USRDLL;_LIB;COCOS2DXWIN32_EXPORTS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_DEBUG;COCOS2D_DEBUG=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<SDLCheck>false</SDLCheck>
|
||||
<DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
|
||||
|
|
@ -128,7 +128,7 @@
|
|||
<CompileAsWinRT>true</CompileAsWinRT>
|
||||
<AdditionalOptions>/Zm384 /bigobj %(AdditionalOptions)</AdditionalOptions>
|
||||
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
|
||||
<AdditionalIncludeDirectories>$(EngineRoot)external\wp_8.1-specific\zlib\include;$(EngineRoot)external\freetype2\include\wp_8.1;$(EngineRoot)external\websockets\include\wp_8.1;$(EngineRoot)external\curl\include\wp_8.1;$(EngineRoot)external\tiff\include\wp_8.1;$(EngineRoot)external\jpeg\include\wp_8.1;$(EngineRoot)external\png\include\wp_8.1;$(EngineRoot)external\protobuf-lite\src;$(EngineRoot)external\protobuf-lite\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>$(EngineRoot)external\wp_8.1-specific\zlib\include;$(EngineRoot)external\freetype2\include\wp_8.1\freetype2;$(EngineRoot)external\websockets\include\wp_8.1;$(EngineRoot)external\curl\include\wp_8.1;$(EngineRoot)external\tiff\include\wp_8.1;$(EngineRoot)external\jpeg\include\wp_8.1;$(EngineRoot)external\png\include\wp_8.1;$(EngineRoot)external\protobuf-lite\src;$(EngineRoot)external\protobuf-lite\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>_USRDLL;_LIB;COCOS2DXWIN32_EXPORTS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<SDLCheck>false</SDLCheck>
|
||||
<DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
|
||||
|
|
@ -148,7 +148,7 @@
|
|||
<CompileAsWinRT>true</CompileAsWinRT>
|
||||
<AdditionalOptions>/Zm384 /bigobj %(AdditionalOptions)</AdditionalOptions>
|
||||
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
|
||||
<AdditionalIncludeDirectories>$(EngineRoot)external\wp_8.1-specific\zlib\include;$(EngineRoot)external\freetype2\include\wp_8.1;$(EngineRoot)external\websockets\include\wp_8.1;$(EngineRoot)external\curl\include\wp_8.1;$(EngineRoot)external\tiff\include\wp_8.1;$(EngineRoot)external\jpeg\include\wp_8.1;$(EngineRoot)external\png\include\wp_8.1;$(EngineRoot)external\protobuf-lite\src;$(EngineRoot)external\protobuf-lite\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>$(EngineRoot)external\wp_8.1-specific\zlib\include;$(EngineRoot)external\freetype2\include\wp_8.1\freetype2;$(EngineRoot)external\websockets\include\wp_8.1;$(EngineRoot)external\curl\include\wp_8.1;$(EngineRoot)external\tiff\include\wp_8.1;$(EngineRoot)external\jpeg\include\wp_8.1;$(EngineRoot)external\png\include\wp_8.1;$(EngineRoot)external\protobuf-lite\src;$(EngineRoot)external\protobuf-lite\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>_USRDLL;_LIB;COCOS2DXWIN32_EXPORTS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_DEBUG;COCOS2D_DEBUG=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<SDLCheck>false</SDLCheck>
|
||||
<DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
|
||||
|
|
@ -168,7 +168,7 @@
|
|||
<CompileAsWinRT>true</CompileAsWinRT>
|
||||
<AdditionalOptions>/Zm384 /bigobj %(AdditionalOptions)</AdditionalOptions>
|
||||
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
|
||||
<AdditionalIncludeDirectories>$(EngineRoot)external\wp_8.1-specific\zlib\include;$(EngineRoot)external\freetype2\include\wp_8.1;$(EngineRoot)external\websockets\include\wp_8.1;$(EngineRoot)external\curl\include\wp_8.1;$(EngineRoot)external\tiff\include\wp_8.1;$(EngineRoot)external\jpeg\include\wp_8.1;$(EngineRoot)external\png\include\wp_8.1;$(EngineRoot)external\protobuf-lite\src;$(EngineRoot)external\protobuf-lite\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>$(EngineRoot)external\wp_8.1-specific\zlib\include;$(EngineRoot)external\freetype2\include\wp_8.1\freetype2;$(EngineRoot)external\websockets\include\wp_8.1;$(EngineRoot)external\curl\include\wp_8.1;$(EngineRoot)external\tiff\include\wp_8.1;$(EngineRoot)external\jpeg\include\wp_8.1;$(EngineRoot)external\png\include\wp_8.1;$(EngineRoot)external\protobuf-lite\src;$(EngineRoot)external\protobuf-lite\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>_USRDLL;_LIB;COCOS2DXWIN32_EXPORTS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<SDLCheck>false</SDLCheck>
|
||||
<DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -18,8 +18,8 @@
|
|||
<DisableSpecificWarnings>4056;4244;4251;4756;4453;28204;</DisableSpecificWarnings>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<AdditionalDependencies>libGLESv2.lib;libEGL.lib;ws2_32.lib;libwebsockets.lib;libcurl.lib;libchipmunk.lib;zlib.lib;libpng.lib;libjpeg.lib;libtiff.lib;freetype250.lib;sqlite3.lib;d2d1.lib;d3d11.lib;dxgi.lib;windowscodecs.lib;dwrite.lib;dxguid.lib;xaudio2.lib;mfcore.lib;mfplat.lib;mfreadwrite.lib;mfuuid.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalLibraryDirectories>$(EngineRoot)external\$(COCOS2D_PLATFORM)-specific\angle\prebuilt\$(Platform);$(EngineRoot)external\curl\prebuilt\$(COCOS2D_PLATFORM)\$(Platform);$(EngineRoot)external\websockets\prebuilt\$(COCOS2D_PLATFORM)\$(Platform);$(EngineRoot)external\chipmunk\prebuilt\$(COCOS2D_PLATFORM)\$(Platform);$(EngineRoot)external\$(COCOS2D_PLATFORM)-specific\zlib\prebuilt\$(Platform);$(EngineRoot)external\png\prebuilt\$(COCOS2D_PLATFORM)\$(Platform);$(EngineRoot)external\tiff\prebuilt\$(COCOS2D_PLATFORM)\$(Platform);$(EngineRoot)external\jpeg\prebuilt\$(COCOS2D_PLATFORM)\$(Platform);$(EngineRoot)external\sqlite3\libraries\$(COCOS2D_PLATFORM)\$(Platform);$(EngineRoot)external\freetype2\prebuilt\$(COCOS2D_PLATFORM)\$(Platform);%(AdditionalLibraryDirectories);</AdditionalLibraryDirectories>
|
||||
<AdditionalDependencies>libGLESv2.lib;libEGL.lib;ws2_32.lib;libwebsockets.lib;libcurl.lib;chipmunk.lib;zlib.lib;freetype.lib;sqlite3.lib;d2d1.lib;d3d11.lib;dxgi.lib;windowscodecs.lib;dwrite.lib;dxguid.lib;xaudio2.lib;mfcore.lib;mfplat.lib;mfreadwrite.lib;mfuuid.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalLibraryDirectories>$(EngineRoot)external\$(COCOS2D_PLATFORM)-specific\angle\prebuilt\$(Platform);$(EngineRoot)external\curl\prebuilt\$(COCOS2D_PLATFORM)\$(Platform);$(EngineRoot)external\websockets\prebuilt\$(COCOS2D_PLATFORM)\$(Platform);$(EngineRoot)external\chipmunk\prebuilt\$(COCOS2D_PLATFORM)\$(Platform);$(EngineRoot)external\$(COCOS2D_PLATFORM)-specific\zlib\prebuilt\$(Platform);$(EngineRoot)external\sqlite3\libraries\$(COCOS2D_PLATFORM)\$(Platform);$(EngineRoot)external\freetype2\prebuilt\$(COCOS2D_PLATFORM)\$(Platform);%(AdditionalLibraryDirectories);</AdditionalLibraryDirectories>
|
||||
<AdditionalOptions>/IGNORE:4264 %(AdditionalOptions)</AdditionalOptions>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
|
|
|
|||
|
|
@ -1,35 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<ImportGroup Label="PropertySheets" />
|
||||
<PropertyGroup Label="COCOS2">
|
||||
<COCOS2D_PLATFORM Condition=" '$(COCOS2_PLATFORM)' == '' ">wp8</COCOS2D_PLATFORM>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Label="UserMacros">
|
||||
<EngineRoot>$(MSBuildThisFileDirectory)..\..\..\</EngineRoot>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup />
|
||||
<ItemDefinitionGroup>
|
||||
<ClCompile>
|
||||
<AdditionalIncludeDirectories>$(EngineRoot)external\$(COCOS2D_PLATFORM)-specific\angle\include;$(EngineRoot)external\$(COCOS2D_PLATFORM)-specific\zlib\include;$(EngineRoot)external\freetype2\include\$(COCOS2D_PLATFORM)\freetype;$(EngineRoot)external\curl\include\$(COCOS2D_PLATFORM);$(EngineRoot)external\websockets\include\$(COCOS2D_PLATFORM);$(EngineRoot)cocos\platform\wp8;$(EngineRoot)cocos\platform\winrt;$(EngineRoot)cocos\platform;$(EngineRoot)cocos\editor-support;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\sqlite3\include;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos;$(EngineRoot)extensions;$(EngineRoot)external;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\unzip;$(EngineRoot)external\tinyxml2;$(EngineRoot);$(EngineRoot)external\ConvertUTF;$(EngineRoot)external\xxhash;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
</ClCompile>
|
||||
<ClCompile>
|
||||
<PreprocessorDefinitions>WP8;_VARIADIC_MAX=10;NOMINMAX;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<CompileAsWinRT>true</CompileAsWinRT>
|
||||
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
||||
<MinimalRebuild>false</MinimalRebuild>
|
||||
<DebugInformationFormat>OldStyle</DebugInformationFormat>
|
||||
<DisableSpecificWarnings>4056;4244;4251;4756;4453;28204;</DisableSpecificWarnings>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<AdditionalDependencies>libGLESv2_phone.lib;libEGL_phone.lib;ws2_32.lib;libwebsockets.lib;libcurl.lib;libchipmunk.lib;zlib.lib;libpng.lib;libjpeg.lib;libtiff.lib;freetype.lib;sqlite3.lib;d3d11.lib;dxgi.lib;dxguid.lib;xaudio2.lib;mfplat.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalLibraryDirectories>$(EngineRoot)external\$(COCOS2D_PLATFORM)-specific\angle\prebuilt\$(Platform);$(EngineRoot)cocos\platform\wp8;$(EngineRoot)external\curl\prebuilt\$(COCOS2D_PLATFORM)\$(Platform);$(EngineRoot)external\websockets\prebuilt\$(COCOS2D_PLATFORM)\$(Platform);$(EngineRoot)external\chipmunk\prebuilt\$(COCOS2D_PLATFORM)\$(Platform);$(EngineRoot)external\$(COCOS2D_PLATFORM)-specific\zlib\prebuilt\$(Platform);$(EngineRoot)external\png\prebuilt\$(COCOS2D_PLATFORM)\$(Platform);$(EngineRoot)external\tiff\prebuilt\$(COCOS2D_PLATFORM)\$(Platform);$(EngineRoot)external\jpeg\prebuilt\$(COCOS2D_PLATFORM)\$(Platform);$(EngineRoot)external\sqlite3\libraries\$(COCOS2D_PLATFORM)\$(Platform);$(EngineRoot)external\freetype2\prebuilt\$(COCOS2D_PLATFORM)\$(Platform);%(AdditionalLibraryDirectories);</AdditionalLibraryDirectories>
|
||||
<AdditionalOptions>/IGNORE:4264 %(AdditionalOptions)</AdditionalOptions>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemGroup>
|
||||
<BuildMacro Include="EngineRoot">
|
||||
<Value>$(EngineRoot)</Value>
|
||||
<EnvironmentVariable>true</EnvironmentVariable>
|
||||
</BuildMacro>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<ImportGroup Label="PropertySheets" />
|
||||
<PropertyGroup Label="APP_DLLS">
|
||||
<AngleBinPath Condition=" '$(AngleBinPath)' == '' ">$(EngineRoot)external\$(COCOS2D_PLATFORM)-specific\angle\prebuilt\$(Platform)\</AngleBinPath>
|
||||
<CurlBinPath Condition=" '$(CurlBinPath)' == '' ">$(EngineRoot)external\curl\prebuilt\$(COCOS2D_PLATFORM)\$(Platform)\</CurlBinPath>
|
||||
<WebsocketsBinPath Condition=" '$(WebsocketsBinPath)' == '' ">$(EngineRoot)external\websockets\prebuilt\$(COCOS2D_PLATFORM)\$(Platform)\</WebsocketsBinPath>
|
||||
<SQLiteBinPath Condition=" '$(SQLiteBinPath)' == '' ">$(EngineRoot)external\sqlite3\libraries\$(COCOS2D_PLATFORM)\$(Platform)\</SQLiteBinPath>
|
||||
<CurlBinPath Condition=" '$(CurlBinPath)' == '' ">$(EngineRoot)external\curl\prebuilt\$(COCOS2D_PLATFORM)\$(Platform)\</CurlBinPath>
|
||||
</PropertyGroup>
|
||||
<ItemGroup Label="ANGLE">
|
||||
<None Include="$(AngleBinPath)libEGL_phone.dll">
|
||||
<DeploymentContent>true</DeploymentContent>
|
||||
</None>
|
||||
<None Include="$(AngleBinPath)libGLESv2_phone.dll">
|
||||
<DeploymentContent>true</DeploymentContent>
|
||||
</None>
|
||||
<None Include="$(WebsocketsBinPath)libwebsockets.dll">
|
||||
<DeploymentContent>true</DeploymentContent>
|
||||
</None>
|
||||
<None Include="$(SQLiteBinPath)sqlite3.dll">
|
||||
<DeploymentContent>true</DeploymentContent>
|
||||
</None>
|
||||
<None Include="$(CurlBinPath)libcurl.dll">
|
||||
<DeploymentContent>true</DeploymentContent>
|
||||
</None>
|
||||
<None Include="$(CurlBinPath)libeay32.dll">
|
||||
<DeploymentContent>true</DeploymentContent>
|
||||
</None>
|
||||
<None Include="$(CurlBinPath)ssleay32.dll">
|
||||
<DeploymentContent>true</DeploymentContent>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<ImportGroup Label="PropertySheets" />
|
||||
<ItemDefinitionGroup>
|
||||
<ClCompile>
|
||||
<PreprocessorDefinitions>_WINRT_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
</ClCompile>
|
||||
</ItemDefinitionGroup>
|
||||
</Project>
|
||||
|
|
@ -297,19 +297,19 @@ void Terrain::setChunksLOD(Vec3 cameraPos)
|
|||
|
||||
float Terrain::getHeight(float x, float z, Vec3 * normal)
|
||||
{
|
||||
Vec2 pos = Vec2(x,z);
|
||||
Vec2 pos(x,z);
|
||||
|
||||
//top-left
|
||||
Vec2 tl = Vec2(-1*_terrainData._mapScale*_imageWidth/2,-1*_terrainData._mapScale*_imageHeight/2);
|
||||
Vec2 tl(-1*_terrainData._mapScale*_imageWidth/2,-1*_terrainData._mapScale*_imageHeight/2);
|
||||
auto result = getNodeToWorldTransform()*Vec4(tl.x,0.0f,tl.y,1.0f);
|
||||
tl = Vec2(result.x,result.z);
|
||||
tl.set(result.x, result.z);
|
||||
|
||||
Vec2 to_tl = pos - tl;
|
||||
|
||||
//real size
|
||||
Vec2 size = Vec2(_imageWidth*_terrainData._mapScale,_imageHeight*_terrainData._mapScale);
|
||||
Vec2 size(_imageWidth*_terrainData._mapScale,_imageHeight*_terrainData._mapScale);
|
||||
result = getNodeToWorldTransform()*Vec4(size.x,0.0f,size.y,0.0f);
|
||||
size = Vec2(result.x,result.z);
|
||||
size.set(result.x, result.z);
|
||||
|
||||
float width_ratio = to_tl.x/size.x;
|
||||
float height_ratio = to_tl.y/size.y;
|
||||
|
|
@ -543,19 +543,19 @@ void Terrain::setMaxDetailMapAmount(int max_value)
|
|||
|
||||
cocos2d::Vec2 Terrain::convertToTerrainSpace(Vec2 worldSpaceXZ)
|
||||
{
|
||||
Vec2 pos = Vec2(worldSpaceXZ.x,worldSpaceXZ.y);
|
||||
Vec2 pos(worldSpaceXZ.x,worldSpaceXZ.y);
|
||||
|
||||
//top-left
|
||||
Vec2 tl = Vec2(-1*_terrainData._mapScale*_imageWidth/2,-1*_terrainData._mapScale*_imageHeight/2);
|
||||
Vec2 tl(-1*_terrainData._mapScale*_imageWidth/2,-1*_terrainData._mapScale*_imageHeight/2);
|
||||
auto result = getNodeToWorldTransform()*Vec4(tl.x,0.0f,tl.y,1.0f);
|
||||
tl = Vec2(result.x,result.z);
|
||||
tl.set(result.x, result.z);
|
||||
|
||||
Vec2 to_tl = pos - tl;
|
||||
|
||||
//real size
|
||||
Vec2 size = Vec2(_imageWidth*_terrainData._mapScale,_imageHeight*_terrainData._mapScale);
|
||||
Vec2 size(_imageWidth*_terrainData._mapScale,_imageHeight*_terrainData._mapScale);
|
||||
result = getNodeToWorldTransform()*Vec4(size.x,0.0f,size.y,0.0f);
|
||||
size = Vec2(result.x,result.z);
|
||||
size.set(result.x, result.z);
|
||||
|
||||
float width_ratio = to_tl.x/size.x;
|
||||
float height_ratio = to_tl.y/size.y;
|
||||
|
|
@ -1206,8 +1206,8 @@ void Terrain::Chunk::calculateSlope()
|
|||
highest = _originalVertices[i]._position;
|
||||
}
|
||||
}
|
||||
auto a = Vec2(lowest.x,lowest.z);
|
||||
auto b = Vec2(highest.x,highest.z);
|
||||
Vec2 a(lowest.x,lowest.z);
|
||||
Vec2 b(highest.x,highest.z);
|
||||
float dist = a.distance(b);
|
||||
_slope = (highest.y - lowest.y)/dist;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,611 +0,0 @@
|
|||
/*
|
||||
* cocos2d-x http://www.cocos2d-x.org
|
||||
*
|
||||
* Copyright (c) 2010-2011 - cocos2d-x community
|
||||
*
|
||||
* Portions Copyright (c) Microsoft Open Technologies, Inc.
|
||||
* All Rights Reserved
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
|
||||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and limitations under the License.
|
||||
*/
|
||||
|
||||
#include "Audio.h"
|
||||
#include "MediaStreamer.h"
|
||||
//#include "CCCommon.h"
|
||||
|
||||
inline void ThrowIfFailed(HRESULT hr)
|
||||
{
|
||||
if (FAILED(hr))
|
||||
{
|
||||
// Set a breakpoint on this line to catch DX API errors.
|
||||
throw Platform::Exception::CreateException(hr);
|
||||
}
|
||||
}
|
||||
|
||||
void AudioEngineCallbacks::Initialize(Audio *audio)
|
||||
{
|
||||
m_audio = audio;
|
||||
}
|
||||
|
||||
// Called in the event of a critical system error which requires XAudio2
|
||||
// to be closed down and restarted. The error code is given in error.
|
||||
void _stdcall AudioEngineCallbacks::OnCriticalError(HRESULT Error)
|
||||
{
|
||||
UNUSED_PARAM(Error);
|
||||
m_audio->SetEngineExperiencedCriticalError();
|
||||
};
|
||||
|
||||
Audio::Audio() :
|
||||
m_backgroundID(0),
|
||||
m_soundEffctVolume(1.0f),
|
||||
m_backgroundMusicVolume(1.0f)
|
||||
{
|
||||
}
|
||||
|
||||
void Audio::Initialize()
|
||||
{
|
||||
m_engineExperiencedCriticalError = false;
|
||||
|
||||
m_musicEngine = nullptr;
|
||||
m_soundEffectEngine = nullptr;
|
||||
m_musicMasteringVoice = nullptr;
|
||||
m_soundEffectMasteringVoice = nullptr;
|
||||
}
|
||||
|
||||
void Audio::CreateResources()
|
||||
{
|
||||
try
|
||||
{
|
||||
ThrowIfFailed(
|
||||
XAudio2Create(&m_musicEngine)
|
||||
);
|
||||
|
||||
#if defined(_DEBUG)
|
||||
XAUDIO2_DEBUG_CONFIGURATION debugConfig = {0};
|
||||
debugConfig.BreakMask = XAUDIO2_LOG_ERRORS;
|
||||
debugConfig.TraceMask = XAUDIO2_LOG_ERRORS;
|
||||
m_musicEngine->SetDebugConfiguration(&debugConfig);
|
||||
#endif
|
||||
|
||||
m_musicEngineCallback.Initialize(this);
|
||||
m_musicEngine->RegisterForCallbacks(&m_musicEngineCallback);
|
||||
|
||||
// This sample plays the equivalent of background music, which we tag on the mastering voice as AudioCategory_GameMedia.
|
||||
// In ordinary usage, if we were playing the music track with no effects, we could route it entirely through
|
||||
// Media Foundation. Here we are using XAudio2 to apply a reverb effect to the music, so we use Media Foundation to
|
||||
// decode the data then we feed it through the XAudio2 pipeline as a separate Mastering Voice, so that we can tag it
|
||||
// as Game Media.
|
||||
// We default the mastering voice to 2 channels to simplify the reverb logic.
|
||||
ThrowIfFailed(
|
||||
m_musicEngine->CreateMasteringVoice(&m_musicMasteringVoice, XAUDIO2_DEFAULT_CHANNELS, XAUDIO2_DEFAULT_SAMPLERATE, 0, nullptr, nullptr, AudioCategory_GameMedia)
|
||||
);
|
||||
|
||||
// Create a separate engine and mastering voice for sound effects in the sample
|
||||
// Games will use many voices in a complex graph for audio, mixing all effects down to a
|
||||
// single mastering voice.
|
||||
// We are creating an entirely new engine instance and mastering voice in order to tag
|
||||
// our sound effects with the audio category AudioCategory_GameEffects.
|
||||
ThrowIfFailed(
|
||||
XAudio2Create(&m_soundEffectEngine)
|
||||
);
|
||||
|
||||
m_soundEffectEngineCallback.Initialize(this);
|
||||
m_soundEffectEngine->RegisterForCallbacks(&m_soundEffectEngineCallback);
|
||||
|
||||
// We default the mastering voice to 2 channels to simplify the reverb logic.
|
||||
ThrowIfFailed(
|
||||
m_soundEffectEngine->CreateMasteringVoice(&m_soundEffectMasteringVoice, XAUDIO2_DEFAULT_CHANNELS, XAUDIO2_DEFAULT_SAMPLERATE, 0, nullptr, nullptr, AudioCategory_GameEffects)
|
||||
);
|
||||
}
|
||||
catch (...)
|
||||
{
|
||||
m_engineExperiencedCriticalError = true;
|
||||
}
|
||||
}
|
||||
|
||||
unsigned int Audio::Hash(const char *key)
|
||||
{
|
||||
unsigned int len = strlen(key);
|
||||
const char *end=key+len;
|
||||
unsigned int hash;
|
||||
|
||||
for (hash = 0; key < end; key++)
|
||||
{
|
||||
hash *= 16777619;
|
||||
hash ^= (unsigned int) (unsigned char) toupper(*key);
|
||||
}
|
||||
return (hash);
|
||||
}
|
||||
|
||||
void Audio::ReleaseResources()
|
||||
{
|
||||
if (m_musicMasteringVoice != nullptr)
|
||||
{
|
||||
m_musicMasteringVoice->DestroyVoice();
|
||||
m_musicMasteringVoice = nullptr;
|
||||
}
|
||||
if (m_soundEffectMasteringVoice != nullptr)
|
||||
{
|
||||
m_soundEffectMasteringVoice->DestroyVoice();
|
||||
m_soundEffectMasteringVoice = nullptr;
|
||||
}
|
||||
|
||||
EffectList::iterator EffectIter = m_soundEffects.begin();
|
||||
for (; EffectIter != m_soundEffects.end(); EffectIter++)
|
||||
{
|
||||
if (EffectIter->second.m_soundEffectSourceVoice != nullptr)
|
||||
{
|
||||
EffectIter->second.m_soundEffectSourceVoice->DestroyVoice();
|
||||
EffectIter->second.m_soundEffectSourceVoice = nullptr;
|
||||
}
|
||||
}
|
||||
m_soundEffects.clear();
|
||||
|
||||
m_musicEngine = nullptr;
|
||||
m_soundEffectEngine = nullptr;
|
||||
}
|
||||
|
||||
void Audio::Start()
|
||||
{
|
||||
if (m_engineExperiencedCriticalError)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
if (! m_backgroundFile.empty())
|
||||
PlayBackgroundMusic(m_backgroundFile.c_str(), m_backgroundLoop);
|
||||
}
|
||||
|
||||
// This sample processes audio buffers during the render cycle of the application.
|
||||
// As long as the sample maintains a high-enough frame rate, this approach should
|
||||
// not glitch audio. In game code, it is best for audio buffers to be processed
|
||||
// on a separate thread that is not synced to the main render loop of the game.
|
||||
void Audio::Render()
|
||||
{
|
||||
if (m_engineExperiencedCriticalError)
|
||||
{
|
||||
ReleaseResources();
|
||||
Initialize();
|
||||
CreateResources();
|
||||
Start();
|
||||
if (m_engineExperiencedCriticalError)
|
||||
{
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void Audio::PlayBackgroundMusic(const char* pszFilePath, bool bLoop)
|
||||
{
|
||||
m_backgroundFile = pszFilePath;
|
||||
m_backgroundLoop = bLoop;
|
||||
|
||||
if (m_engineExperiencedCriticalError) {
|
||||
return;
|
||||
}
|
||||
|
||||
StopBackgroundMusic(true);
|
||||
PlaySoundEffect(pszFilePath, bLoop, m_backgroundID, true);
|
||||
}
|
||||
|
||||
void Audio::StopBackgroundMusic(bool bReleaseData)
|
||||
{
|
||||
if (m_engineExperiencedCriticalError) {
|
||||
return;
|
||||
}
|
||||
|
||||
StopSoundEffect(m_backgroundID);
|
||||
|
||||
if (bReleaseData){
|
||||
UnloadSoundEffect(m_backgroundID);
|
||||
RemoveFromList(m_backgroundID);
|
||||
}
|
||||
}
|
||||
|
||||
void Audio::PauseBackgroundMusic()
|
||||
{
|
||||
if (m_engineExperiencedCriticalError) {
|
||||
return;
|
||||
}
|
||||
|
||||
PauseSoundEffect(m_backgroundID);
|
||||
}
|
||||
|
||||
void Audio::ResumeBackgroundMusic()
|
||||
{
|
||||
if (m_engineExperiencedCriticalError) {
|
||||
return;
|
||||
}
|
||||
|
||||
ResumeSoundEffect(m_backgroundID);
|
||||
}
|
||||
|
||||
void Audio::RewindBackgroundMusic()
|
||||
{
|
||||
if (m_engineExperiencedCriticalError) {
|
||||
return;
|
||||
}
|
||||
|
||||
RewindSoundEffect(m_backgroundID);
|
||||
}
|
||||
|
||||
bool Audio::IsBackgroundMusicPlaying()
|
||||
{
|
||||
return IsSoundEffectStarted(m_backgroundID);
|
||||
}
|
||||
|
||||
void Audio::SetBackgroundVolume(float volume)
|
||||
{
|
||||
m_backgroundMusicVolume = volume;
|
||||
|
||||
if (m_engineExperiencedCriticalError) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (m_soundEffects.end() != m_soundEffects.find(m_backgroundID))
|
||||
{
|
||||
m_soundEffects[m_backgroundID].m_soundEffectSourceVoice->SetVolume(volume);
|
||||
}
|
||||
}
|
||||
|
||||
float Audio::GetBackgroundVolume()
|
||||
{
|
||||
return m_backgroundMusicVolume;
|
||||
}
|
||||
|
||||
void Audio::SetSoundEffectVolume(float volume)
|
||||
{
|
||||
m_soundEffctVolume = volume;
|
||||
|
||||
if (m_engineExperiencedCriticalError) {
|
||||
return;
|
||||
}
|
||||
|
||||
EffectList::iterator iter;
|
||||
for (iter = m_soundEffects.begin(); iter != m_soundEffects.end(); iter++)
|
||||
{
|
||||
if (iter->first != m_backgroundID)
|
||||
iter->second.m_soundEffectSourceVoice->SetVolume(m_soundEffctVolume);
|
||||
}
|
||||
}
|
||||
|
||||
float Audio::GetSoundEffectVolume()
|
||||
{
|
||||
return m_soundEffctVolume;
|
||||
}
|
||||
|
||||
void Audio::PlaySoundEffect(const char* pszFilePath, bool bLoop, unsigned int& sound, bool isMusic)
|
||||
{
|
||||
sound = Hash(pszFilePath);
|
||||
|
||||
if (m_soundEffects.end() == m_soundEffects.find(sound))
|
||||
{
|
||||
PreloadSoundEffect(pszFilePath, isMusic);
|
||||
}
|
||||
|
||||
if (m_soundEffects.end() == m_soundEffects.find(sound))
|
||||
return;
|
||||
|
||||
m_soundEffects[sound].m_audioBuffer.LoopCount = bLoop ? XAUDIO2_LOOP_INFINITE : 0;
|
||||
|
||||
PlaySoundEffect(sound);
|
||||
}
|
||||
|
||||
void Audio::PlaySoundEffect(unsigned int sound)
|
||||
{
|
||||
if (m_engineExperiencedCriticalError) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (m_soundEffects.end() == m_soundEffects.find(sound))
|
||||
return;
|
||||
|
||||
StopSoundEffect(sound);
|
||||
|
||||
ThrowIfFailed(
|
||||
m_soundEffects[sound].m_soundEffectSourceVoice->SubmitSourceBuffer(&m_soundEffects[sound].m_audioBuffer)
|
||||
);
|
||||
|
||||
if (m_engineExperiencedCriticalError) {
|
||||
// If there's an error, then we'll recreate the engine on the next render pass
|
||||
return;
|
||||
}
|
||||
|
||||
SoundEffectData* soundEffect = &m_soundEffects[sound];
|
||||
HRESULT hr = soundEffect->m_soundEffectSourceVoice->Start();
|
||||
if FAILED(hr)
|
||||
{
|
||||
m_engineExperiencedCriticalError = true;
|
||||
return;
|
||||
}
|
||||
|
||||
m_soundEffects[sound].m_soundEffectStarted = true;
|
||||
}
|
||||
|
||||
void Audio::StopSoundEffect(unsigned int sound)
|
||||
{
|
||||
if (m_engineExperiencedCriticalError) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (m_soundEffects.end() == m_soundEffects.find(sound))
|
||||
return;
|
||||
|
||||
HRESULT hr = m_soundEffects[sound].m_soundEffectSourceVoice->Stop();
|
||||
HRESULT hr1 = m_soundEffects[sound].m_soundEffectSourceVoice->FlushSourceBuffers();
|
||||
if (FAILED(hr) || FAILED(hr1))
|
||||
{
|
||||
// If there's an error, then we'll recreate the engine on the next render pass
|
||||
m_engineExperiencedCriticalError = true;
|
||||
return;
|
||||
}
|
||||
|
||||
m_soundEffects[sound].m_soundEffectStarted = false;
|
||||
}
|
||||
|
||||
void Audio::PauseSoundEffect(unsigned int sound)
|
||||
{
|
||||
if (m_engineExperiencedCriticalError) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (m_soundEffects.end() == m_soundEffects.find(sound))
|
||||
return;
|
||||
|
||||
HRESULT hr = m_soundEffects[sound].m_soundEffectSourceVoice->Stop();
|
||||
if FAILED(hr)
|
||||
{
|
||||
// If there's an error, then we'll recreate the engine on the next render pass
|
||||
m_engineExperiencedCriticalError = true;
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
void Audio::ResumeSoundEffect(unsigned int sound)
|
||||
{
|
||||
if (m_engineExperiencedCriticalError) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (m_soundEffects.end() == m_soundEffects.find(sound))
|
||||
return;
|
||||
|
||||
HRESULT hr = m_soundEffects[sound].m_soundEffectSourceVoice->Start();
|
||||
if FAILED(hr)
|
||||
{
|
||||
// If there's an error, then we'll recreate the engine on the next render pass
|
||||
m_engineExperiencedCriticalError = true;
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
void Audio::RewindSoundEffect(unsigned int sound)
|
||||
{
|
||||
if (m_engineExperiencedCriticalError) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (m_soundEffects.end() == m_soundEffects.find(sound))
|
||||
return;
|
||||
|
||||
StopSoundEffect(sound);
|
||||
PlaySoundEffect(sound);
|
||||
}
|
||||
|
||||
void Audio::PauseAllSoundEffects()
|
||||
{
|
||||
if (m_engineExperiencedCriticalError) {
|
||||
return;
|
||||
}
|
||||
|
||||
EffectList::iterator iter;
|
||||
for (iter = m_soundEffects.begin(); iter != m_soundEffects.end(); iter++)
|
||||
{
|
||||
if (iter->first != m_backgroundID)
|
||||
PauseSoundEffect(iter->first);
|
||||
}
|
||||
}
|
||||
|
||||
void Audio::ResumeAllSoundEffects()
|
||||
{
|
||||
if (m_engineExperiencedCriticalError) {
|
||||
return;
|
||||
}
|
||||
|
||||
EffectList::iterator iter;
|
||||
for (iter = m_soundEffects.begin(); iter != m_soundEffects.end(); iter++)
|
||||
{
|
||||
if (iter->first != m_backgroundID)
|
||||
ResumeSoundEffect(iter->first);
|
||||
}
|
||||
}
|
||||
|
||||
void Audio::StopAllSoundEffects(bool bReleaseData)
|
||||
{
|
||||
if (m_engineExperiencedCriticalError) {
|
||||
return;
|
||||
}
|
||||
|
||||
EffectList::iterator iter;
|
||||
for (iter = m_soundEffects.begin(); iter != m_soundEffects.end(); iter++)
|
||||
{
|
||||
if (iter->first != m_backgroundID){
|
||||
StopSoundEffect(iter->first);
|
||||
if (bReleaseData)
|
||||
{
|
||||
UnloadSoundEffect(iter->first);
|
||||
}
|
||||
}
|
||||
}
|
||||
if (bReleaseData)
|
||||
{
|
||||
for (iter = m_soundEffects.begin(); iter != m_soundEffects.end();)
|
||||
{
|
||||
if (iter->first != m_backgroundID){
|
||||
m_soundEffects.erase(iter++);
|
||||
}
|
||||
else
|
||||
{
|
||||
iter++;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
bool Audio::IsSoundEffectStarted(unsigned int sound)
|
||||
{
|
||||
if (m_soundEffects.end() == m_soundEffects.find(sound))
|
||||
return false;
|
||||
|
||||
return m_soundEffects[sound].m_soundEffectStarted;
|
||||
}
|
||||
|
||||
std::wstring CCUtf8ToUnicode(const char * pszUtf8Str)
|
||||
{
|
||||
std::wstring ret;
|
||||
do
|
||||
{
|
||||
if (! pszUtf8Str) break;
|
||||
size_t len = strlen(pszUtf8Str);
|
||||
if (len <= 0) break;
|
||||
++len;
|
||||
wchar_t * pwszStr = new wchar_t[len];
|
||||
if (! pwszStr) break;
|
||||
pwszStr[len - 1] = 0;
|
||||
MultiByteToWideChar(CP_UTF8, 0, pszUtf8Str, len, pwszStr, len);
|
||||
ret = pwszStr;
|
||||
|
||||
if(pwszStr) {
|
||||
delete[] (pwszStr);
|
||||
(pwszStr) = 0;
|
||||
}
|
||||
|
||||
|
||||
} while (0);
|
||||
return ret;
|
||||
}
|
||||
|
||||
std::string CCUnicodeToUtf8(const wchar_t* pwszStr)
|
||||
{
|
||||
std::string ret;
|
||||
do
|
||||
{
|
||||
if(! pwszStr) break;
|
||||
size_t len = wcslen(pwszStr);
|
||||
if (len <= 0) break;
|
||||
|
||||
char * pszUtf8Str = new char[len*3 + 1];
|
||||
WideCharToMultiByte(CP_UTF8, 0, pwszStr, len+1, pszUtf8Str, len*3 + 1, 0, 0);
|
||||
ret = pszUtf8Str;
|
||||
|
||||
if(pszUtf8Str) {
|
||||
delete[] (pszUtf8Str);
|
||||
(pszUtf8Str) = 0;
|
||||
}
|
||||
}while(0);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
void Audio::PreloadSoundEffect(const char* pszFilePath, bool isMusic)
|
||||
{
|
||||
if (m_engineExperiencedCriticalError) {
|
||||
return;
|
||||
}
|
||||
|
||||
int sound = Hash(pszFilePath);
|
||||
|
||||
MediaStreamer mediaStreamer;
|
||||
mediaStreamer.Initialize(CCUtf8ToUnicode(pszFilePath).c_str());
|
||||
m_soundEffects[sound].m_soundID = sound;
|
||||
|
||||
uint32 bufferLength = mediaStreamer.GetMaxStreamLengthInBytes();
|
||||
m_soundEffects[sound].m_soundEffectBufferData = new byte[bufferLength];
|
||||
mediaStreamer.ReadAll(m_soundEffects[sound].m_soundEffectBufferData, bufferLength, &m_soundEffects[sound].m_soundEffectBufferLength);
|
||||
|
||||
if (isMusic)
|
||||
{
|
||||
XAUDIO2_SEND_DESCRIPTOR descriptors[1];
|
||||
descriptors[0].pOutputVoice = m_musicMasteringVoice;
|
||||
descriptors[0].Flags = 0;
|
||||
XAUDIO2_VOICE_SENDS sends = {0};
|
||||
sends.SendCount = 1;
|
||||
sends.pSends = descriptors;
|
||||
|
||||
ThrowIfFailed(
|
||||
m_musicEngine->CreateSourceVoice(&m_soundEffects[sound].m_soundEffectSourceVoice,
|
||||
&(mediaStreamer.GetOutputWaveFormatEx()), 0, 1.0f, &m_voiceContext, &sends)
|
||||
);
|
||||
//fix bug: set a initial volume
|
||||
m_soundEffects[sound].m_soundEffectSourceVoice->SetVolume(m_backgroundMusicVolume);
|
||||
} else
|
||||
{
|
||||
XAUDIO2_SEND_DESCRIPTOR descriptors[1];
|
||||
descriptors[0].pOutputVoice = m_soundEffectMasteringVoice;
|
||||
descriptors[0].Flags = 0;
|
||||
XAUDIO2_VOICE_SENDS sends = {0};
|
||||
sends.SendCount = 1;
|
||||
sends.pSends = descriptors;
|
||||
|
||||
ThrowIfFailed(
|
||||
m_soundEffectEngine->CreateSourceVoice(&m_soundEffects[sound].m_soundEffectSourceVoice,
|
||||
&(mediaStreamer.GetOutputWaveFormatEx()), 0, 1.0f, &m_voiceContext, &sends, nullptr)
|
||||
);
|
||||
//fix bug: set a initial volume
|
||||
m_soundEffects[sound].m_soundEffectSourceVoice->SetVolume(m_soundEffctVolume);
|
||||
}
|
||||
|
||||
m_soundEffects[sound].m_soundEffectSampleRate = mediaStreamer.GetOutputWaveFormatEx().nSamplesPerSec;
|
||||
|
||||
// Queue in-memory buffer for playback
|
||||
ZeroMemory(&m_soundEffects[sound].m_audioBuffer, sizeof(m_soundEffects[sound].m_audioBuffer));
|
||||
|
||||
m_soundEffects[sound].m_audioBuffer.AudioBytes = m_soundEffects[sound].m_soundEffectBufferLength;
|
||||
m_soundEffects[sound].m_audioBuffer.pAudioData = m_soundEffects[sound].m_soundEffectBufferData;
|
||||
m_soundEffects[sound].m_audioBuffer.pContext = &m_soundEffects[sound];
|
||||
m_soundEffects[sound].m_audioBuffer.Flags = XAUDIO2_END_OF_STREAM;
|
||||
m_soundEffects[sound].m_audioBuffer.LoopCount = 0;
|
||||
}
|
||||
|
||||
void Audio::UnloadSoundEffect(const char* pszFilePath)
|
||||
{
|
||||
int sound = Hash(pszFilePath);
|
||||
|
||||
UnloadSoundEffect(sound);
|
||||
|
||||
RemoveFromList(sound);
|
||||
}
|
||||
|
||||
void Audio::UnloadSoundEffect(unsigned int sound)
|
||||
{
|
||||
if (m_engineExperiencedCriticalError) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (m_soundEffects.end() == m_soundEffects.find(sound))
|
||||
return;
|
||||
|
||||
m_soundEffects[sound].m_soundEffectSourceVoice->DestroyVoice();
|
||||
|
||||
if(m_soundEffects[sound].m_soundEffectBufferData)
|
||||
delete [] m_soundEffects[sound].m_soundEffectBufferData;
|
||||
|
||||
m_soundEffects[sound].m_soundEffectBufferData = nullptr;
|
||||
m_soundEffects[sound].m_soundEffectSourceVoice = nullptr;
|
||||
m_soundEffects[sound].m_soundEffectStarted = false;
|
||||
ZeroMemory(&m_soundEffects[sound].m_audioBuffer, sizeof(m_soundEffects[sound].m_audioBuffer));
|
||||
}
|
||||
|
||||
void Audio::RemoveFromList( unsigned int sound )
|
||||
{
|
||||
m_soundEffects.erase(sound);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -1,167 +0,0 @@
|
|||
//// THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF
|
||||
//// ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO
|
||||
//// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A
|
||||
//// PARTICULAR PURPOSE.
|
||||
////
|
||||
//// Copyright (c) Microsoft Corporation. All rights reserved
|
||||
|
||||
// For licensing information relating to this distribution please see Third Party Notices file.
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <wrl.h>
|
||||
#include <d3d11_1.h>
|
||||
#include <agile.h>
|
||||
#include <DirectXMath.h>
|
||||
#include <memory>
|
||||
|
||||
#define XAUDIO2_HELPER_FUNCTIONS 1
|
||||
#include <xaudio2.h>
|
||||
#include <map>
|
||||
|
||||
static const int STREAMING_BUFFER_SIZE = 65536;
|
||||
static const int MAX_BUFFER_COUNT = 3;
|
||||
|
||||
#define UNUSED_PARAM(unusedparam) (void)unusedparam
|
||||
|
||||
struct SoundEffectData
|
||||
{
|
||||
unsigned int m_soundID;
|
||||
IXAudio2SourceVoice* m_soundEffectSourceVoice;
|
||||
XAUDIO2_BUFFER m_audioBuffer;
|
||||
byte* m_soundEffectBufferData;
|
||||
uint32 m_soundEffectBufferLength;
|
||||
uint32 m_soundEffectSampleRate;
|
||||
bool m_soundEffectStarted;
|
||||
};
|
||||
|
||||
class Audio;
|
||||
class AudioEngineCallbacks: public IXAudio2EngineCallback
|
||||
{
|
||||
private:
|
||||
Audio *m_audio;
|
||||
|
||||
public :
|
||||
AudioEngineCallbacks(){};
|
||||
void Initialize(Audio* audio);
|
||||
|
||||
// Called by XAudio2 just before an audio processing pass begins.
|
||||
void _stdcall OnProcessingPassStart(){};
|
||||
|
||||
// Called just after an audio processing pass ends.
|
||||
void _stdcall OnProcessingPassEnd(){};
|
||||
|
||||
// Called in the event of a critical system error which requires XAudio2
|
||||
// to be closed down and restarted. The error code is given in Error.
|
||||
void _stdcall OnCriticalError(HRESULT Error);
|
||||
};
|
||||
|
||||
struct StreamingVoiceContext : public IXAudio2VoiceCallback
|
||||
{
|
||||
STDMETHOD_(void, OnVoiceProcessingPassStart)(UINT32){}
|
||||
STDMETHOD_(void, OnVoiceProcessingPassEnd)(){}
|
||||
STDMETHOD_(void, OnStreamEnd)(){}
|
||||
STDMETHOD_(void, OnBufferStart)(void*)
|
||||
{
|
||||
ResetEvent(hBufferEndEvent);
|
||||
}
|
||||
STDMETHOD_(void, OnBufferEnd)(void* pContext)
|
||||
{
|
||||
//Trigger the event for the music stream.
|
||||
if (pContext == 0) {
|
||||
SetEvent(hBufferEndEvent);
|
||||
}
|
||||
}
|
||||
STDMETHOD_(void, OnLoopEnd)(void*){}
|
||||
STDMETHOD_(void, OnVoiceError)(void*, HRESULT){}
|
||||
|
||||
HANDLE hBufferEndEvent;
|
||||
StreamingVoiceContext() : hBufferEndEvent(CreateEventEx(NULL, FALSE, FALSE, NULL))
|
||||
{
|
||||
}
|
||||
virtual ~StreamingVoiceContext()
|
||||
{
|
||||
CloseHandle(hBufferEndEvent);
|
||||
}
|
||||
};
|
||||
|
||||
class Audio
|
||||
{
|
||||
private:
|
||||
IXAudio2* m_musicEngine;
|
||||
IXAudio2* m_soundEffectEngine;
|
||||
IXAudio2MasteringVoice* m_musicMasteringVoice;
|
||||
IXAudio2MasteringVoice* m_soundEffectMasteringVoice;
|
||||
|
||||
StreamingVoiceContext m_voiceContext;
|
||||
|
||||
typedef std::map<unsigned int, SoundEffectData> EffectList;
|
||||
typedef std::pair<unsigned int, SoundEffectData> Effect;
|
||||
EffectList m_soundEffects;
|
||||
|
||||
unsigned int m_backgroundID;
|
||||
std::string m_backgroundFile;
|
||||
bool m_backgroundLoop;
|
||||
|
||||
float m_soundEffctVolume;
|
||||
float m_backgroundMusicVolume;
|
||||
|
||||
bool m_engineExperiencedCriticalError;
|
||||
AudioEngineCallbacks m_musicEngineCallback;
|
||||
AudioEngineCallbacks m_soundEffectEngineCallback;
|
||||
|
||||
unsigned int Hash(const char* key);
|
||||
|
||||
public:
|
||||
Audio();
|
||||
|
||||
void Initialize();
|
||||
void CreateResources();
|
||||
void ReleaseResources();
|
||||
void Start();
|
||||
void Render();
|
||||
|
||||
// This flag can be used to tell when the audio system is experiencing critial errors.
|
||||
// XAudio2 gives a critical error when the user unplugs their headphones, and a new
|
||||
// speaker configuration is generated.
|
||||
void SetEngineExperiencedCriticalError()
|
||||
{
|
||||
m_engineExperiencedCriticalError = true;
|
||||
}
|
||||
|
||||
bool HasEngineExperiencedCriticalError()
|
||||
{
|
||||
return m_engineExperiencedCriticalError;
|
||||
}
|
||||
|
||||
void PlayBackgroundMusic(const char* pszFilePath, bool bLoop);
|
||||
void StopBackgroundMusic(bool bReleaseData);
|
||||
void PauseBackgroundMusic();
|
||||
void ResumeBackgroundMusic();
|
||||
void RewindBackgroundMusic();
|
||||
bool IsBackgroundMusicPlaying();
|
||||
|
||||
void SetBackgroundVolume(float volume);
|
||||
float GetBackgroundVolume();
|
||||
void SetSoundEffectVolume(float volume);
|
||||
float GetSoundEffectVolume();
|
||||
|
||||
void PlaySoundEffect(const char* pszFilePath, bool bLoop, unsigned int& sound, bool isMusic = false);
|
||||
void PlaySoundEffect(unsigned int sound);
|
||||
bool IsSoundEffectStarted(unsigned int sound);
|
||||
void StopSoundEffect(unsigned int sound);
|
||||
void PauseSoundEffect(unsigned int sound);
|
||||
void ResumeSoundEffect(unsigned int sound);
|
||||
void RewindSoundEffect(unsigned int sound);
|
||||
|
||||
void PauseAllSoundEffects();
|
||||
void ResumeAllSoundEffects();
|
||||
void StopAllSoundEffects(bool bReleaseData);
|
||||
|
||||
void PreloadSoundEffect(const char* pszFilePath, bool isMusic = false);
|
||||
void UnloadSoundEffect(const char* pszFilePath);
|
||||
void UnloadSoundEffect(unsigned int sound);
|
||||
|
||||
private:
|
||||
void RemoveFromList(unsigned int sound);
|
||||
};
|
||||
|
|
@ -1,216 +0,0 @@
|
|||
/*
|
||||
* cocos2d-x http://www.cocos2d-x.org
|
||||
*
|
||||
* Copyright (c) 2010-2011 - cocos2d-x community
|
||||
*
|
||||
* Portions Copyright (c) Microsoft Open Technologies, Inc.
|
||||
* All Rights Reserved
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
|
||||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and limitations under the License.
|
||||
*/
|
||||
|
||||
#include "MediaStreamer.h"
|
||||
#include <wrl\wrappers\corewrappers.h>
|
||||
#include <ppltasks.h>
|
||||
|
||||
using namespace Microsoft::WRL;
|
||||
using namespace Windows::Storage;
|
||||
using namespace Windows::Storage::FileProperties;
|
||||
using namespace Windows::Storage::Streams;
|
||||
using namespace Windows::Foundation;
|
||||
using namespace Windows::ApplicationModel;
|
||||
using namespace Concurrency;
|
||||
|
||||
#ifndef MAKEFOURCC
|
||||
#define MAKEFOURCC(ch0, ch1, ch2, ch3) \
|
||||
((uint32)(byte)(ch0) | ((uint32)(byte)(ch1) << 8) | \
|
||||
((uint32)(byte)(ch2) << 16) | ((uint32)(byte)(ch3) << 24 ))
|
||||
#endif /* defined(MAKEFOURCC) */
|
||||
|
||||
inline void ThrowIfFailed(HRESULT hr)
|
||||
{
|
||||
if (FAILED(hr))
|
||||
{
|
||||
// Set a breakpoint on this line to catch DX API errors.
|
||||
throw Platform::Exception::CreateException(hr);
|
||||
}
|
||||
}
|
||||
|
||||
MediaStreamer::MediaStreamer() :
|
||||
m_offset(0)
|
||||
{
|
||||
ZeroMemory(&m_waveFormat, sizeof(m_waveFormat));
|
||||
m_location = Package::Current->InstalledLocation;
|
||||
m_locationPath = Platform::String::Concat(m_location->Path, "\\Assets\\Resources\\");
|
||||
}
|
||||
|
||||
MediaStreamer::~MediaStreamer()
|
||||
{
|
||||
}
|
||||
Platform::Array<byte>^ MediaStreamer::ReadData(
|
||||
_In_ Platform::String^ filename
|
||||
)
|
||||
{
|
||||
CREATEFILE2_EXTENDED_PARAMETERS extendedParams = {0};
|
||||
extendedParams.dwSize = sizeof(CREATEFILE2_EXTENDED_PARAMETERS);
|
||||
extendedParams.dwFileAttributes = FILE_ATTRIBUTE_NORMAL;
|
||||
extendedParams.dwFileFlags = FILE_FLAG_SEQUENTIAL_SCAN;
|
||||
extendedParams.dwSecurityQosFlags = SECURITY_ANONYMOUS;
|
||||
extendedParams.lpSecurityAttributes = nullptr;
|
||||
extendedParams.hTemplateFile = nullptr;
|
||||
|
||||
Wrappers::FileHandle file(
|
||||
CreateFile2(
|
||||
filename->Data(),
|
||||
GENERIC_READ,
|
||||
FILE_SHARE_READ,
|
||||
OPEN_EXISTING,
|
||||
&extendedParams
|
||||
)
|
||||
);
|
||||
if (file.Get()==INVALID_HANDLE_VALUE)
|
||||
{
|
||||
throw ref new Platform::FailureException();
|
||||
}
|
||||
|
||||
FILE_STANDARD_INFO fileInfo = {0};
|
||||
if (!GetFileInformationByHandleEx(
|
||||
file.Get(),
|
||||
FileStandardInfo,
|
||||
&fileInfo,
|
||||
sizeof(fileInfo)
|
||||
))
|
||||
{
|
||||
throw ref new Platform::FailureException();
|
||||
}
|
||||
|
||||
if (fileInfo.EndOfFile.HighPart != 0)
|
||||
{
|
||||
throw ref new Platform::OutOfMemoryException();
|
||||
}
|
||||
|
||||
Platform::Array<byte>^ fileData = ref new Platform::Array<byte>(fileInfo.EndOfFile.LowPart);
|
||||
|
||||
if (!ReadFile(
|
||||
file.Get(),
|
||||
fileData->Data,
|
||||
fileData->Length,
|
||||
nullptr,
|
||||
nullptr
|
||||
) )
|
||||
{
|
||||
throw ref new Platform::FailureException();
|
||||
}
|
||||
|
||||
return fileData;
|
||||
}
|
||||
|
||||
void MediaStreamer::Initialize(__in const WCHAR* url)
|
||||
{
|
||||
|
||||
WCHAR filePath[MAX_PATH] = {0};
|
||||
if ((wcslen(url) > 1 && url[1] == ':'))
|
||||
{
|
||||
// path start with "x:", is absolute path
|
||||
wcscat_s(filePath, url);
|
||||
}
|
||||
else if (wcslen(url) > 0
|
||||
&& (L'/' == url[0] || L'\\' == url[0]))
|
||||
{
|
||||
// path start with '/' or '\', is absolute path without driver name
|
||||
wcscat_s(filePath, m_locationPath->Data());
|
||||
// remove '/' or '\\'
|
||||
wcscat_s(filePath, (const WCHAR*)url[1]);
|
||||
}else
|
||||
{
|
||||
wcscat_s(filePath, m_locationPath->Data());
|
||||
wcscat_s(filePath, url);
|
||||
}
|
||||
|
||||
|
||||
Platform::Array<byte>^ data = ReadData(ref new Platform::String(filePath));
|
||||
UINT32 length = data->Length;
|
||||
const byte * dataPtr = data->Data;
|
||||
UINT32 offset = 0;
|
||||
|
||||
DWORD riffDataSize = 0;
|
||||
|
||||
auto ReadChunk = [&length, &offset, &dataPtr, &riffDataSize](DWORD fourcc, DWORD& outChunkSize, DWORD& outChunkPos) -> HRESULT
|
||||
{
|
||||
while (true)
|
||||
{
|
||||
if (offset + sizeof(DWORD) * 2 >= length)
|
||||
{
|
||||
return E_FAIL;
|
||||
}
|
||||
|
||||
// Read two DWORDs.
|
||||
DWORD chunkType = *reinterpret_cast<const DWORD *>(&dataPtr[offset]);
|
||||
DWORD chunkSize = *reinterpret_cast<const DWORD *>(&dataPtr[offset + sizeof(DWORD)]);
|
||||
offset += sizeof(DWORD) * 2;
|
||||
|
||||
if (chunkType == MAKEFOURCC('R', 'I', 'F', 'F'))
|
||||
{
|
||||
riffDataSize = chunkSize;
|
||||
chunkSize = sizeof(DWORD);
|
||||
outChunkSize = sizeof(DWORD);
|
||||
outChunkPos = offset;
|
||||
}
|
||||
else
|
||||
{
|
||||
outChunkSize = chunkSize;
|
||||
outChunkPos = offset;
|
||||
}
|
||||
|
||||
offset += chunkSize;
|
||||
|
||||
if (chunkType == fourcc)
|
||||
{
|
||||
return S_OK;
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
// Locate riff chunk, check the file type.
|
||||
DWORD chunkSize = 0;
|
||||
DWORD chunkPos = 0;
|
||||
|
||||
ThrowIfFailed(ReadChunk(MAKEFOURCC('R', 'I', 'F', 'F'), chunkSize, chunkPos));
|
||||
if (*reinterpret_cast<const DWORD *>(&dataPtr[chunkPos]) != MAKEFOURCC('W', 'A', 'V', 'E')) ThrowIfFailed(E_FAIL);
|
||||
|
||||
// Locate 'fmt ' chunk, copy to WAVEFORMATEXTENSIBLE.
|
||||
ThrowIfFailed(ReadChunk(MAKEFOURCC('f', 'm', 't', ' '), chunkSize, chunkPos));
|
||||
ThrowIfFailed((chunkSize <= sizeof(m_waveFormat)) ? S_OK : E_FAIL);
|
||||
CopyMemory(&m_waveFormat, &dataPtr[chunkPos], chunkSize);
|
||||
|
||||
// Locate the 'data' chunk and copy its contents to a buffer.
|
||||
ThrowIfFailed(ReadChunk(MAKEFOURCC('d', 'a', 't', 'a'), chunkSize, chunkPos));
|
||||
m_data.resize(chunkSize);
|
||||
CopyMemory(m_data.data(), &dataPtr[chunkPos], chunkSize);
|
||||
|
||||
m_offset = 0;
|
||||
}
|
||||
|
||||
void MediaStreamer::ReadAll(uint8* buffer, uint32 maxBufferSize, uint32* bufferLength)
|
||||
{
|
||||
UINT32 toCopy = m_data.size() - m_offset;
|
||||
if (toCopy > maxBufferSize) toCopy = maxBufferSize;
|
||||
|
||||
CopyMemory(buffer, m_data.data(), toCopy);
|
||||
*bufferLength = toCopy;
|
||||
|
||||
m_offset += toCopy;
|
||||
if (m_offset > m_data.size()) m_offset = m_data.size();
|
||||
}
|
||||
|
||||
void MediaStreamer::Restart()
|
||||
{
|
||||
m_offset = 0;
|
||||
}
|
||||
|
|
@ -1,58 +0,0 @@
|
|||
/*
|
||||
* cocos2d-x http://www.cocos2d-x.org
|
||||
*
|
||||
* Copyright (c) 2010-2011 - cocos2d-x community
|
||||
*
|
||||
* Portions Copyright (c) Microsoft Open Technologies, Inc.
|
||||
* All Rights Reserved
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
|
||||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and limitations under the License.
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
|
||||
#include <vector>
|
||||
#include <xaudio2.h>
|
||||
|
||||
ref class MediaStreamer
|
||||
{
|
||||
private:
|
||||
WAVEFORMATEX m_waveFormat;
|
||||
uint32 m_maxStreamLengthInBytes;
|
||||
std::vector<byte> m_data;
|
||||
UINT32 m_offset;
|
||||
Platform::Array<byte>^ ReadData(
|
||||
_In_ Platform::String^ filename
|
||||
);
|
||||
internal:
|
||||
Windows::Storage::StorageFolder^ m_location;
|
||||
Platform::String^ m_locationPath;
|
||||
|
||||
public:
|
||||
virtual ~MediaStreamer();
|
||||
|
||||
internal:
|
||||
MediaStreamer();
|
||||
|
||||
WAVEFORMATEX& GetOutputWaveFormatEx()
|
||||
{
|
||||
return m_waveFormat;
|
||||
}
|
||||
|
||||
UINT32 GetMaxStreamLengthInBytes()
|
||||
{
|
||||
return m_data.size();
|
||||
}
|
||||
|
||||
void Initialize(_In_ const WCHAR* url);
|
||||
void ReadAll(uint8* buffer, uint32 maxBufferSize, uint32* bufferLength);
|
||||
void Restart();
|
||||
};
|
||||
|
|
@ -1,198 +0,0 @@
|
|||
/*
|
||||
* cocos2d-x http://www.cocos2d-x.org
|
||||
*
|
||||
* Copyright (c) 2010-2011 - cocos2d-x community
|
||||
*
|
||||
* Portions Copyright (c) Microsoft Open Technologies, Inc.
|
||||
* All Rights Reserved
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
|
||||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and limitations under the License.
|
||||
*/
|
||||
|
||||
#include "SimpleAudioEngine.h"
|
||||
#include "Audio.h"
|
||||
|
||||
#include <map>
|
||||
//#include "CCCommon.h"
|
||||
using namespace std;
|
||||
|
||||
namespace CocosDenshion {
|
||||
|
||||
Audio* s_audioController = NULL;
|
||||
bool s_initialized = false;
|
||||
|
||||
SimpleAudioEngine* SimpleAudioEngine::getInstance()
|
||||
{
|
||||
static SimpleAudioEngine s_SharedEngine;
|
||||
return &s_SharedEngine;
|
||||
}
|
||||
|
||||
|
||||
static Audio* sharedAudioController()
|
||||
{
|
||||
if (! s_audioController || !s_initialized)
|
||||
{
|
||||
if(s_audioController == NULL)
|
||||
{
|
||||
s_audioController = new Audio;
|
||||
}
|
||||
s_audioController->Initialize();
|
||||
s_audioController->CreateResources();
|
||||
s_initialized = true;
|
||||
}
|
||||
|
||||
return s_audioController;
|
||||
}
|
||||
|
||||
SimpleAudioEngine::SimpleAudioEngine()
|
||||
{
|
||||
}
|
||||
|
||||
SimpleAudioEngine::~SimpleAudioEngine()
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
void SimpleAudioEngine::end()
|
||||
{
|
||||
sharedAudioController()->StopBackgroundMusic(true);
|
||||
sharedAudioController()->StopAllSoundEffects(true);
|
||||
sharedAudioController()->ReleaseResources();
|
||||
s_initialized = false;
|
||||
}
|
||||
|
||||
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
// BackgroundMusic
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
|
||||
void SimpleAudioEngine::playBackgroundMusic(const char* pszFilePath, bool bLoop)
|
||||
{
|
||||
if (! pszFilePath)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
sharedAudioController()->PlayBackgroundMusic(pszFilePath, bLoop);
|
||||
}
|
||||
|
||||
void SimpleAudioEngine::stopBackgroundMusic(bool bReleaseData)
|
||||
{
|
||||
sharedAudioController()->StopBackgroundMusic(bReleaseData);
|
||||
}
|
||||
|
||||
void SimpleAudioEngine::pauseBackgroundMusic()
|
||||
{
|
||||
sharedAudioController()->PauseBackgroundMusic();
|
||||
}
|
||||
|
||||
void SimpleAudioEngine::resumeBackgroundMusic()
|
||||
{
|
||||
sharedAudioController()->ResumeBackgroundMusic();
|
||||
}
|
||||
|
||||
void SimpleAudioEngine::rewindBackgroundMusic()
|
||||
{
|
||||
sharedAudioController()->RewindBackgroundMusic();
|
||||
}
|
||||
|
||||
bool SimpleAudioEngine::willPlayBackgroundMusic()
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
bool SimpleAudioEngine::isBackgroundMusicPlaying()
|
||||
{
|
||||
return sharedAudioController()->IsBackgroundMusicPlaying();
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
// effect function
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
|
||||
unsigned int SimpleAudioEngine::playEffect(const char* pszFilePath, bool bLoop,float pitch, float pan, float gain)
|
||||
{
|
||||
unsigned int sound;
|
||||
sharedAudioController()->PlaySoundEffect(pszFilePath, bLoop, sound);
|
||||
// TODO: need to support playEffect parameters
|
||||
return sound;
|
||||
}
|
||||
|
||||
void SimpleAudioEngine::stopEffect(unsigned int nSoundId)
|
||||
{
|
||||
sharedAudioController()->StopSoundEffect(nSoundId);
|
||||
}
|
||||
|
||||
void SimpleAudioEngine::preloadEffect(const char* pszFilePath)
|
||||
{
|
||||
sharedAudioController()->PreloadSoundEffect(pszFilePath);
|
||||
}
|
||||
|
||||
void SimpleAudioEngine::pauseEffect(unsigned int nSoundId)
|
||||
{
|
||||
sharedAudioController()->PauseSoundEffect(nSoundId);
|
||||
}
|
||||
|
||||
void SimpleAudioEngine::resumeEffect(unsigned int nSoundId)
|
||||
{
|
||||
sharedAudioController()->ResumeSoundEffect(nSoundId);
|
||||
}
|
||||
|
||||
void SimpleAudioEngine::pauseAllEffects()
|
||||
{
|
||||
sharedAudioController()->PauseAllSoundEffects();
|
||||
}
|
||||
|
||||
void SimpleAudioEngine::resumeAllEffects()
|
||||
{
|
||||
sharedAudioController()->ResumeAllSoundEffects();
|
||||
}
|
||||
|
||||
void SimpleAudioEngine::stopAllEffects()
|
||||
{
|
||||
sharedAudioController()->StopAllSoundEffects(false);
|
||||
}
|
||||
|
||||
void SimpleAudioEngine::preloadBackgroundMusic(const char* pszFilePath)
|
||||
{
|
||||
UNUSED_PARAM(pszFilePath);
|
||||
}
|
||||
|
||||
void SimpleAudioEngine::unloadEffect(const char* pszFilePath)
|
||||
{
|
||||
sharedAudioController()->UnloadSoundEffect(pszFilePath);
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
// volume interface
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
|
||||
float SimpleAudioEngine::getBackgroundMusicVolume()
|
||||
{
|
||||
return sharedAudioController()->GetBackgroundVolume();
|
||||
}
|
||||
|
||||
void SimpleAudioEngine::setBackgroundMusicVolume(float volume)
|
||||
{
|
||||
sharedAudioController()->SetBackgroundVolume((volume<=0.0f)? 0.0f : volume);
|
||||
}
|
||||
|
||||
float SimpleAudioEngine::getEffectsVolume()
|
||||
{
|
||||
return sharedAudioController()->GetSoundEffectVolume();
|
||||
}
|
||||
|
||||
void SimpleAudioEngine::setEffectsVolume(float volume)
|
||||
{
|
||||
sharedAudioController()->SetSoundEffectVolume((volume<=0.0f)? 0.0f : volume);
|
||||
}
|
||||
|
||||
} // end of namespace CocosDenshion
|
||||
|
|
@ -148,7 +148,7 @@ Rect RectFromString(const std::string& str)
|
|||
|
||||
Vec2 PointFromString(const std::string& str)
|
||||
{
|
||||
Vec2 ret = Vec2::ZERO;
|
||||
Vec2 ret;
|
||||
|
||||
do
|
||||
{
|
||||
|
|
@ -158,7 +158,7 @@ Vec2 PointFromString(const std::string& str)
|
|||
float x = (float) utils::atof(strs[0].c_str());
|
||||
float y = (float) utils::atof(strs[1].c_str());
|
||||
|
||||
ret = Vec2(x, y);
|
||||
ret.set(x, y);
|
||||
} while (0);
|
||||
|
||||
return ret;
|
||||
|
|
|
|||
|
|
@ -257,6 +257,12 @@ THE SOFTWARE.
|
|||
#define CC_USE_CULLING 1
|
||||
#endif
|
||||
|
||||
/** Support PNG or not. If your application don't use png format picture, you can undefine this macro to save package size.
|
||||
*/
|
||||
#ifndef CC_USE_PNG
|
||||
#define CC_USE_PNG 1
|
||||
#endif // CC_USE_PNG
|
||||
|
||||
/** Support JPEG or not. If your application don't use jpeg format picture, you can undefine this macro to save package size.
|
||||
*/
|
||||
#ifndef CC_USE_JPEG
|
||||
|
|
@ -277,6 +283,17 @@ THE SOFTWARE.
|
|||
#endif
|
||||
#endif // CC_USE_WEBP
|
||||
|
||||
/** Support WIC (Windows Image Component) or not. Replaces PNG, TIFF and JPEG
|
||||
*/
|
||||
#ifndef CC_USE_WIC
|
||||
#if (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT)
|
||||
#define CC_USE_WIC 1
|
||||
#undef CC_USE_TIFF
|
||||
#undef CC_USE_JPEG
|
||||
#undef CC_USE_PNG
|
||||
#endif
|
||||
#endif // CC_USE_WIC
|
||||
|
||||
/** Enable Script binding. */
|
||||
#ifndef CC_ENABLE_SCRIPT_BINDING
|
||||
#define CC_ENABLE_SCRIPT_BINDING 1
|
||||
|
|
|
|||
|
|
@ -556,7 +556,8 @@ enum class LabelEffect {
|
|||
NORMAL,
|
||||
OUTLINE,
|
||||
SHADOW,
|
||||
GLOW
|
||||
GLOW,
|
||||
ALL
|
||||
};
|
||||
|
||||
/** @struct Acceleration
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@
|
|||
|
||||
NS_CC_BEGIN
|
||||
|
||||
const Vec2 CCPointZero = Vec2::ZERO;
|
||||
const Vec2 CCPointZero;
|
||||
|
||||
/* The "zero" size -- equivalent to Size(0, 0). */
|
||||
const Size CCSizeZero = Size::ZERO;
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ namespace cocosbuilder {
|
|||
|
||||
CC_DLL Vec2 getAbsolutePosition(const Vec2 &pt, CCBReader::PositionType type, const Size &containerSize, const std::string& propName)
|
||||
{
|
||||
Vec2 absPt = Vec2(0,0);
|
||||
Vec2 absPt;
|
||||
if (type == CCBReader::PositionType::RELATIVE_BOTTOM_LEFT)
|
||||
{
|
||||
absPt = pt;
|
||||
|
|
|
|||
|
|
@ -199,22 +199,27 @@ void ActionTimeline::step(float delta)
|
|||
}
|
||||
|
||||
_time += delta * _timeSpeed;
|
||||
_currentFrame = (int)(_time / _frameInternal);
|
||||
|
||||
stepToFrame(_currentFrame);
|
||||
|
||||
if(_time > _endFrame * _frameInternal)
|
||||
|
||||
if(_time < _endFrame * _frameInternal)
|
||||
{
|
||||
_currentFrame = (int)(_time / _frameInternal);
|
||||
stepToFrame(_currentFrame);
|
||||
}
|
||||
else
|
||||
{
|
||||
if(_lastFrameListener != nullptr)
|
||||
_lastFrameListener();
|
||||
|
||||
|
||||
_playing = _loop;
|
||||
if(!_playing)
|
||||
{
|
||||
_time = _endFrame * _frameInternal;
|
||||
else
|
||||
_currentFrame = (int)(_time / _frameInternal);
|
||||
stepToFrame(_currentFrame);
|
||||
}
|
||||
else
|
||||
gotoFrameAndPlay(_startFrame, _endFrame, _loop);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
typedef std::function<void(Node*)> tCallBack;
|
||||
|
|
|
|||
|
|
@ -329,7 +329,7 @@ void Armature::updateOffsetPoint()
|
|||
// Set contentsize and Calculate anchor point.
|
||||
Rect rect = getBoundingBox();
|
||||
setContentSize(rect.size);
|
||||
_offsetPoint = Vec2(-rect.origin.x, -rect.origin.y);
|
||||
_offsetPoint.set(-rect.origin.x, -rect.origin.y);
|
||||
if (rect.size.width != 0 && rect.size.height != 0)
|
||||
{
|
||||
setAnchorPoint(Vec2(_offsetPoint.x / rect.size.width, _offsetPoint.y / rect.size.height));
|
||||
|
|
@ -341,8 +341,8 @@ void Armature::setAnchorPoint(const Vec2& point)
|
|||
if( ! point.equals(_anchorPoint))
|
||||
{
|
||||
_anchorPoint = point;
|
||||
_anchorPointInPoints = Vec2(_contentSize.width * _anchorPoint.x - _offsetPoint.x, _contentSize.height * _anchorPoint.y - _offsetPoint.y);
|
||||
_realAnchorPointInPoints = Vec2(_contentSize.width * _anchorPoint.x, _contentSize.height * _anchorPoint.y);
|
||||
_anchorPointInPoints.set(_contentSize.width * _anchorPoint.x - _offsetPoint.x, _contentSize.height * _anchorPoint.y - _offsetPoint.y);
|
||||
_realAnchorPointInPoints.set(_contentSize.width * _anchorPoint.x, _contentSize.height * _anchorPoint.y);
|
||||
_transformDirty = _inverseDirty = true;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -380,7 +380,7 @@ bool DisplayManager::containPoint(Vec2 &point)
|
|||
*
|
||||
*/
|
||||
|
||||
Vec2 outPoint = Vec2(0, 0);
|
||||
Vec2 outPoint;
|
||||
|
||||
Sprite *sprite = (Sprite *)_currentDecoDisplay->getDisplay();
|
||||
sprite = (Sprite *)sprite->getChildByTag(0);
|
||||
|
|
@ -398,7 +398,7 @@ bool DisplayManager::containPoint(Vec2 &point)
|
|||
|
||||
bool DisplayManager::containPoint(float x, float y)
|
||||
{
|
||||
Vec2 p = Vec2(x, y);
|
||||
Vec2 p(x, y);
|
||||
return containPoint(p);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ bool isSpriteContainPoint(Sprite *sprite, Vec2 point, Vec2 &outPoint)
|
|||
|
||||
bool isSpriteContainPoint(Sprite *sprite, Vec2 point)
|
||||
{
|
||||
Vec2 p = Vec2(0, 0);
|
||||
Vec2 p;
|
||||
return isSpriteContainPoint(sprite, point, p);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1173,7 +1173,7 @@ flatbuffers::Offset<flatbuffers::EasingData> FlatBuffersSerialize::createEasingD
|
|||
const tinyxml2::XMLElement* PointF = Points->FirstChildElement();
|
||||
while (PointF)
|
||||
{
|
||||
Vec2 pointF = Vec2::ZERO;
|
||||
Vec2 pointF;
|
||||
|
||||
attribute = PointF->FirstAttribute();
|
||||
|
||||
|
|
|
|||
|
|
@ -89,17 +89,17 @@ namespace cocostudio
|
|||
{
|
||||
std::string name = "";
|
||||
long actionTag = 0;
|
||||
Vec2 rotationSkew = Vec2::ZERO;
|
||||
Vec2 rotationSkew;
|
||||
int zOrder = 0;
|
||||
bool visible = true;
|
||||
GLubyte alpha = 255;
|
||||
int tag = 0;
|
||||
Vec2 position = Vec2::ZERO;
|
||||
Vec2 scale = Vec2(1.0f, 1.0f);
|
||||
Vec2 anchorPoint = Vec2::ZERO;
|
||||
Vec2 position;
|
||||
Vec2 scale(1.0f, 1.0f);
|
||||
Vec2 anchorPoint;
|
||||
Color4B color(255, 255, 255, 255);
|
||||
|
||||
Vec2 size = Vec2::ZERO;
|
||||
Vec2 size;
|
||||
bool flipX = false;
|
||||
bool flipY = false;
|
||||
bool ignoreSize = false;
|
||||
|
|
@ -247,11 +247,7 @@ namespace cocostudio
|
|||
while (child)
|
||||
{
|
||||
std::string attriname = child->Name();
|
||||
if (attriname == "Children")
|
||||
{
|
||||
break;
|
||||
}
|
||||
else if (attriname == "Position")
|
||||
if (attriname == "Position")
|
||||
{
|
||||
attribute = child->FirstAttribute();
|
||||
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@ namespace cocostudio
|
|||
if(!attribute)
|
||||
return Vec2::ZERO;
|
||||
|
||||
Vec2 ret(Vec2::ZERO);
|
||||
Vec2 ret;
|
||||
std::string attriname;
|
||||
|
||||
while (attribute)
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@ namespace cocostudio
|
|||
if(!attribute)
|
||||
return Vec2::ZERO;
|
||||
|
||||
Vec2 ret(Vec2::ZERO);
|
||||
Vec2 ret;
|
||||
std::string attriname;
|
||||
|
||||
while (attribute)
|
||||
|
|
|
|||
|
|
@ -391,16 +391,16 @@ namespace cocostudio
|
|||
{
|
||||
std::string name = "";
|
||||
long actionTag = 0;
|
||||
Vec2 rotationSkew = Vec2::ZERO;
|
||||
Vec2 rotationSkew;
|
||||
int zOrder = 0;
|
||||
bool visible = true;
|
||||
GLubyte alpha = 255;
|
||||
int tag = 0;
|
||||
Vec2 position = Vec2::ZERO;
|
||||
Vec2 scale = Vec2(1.0f, 1.0f);
|
||||
Vec2 anchorPoint = Vec2::ZERO;
|
||||
Vec2 position;
|
||||
Vec2 scale(1.0f, 1.0f);
|
||||
Vec2 anchorPoint;
|
||||
Color4B color(255, 255, 255, 255);
|
||||
Vec2 size = Vec2::ZERO;
|
||||
Vec2 size;
|
||||
bool flipX = false;
|
||||
bool flipY = false;
|
||||
bool ignoreSize = false;
|
||||
|
|
@ -558,11 +558,7 @@ namespace cocostudio
|
|||
while (child)
|
||||
{
|
||||
std::string attriname = child->Name();
|
||||
if (attriname == "Children")
|
||||
{
|
||||
break;
|
||||
}
|
||||
else if (attriname == "Position")
|
||||
if (attriname == "Position")
|
||||
{
|
||||
attribute = child->FirstAttribute();
|
||||
|
||||
|
|
|
|||
|
|
@ -1,372 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<ItemGroup Label="ProjectConfigurations">
|
||||
<ProjectConfiguration Include="Debug|Win32">
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Debug|ARM">
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>ARM</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release|Win32">
|
||||
<Configuration>Release</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release|ARM">
|
||||
<Configuration>Release</Configuration>
|
||||
<Platform>ARM</Platform>
|
||||
</ProjectConfiguration>
|
||||
</ItemGroup>
|
||||
<PropertyGroup Label="Globals">
|
||||
<ProjectGuid>{7D4FC6EB-9497-4804-98F3-3EAEDC896154}</ProjectGuid>
|
||||
<RootNamespace>libSpine</RootNamespace>
|
||||
<DefaultLanguage>en-US</DefaultLanguage>
|
||||
<MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||
<UseDebugLibraries>true</UseDebugLibraries>
|
||||
<PlatformToolset>v110_wp80</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
|
||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||
<UseDebugLibraries>true</UseDebugLibraries>
|
||||
<PlatformToolset>v110_wp80</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||
<PlatformToolset>v110_wp80</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
|
||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||
<PlatformToolset>v110_wp80</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
||||
<ImportGroup Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<Import Project="..\..\..\2d\wp8_props\cocos2d_wp8.props" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
|
||||
<Import Project="..\..\..\2d\wp8_props\cocos2d_wp8.props" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<Import Project="..\..\..\2d\wp8_props\cocos2d_wp8.props" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
|
||||
<Import Project="..\..\..\2d\wp8_props\cocos2d_wp8.props" />
|
||||
</ImportGroup>
|
||||
<PropertyGroup Label="UserMacros" />
|
||||
<PropertyGroup>
|
||||
<GenerateManifest>false</GenerateManifest>
|
||||
</PropertyGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<ClCompile>
|
||||
<PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
|
||||
<AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
|
||||
<AdditionalIncludeDirectories>$(EngineRoot);$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\editor-support;$(EngineRoot)extensions;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WP8;_DEBUG;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<DisableSpecificWarnings>4267;4251;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
|
||||
<ForcedIncludeFiles>
|
||||
</ForcedIncludeFiles>
|
||||
<AdditionalOptions>/Zm200 %(AdditionalOptions)</AdditionalOptions>
|
||||
<SDLCheck>false</SDLCheck>
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
|
||||
</Link>
|
||||
<Lib>
|
||||
<AdditionalOptions>/IGNORE:4264 %(AdditionalOptions)</AdditionalOptions>
|
||||
</Lib>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<ClCompile>
|
||||
<PreprocessorDefinitions>_LIB;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
|
||||
<AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
|
||||
<AdditionalIncludeDirectories>$(EngineRoot);$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\editor-support;$(EngineRoot)extensions;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WP8;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<ForcedIncludeFiles>
|
||||
</ForcedIncludeFiles>
|
||||
<AdditionalOptions>/Zm200 %(AdditionalOptions)</AdditionalOptions>
|
||||
<SDLCheck>false</SDLCheck>
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<WholeProgramOptimization>false</WholeProgramOptimization>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
|
||||
</Link>
|
||||
<Lib>
|
||||
<AdditionalOptions>/IGNORE:4264 %(AdditionalOptions)</AdditionalOptions>
|
||||
<LinkTimeCodeGeneration>false</LinkTimeCodeGeneration>
|
||||
</Lib>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
|
||||
<ClCompile>
|
||||
<PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
|
||||
<AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
|
||||
<AdditionalIncludeDirectories>$(EngineRoot);$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\editor-support;$(EngineRoot)extensions;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WP8;_DEBUG;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<DisableSpecificWarnings>4267;4251;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
|
||||
<ForcedIncludeFiles>
|
||||
</ForcedIncludeFiles>
|
||||
<AdditionalOptions>/Zm200 %(AdditionalOptions)</AdditionalOptions>
|
||||
<SDLCheck>false</SDLCheck>
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
|
||||
</Link>
|
||||
<Lib>
|
||||
<AdditionalOptions>/IGNORE:4264 %(AdditionalOptions)</AdditionalOptions>
|
||||
</Lib>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
|
||||
<ClCompile>
|
||||
<PreprocessorDefinitions>_LIB;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
|
||||
<AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
|
||||
<AdditionalIncludeDirectories>$(EngineRoot);$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\editor-support;$(EngineRoot)extensions;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WP8;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<ForcedIncludeFiles>
|
||||
</ForcedIncludeFiles>
|
||||
<AdditionalOptions>/Zm200 %(AdditionalOptions)</AdditionalOptions>
|
||||
<SDLCheck>false</SDLCheck>
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<WholeProgramOptimization>false</WholeProgramOptimization>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
|
||||
</Link>
|
||||
<Lib>
|
||||
<AdditionalOptions>/IGNORE:4264 %(AdditionalOptions)</AdditionalOptions>
|
||||
<LinkTimeCodeGeneration>false</LinkTimeCodeGeneration>
|
||||
</Lib>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="Windows">
|
||||
<IsWinMDFile>true</IsWinMDFile>
|
||||
</Reference>
|
||||
<Reference Include="platform.winmd">
|
||||
<IsWinMDFile>true</IsWinMDFile>
|
||||
<Private>false</Private>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="..\Animation.h" />
|
||||
<ClInclude Include="..\AnimationState.h" />
|
||||
<ClInclude Include="..\AnimationStateData.h" />
|
||||
<ClInclude Include="..\Atlas.h" />
|
||||
<ClInclude Include="..\AtlasAttachmentLoader.h" />
|
||||
<ClInclude Include="..\Attachment.h" />
|
||||
<ClInclude Include="..\AttachmentLoader.h" />
|
||||
<ClInclude Include="..\Bone.h" />
|
||||
<ClInclude Include="..\BoneData.h" />
|
||||
<ClInclude Include="..\BoundingBoxAttachment.h" />
|
||||
<ClInclude Include="..\Event.h" />
|
||||
<ClInclude Include="..\EventData.h" />
|
||||
<ClInclude Include="..\extension.h" />
|
||||
<ClInclude Include="..\IkConstraint.h" />
|
||||
<ClInclude Include="..\IkConstraintData.h" />
|
||||
<ClInclude Include="..\Json.h" />
|
||||
<ClInclude Include="..\MeshAttachment.h" />
|
||||
<ClInclude Include="..\PolygonBatch.h" />
|
||||
<ClInclude Include="..\RegionAttachment.h" />
|
||||
<ClInclude Include="..\Skeleton.h" />
|
||||
<ClInclude Include="..\SkeletonAnimation.h" />
|
||||
<ClInclude Include="..\SkeletonBounds.h" />
|
||||
<ClInclude Include="..\SkeletonData.h" />
|
||||
<ClInclude Include="..\SkeletonJson.h" />
|
||||
<ClInclude Include="..\SkeletonRenderer.h" />
|
||||
<ClInclude Include="..\Skin.h" />
|
||||
<ClInclude Include="..\SkinnedMeshAttachment.h" />
|
||||
<ClInclude Include="..\Slot.h" />
|
||||
<ClInclude Include="..\SlotData.h" />
|
||||
<ClInclude Include="..\spine-cocos2dx.h" />
|
||||
<ClInclude Include="..\spine.h" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="..\Animation.c">
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</CompileAsWinRT>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\AnimationState.c">
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</CompileAsWinRT>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\AnimationStateData.c">
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</CompileAsWinRT>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\Atlas.c">
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</CompileAsWinRT>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\AtlasAttachmentLoader.c">
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</CompileAsWinRT>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\Attachment.c">
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</CompileAsWinRT>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\AttachmentLoader.c">
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</CompileAsWinRT>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\Bone.c">
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</CompileAsWinRT>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\BoneData.c">
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</CompileAsWinRT>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\BoundingBoxAttachment.c">
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</CompileAsWinRT>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\Event.c">
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</CompileAsWinRT>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\EventData.c">
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</CompileAsWinRT>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\extension.c">
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</CompileAsWinRT>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\IkConstraint.c">
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</CompileAsWinRT>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\IkConstraintData.c">
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</CompileAsWinRT>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\Json.c">
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</CompileAsWinRT>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\MeshAttachment.c">
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</CompileAsWinRT>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\PolygonBatch.cpp" />
|
||||
<ClCompile Include="..\RegionAttachment.c">
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</CompileAsWinRT>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\Skeleton.c">
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</CompileAsWinRT>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\SkeletonAnimation.cpp" />
|
||||
<ClCompile Include="..\SkeletonBounds.c">
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</CompileAsWinRT>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\SkeletonData.c">
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</CompileAsWinRT>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\SkeletonJson.c">
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</CompileAsWinRT>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\SkeletonRenderer.cpp" />
|
||||
<ClCompile Include="..\Skin.c">
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</CompileAsWinRT>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\SkinnedMeshAttachment.c">
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</CompileAsWinRT>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\Slot.c">
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</CompileAsWinRT>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\SlotData.c">
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</CompileAsWinRT>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\spine-cocos2dx.cpp" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsPhone\v$(TargetPlatformVersion)\Microsoft.Cpp.WindowsPhone.$(TargetPlatformVersion).targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
</ImportGroup>
|
||||
</Project>
|
||||
|
|
@ -1,200 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<ItemGroup>
|
||||
<Filter Include="Header Files">
|
||||
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
|
||||
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
|
||||
</Filter>
|
||||
<Filter Include="Source Files">
|
||||
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
|
||||
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
|
||||
</Filter>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="..\Animation.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\AnimationState.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\AnimationStateData.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\Atlas.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\AtlasAttachmentLoader.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\Attachment.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\AttachmentLoader.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\Bone.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\BoneData.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\BoundingBoxAttachment.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\Event.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\EventData.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\extension.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\IkConstraint.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\IkConstraintData.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\Json.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\MeshAttachment.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\PolygonBatch.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\RegionAttachment.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\Skeleton.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\SkeletonAnimation.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\SkeletonBounds.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\SkeletonData.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\SkeletonJson.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\SkeletonRenderer.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\Skin.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\SkinnedMeshAttachment.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\Slot.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\SlotData.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\spine.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\spine-cocos2dx.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="..\Animation.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\AnimationState.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\AnimationStateData.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\Atlas.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\AtlasAttachmentLoader.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\Attachment.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\AttachmentLoader.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\Bone.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\BoneData.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\BoundingBoxAttachment.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\Event.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\EventData.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\extension.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\IkConstraint.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\IkConstraintData.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\Json.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\MeshAttachment.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\PolygonBatch.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\RegionAttachment.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\Skeleton.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\SkeletonAnimation.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\SkeletonBounds.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\SkeletonData.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\SkeletonJson.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\SkeletonRenderer.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\Skin.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\SkinnedMeshAttachment.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\Slot.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\SlotData.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\spine-cocos2dx.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<FullDeploy>true</FullDeploy>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
|
|
@ -69,8 +69,8 @@ void ccVertexLineToPolygon(Vec2 *points, float stroke, Vec2 *vertices, unsigned
|
|||
}
|
||||
perpVector = perpVector * stroke;
|
||||
|
||||
vertices[idx] = Vec2(p1.x+perpVector.x, p1.y+perpVector.y);
|
||||
vertices[idx+1] = Vec2(p1.x-perpVector.x, p1.y-perpVector.y);
|
||||
vertices[idx].set(p1.x + perpVector.x, p1.y + perpVector.y);
|
||||
vertices[idx + 1].set(p1.x - perpVector.x, p1.y - perpVector.y);
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -95,6 +95,11 @@ void MathUtil::smooth(float* x, float target, float elapsedTime, float riseTime,
|
|||
}
|
||||
}
|
||||
|
||||
float MathUtil::lerp(float from, float to, float alpha)
|
||||
{
|
||||
return from * (1.0f - alpha) + to * alpha;
|
||||
}
|
||||
|
||||
bool MathUtil::isNeon32Enabled()
|
||||
{
|
||||
#ifdef USE_NEON32
|
||||
|
|
|
|||
|
|
@ -75,6 +75,18 @@ public:
|
|||
* @param fallTime response time for falling slope (in the same units as elapsedTime).
|
||||
*/
|
||||
static void smooth(float* x, float target, float elapsedTime, float riseTime, float fallTime);
|
||||
|
||||
/**
|
||||
* Linearly interpolates between from value to to value by alpha which is in
|
||||
* the range [0,1]
|
||||
*
|
||||
* @param from the from value.
|
||||
* @param to the to value.
|
||||
* @param alpha the alpha value between [0,1]
|
||||
*
|
||||
* @return interpolated float value
|
||||
*/
|
||||
static float lerp(float from, float to, float alpha);
|
||||
private:
|
||||
//Indicates that if neon is enabled
|
||||
static bool isNeon32Enabled();
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue