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

Merge pull request #31 from WenhaiLin/v3-jsb-merge 

Split the project files of JSB into separate files.
This commit is contained in:
Bin Zhang 2015-04-20 02:28:26 -07:00
parent e5672b6e1f ed79f66b9f
commit b0ab12e0e7
84 changed files with 2146 additions and 1354 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
AUTHORS
View File

@ -1103,6 +1103,12 @@ Developers:
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

4
CHANGELOG
View File

@ -1,6 +1,10 @@
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

109
build/cocos2d-jsb-win32.vc2012.sln Normal file
View File

@ -0,0 +1,109 @@
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}") = "cpp-tests", "..\tests\cpp-tests\proj.win32\cpp-tests.vcxproj", "{76A39BB2-9B84-4C65-98A5-654D86B86F2A}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua-tests", "..\tests\lua-tests\project\proj.win32\lua-tests.win32.vcxproj", "{4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cpp-empty-test", "..\tests\cpp-empty-test\proj.win32\cpp-empty-test.vcxproj", "{B8BF9E81-35FD-4582-BA1C-B85FA365BABB}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua-empty-test", "..\tests\lua-empty-test\project\proj.win32\lua-empty-test.vcxproj", "{13E55395-94A2-4CD9-BFC2-1A051F80C17D}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d", "..\cocos\2d\libcocos2d.vcxproj", "{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libluacocos2d", "..\cocos\scripting\lua-bindings\proj.win32\libluacocos2d.vcxproj", "{9F2D6CE6-C893-4400-B50C-6DB70CC2562F}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "External", "External", "{92D54E36-7916-48EF-A951-224DD3B25442}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSpine", "..\cocos\editor-support\spine\proj.win32\libSpine.vcxproj", "{B7C2A162-DEC9-4418-972E-240AB3CBFCAE}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbox2d", "..\external\Box2D\proj.win32\libbox2d.vcxproj", "{929480E7-23C0-4DF6-8456-096D71547116}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjscocos2d", "..\cocos\scripting\js-bindings\proj.win32\libjscocos2d.vcxproj", "{39379840-825A-45A0-B363-C09FFEF864BD}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "js-tests", "..\tests\js-tests\project\proj.win32\js-tests.vcxproj", "{D0F06A44-A245-4D13-A498-0120C203B539}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|ARM = Debug|ARM
Debug|Win32 = Debug|Win32
Release|ARM = Release|ARM
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{76A39BB2-9B84-4C65-98A5-654D86B86F2A}.Debug|ARM.ActiveCfg = Debug|Win32
{76A39BB2-9B84-4C65-98A5-654D86B86F2A}.Debug|Win32.ActiveCfg = Debug|Win32
{76A39BB2-9B84-4C65-98A5-654D86B86F2A}.Debug|Win32.Build.0 = Debug|Win32
{76A39BB2-9B84-4C65-98A5-654D86B86F2A}.Release|ARM.ActiveCfg = Release|Win32
{76A39BB2-9B84-4C65-98A5-654D86B86F2A}.Release|Win32.ActiveCfg = Release|Win32
{76A39BB2-9B84-4C65-98A5-654D86B86F2A}.Release|Win32.Build.0 = Release|Win32
{4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}.Debug|ARM.ActiveCfg = Debug|Win32
{4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}.Debug|Win32.ActiveCfg = Debug|Win32
{4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}.Debug|Win32.Build.0 = Debug|Win32
{4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}.Release|ARM.ActiveCfg = Release|Win32
{4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}.Release|Win32.ActiveCfg = Release|Win32
{4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}.Release|Win32.Build.0 = Release|Win32
{B8BF9E81-35FD-4582-BA1C-B85FA365BABB}.Debug|ARM.ActiveCfg = Debug|Win32
{B8BF9E81-35FD-4582-BA1C-B85FA365BABB}.Debug|Win32.ActiveCfg = Debug|Win32
{B8BF9E81-35FD-4582-BA1C-B85FA365BABB}.Debug|Win32.Build.0 = Debug|Win32
{B8BF9E81-35FD-4582-BA1C-B85FA365BABB}.Release|ARM.ActiveCfg = Release|Win32
{B8BF9E81-35FD-4582-BA1C-B85FA365BABB}.Release|Win32.ActiveCfg = Release|Win32
{B8BF9E81-35FD-4582-BA1C-B85FA365BABB}.Release|Win32.Build.0 = Release|Win32
{13E55395-94A2-4CD9-BFC2-1A051F80C17D}.Debug|ARM.ActiveCfg = Debug|Win32
{13E55395-94A2-4CD9-BFC2-1A051F80C17D}.Debug|Win32.ActiveCfg = Debug|Win32
{13E55395-94A2-4CD9-BFC2-1A051F80C17D}.Debug|Win32.Build.0 = Debug|Win32
{13E55395-94A2-4CD9-BFC2-1A051F80C17D}.Release|ARM.ActiveCfg = Release|Win32
{13E55395-94A2-4CD9-BFC2-1A051F80C17D}.Release|Win32.ActiveCfg = Release|Win32
{13E55395-94A2-4CD9-BFC2-1A051F80C17D}.Release|Win32.Build.0 = Release|Win32
{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Debug|ARM.ActiveCfg = Debug|Win32
{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Debug|Win32.ActiveCfg = Debug|Win32
{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Debug|Win32.Build.0 = Debug|Win32
{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Release|ARM.ActiveCfg = Release|Win32
{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Release|Win32.ActiveCfg = Release|Win32
{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Release|Win32.Build.0 = Release|Win32
{9F2D6CE6-C893-4400-B50C-6DB70CC2562F}.Debug|ARM.ActiveCfg = Debug|Win32
{9F2D6CE6-C893-4400-B50C-6DB70CC2562F}.Debug|Win32.ActiveCfg = Debug|Win32
{9F2D6CE6-C893-4400-B50C-6DB70CC2562F}.Debug|Win32.Build.0 = Debug|Win32
{9F2D6CE6-C893-4400-B50C-6DB70CC2562F}.Release|ARM.ActiveCfg = Release|Win32
{9F2D6CE6-C893-4400-B50C-6DB70CC2562F}.Release|Win32.ActiveCfg = Release|Win32
{9F2D6CE6-C893-4400-B50C-6DB70CC2562F}.Release|Win32.Build.0 = Release|Win32
{B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Debug|ARM.ActiveCfg = Debug|Win32
{B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Debug|Win32.ActiveCfg = Debug|Win32
{B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Debug|Win32.Build.0 = Debug|Win32
{B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Release|ARM.ActiveCfg = Release|Win32
{B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Release|Win32.ActiveCfg = Release|Win32
{B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Release|Win32.Build.0 = Release|Win32
{929480E7-23C0-4DF6-8456-096D71547116}.Debug|ARM.ActiveCfg = Debug|Win32
{929480E7-23C0-4DF6-8456-096D71547116}.Debug|Win32.ActiveCfg = Debug|Win32
{929480E7-23C0-4DF6-8456-096D71547116}.Debug|Win32.Build.0 = Debug|Win32
{929480E7-23C0-4DF6-8456-096D71547116}.Release|ARM.ActiveCfg = Release|Win32
{929480E7-23C0-4DF6-8456-096D71547116}.Release|Win32.ActiveCfg = Release|Win32
{929480E7-23C0-4DF6-8456-096D71547116}.Release|Win32.Build.0 = Release|Win32
{39379840-825A-45A0-B363-C09FFEF864BD}.Debug|ARM.ActiveCfg = Debug|Win32
{39379840-825A-45A0-B363-C09FFEF864BD}.Debug|Win32.ActiveCfg = Debug|Win32
{39379840-825A-45A0-B363-C09FFEF864BD}.Debug|Win32.Build.0 = Debug|Win32
{39379840-825A-45A0-B363-C09FFEF864BD}.Release|ARM.ActiveCfg = Release|Win32
{39379840-825A-45A0-B363-C09FFEF864BD}.Release|Win32.ActiveCfg = Release|Win32
{39379840-825A-45A0-B363-C09FFEF864BD}.Release|Win32.Build.0 = Release|Win32
{D0F06A44-A245-4D13-A498-0120C203B539}.Debug|ARM.ActiveCfg = Debug|Win32
{D0F06A44-A245-4D13-A498-0120C203B539}.Debug|Win32.ActiveCfg = Debug|Win32
{D0F06A44-A245-4D13-A498-0120C203B539}.Debug|Win32.Build.0 = Debug|Win32
{D0F06A44-A245-4D13-A498-0120C203B539}.Release|ARM.ActiveCfg = Release|Win32
{D0F06A44-A245-4D13-A498-0120C203B539}.Release|Win32.ActiveCfg = Release|Win32
{D0F06A44-A245-4D13-A498-0120C203B539}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{B7C2A162-DEC9-4418-972E-240AB3CBFCAE} = {92D54E36-7916-48EF-A951-224DD3B25442}
{929480E7-23C0-4DF6-8456-096D71547116} = {92D54E36-7916-48EF-A951-224DD3B25442}
EndGlobalSection
GlobalSection(DPCodeReviewSolutionGUID) = preSolution
DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000}
EndGlobalSection
GlobalSection(DPCodeReviewSolutionGUID) = preSolution
DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000}
EndGlobalSection
EndGlobal

310
build/cocos2d-jsb-win8.1-universal.sln Normal file
View File

@ -0,0 +1,310 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.31101.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libcocos2d", "libcocos2d", "{B3F299D4-B4CA-4F0B-8BE2-FB328483BC13}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d_8_1.Shared", "..\cocos\2d\libcocos2d_8_1\libcocos2d_8_1\libcocos2d_8_1.Shared\libcocos2d_8_1.Shared.vcxitems", "{5D6F020F-7E72-4494-90A0-2DF11D235DF9}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d_8_1.Windows", "..\cocos\2d\libcocos2d_8_1\libcocos2d_8_1\libcocos2d_8_1.Windows\libcocos2d_8_1.Windows.vcxproj", "{9335005F-678E-4E8E-9B84-50037216AEC8}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d_8_1.WindowsPhone", "..\cocos\2d\libcocos2d_8_1\libcocos2d_8_1\libcocos2d_8_1.WindowsPhone\libcocos2d_8_1.WindowsPhone.vcxproj", "{22F3B9DF-1209-4574-8331-003966F562BF}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "cpp-tests", "cpp-tests", "{572742C5-9322-4548-AB8B-96C3750A1B5D}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cpp-tests.Shared", "..\tests\cpp-tests\proj.win8.1-universal\cpp-tests.Shared\cpp-tests.Shared.vcxitems", "{BE3A1791-5BCE-4CEA-92CD-0E2D86DDE27A}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cpp-tests.Windows", "..\tests\cpp-tests\proj.win8.1-universal\cpp-tests.Windows\cpp-tests.Windows.vcxproj", "{F2BAE06B-CAAE-43EE-B21B-57FA48DB04FA}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cpp-tests.WindowsPhone", "..\tests\cpp-tests\proj.win8.1-universal\cpp-tests.WindowsPhone\cpp-tests.WindowsPhone.vcxproj", "{15247C71-5289-4913-B88F-E253CC353720}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "External", "External", "{85630454-74EA-4B5B-9B62-0E459B4476CB}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libbox2d", "libbox2d", "{B3D1A3D5-9F54-43AF-9322-230B53242B78}"
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}") = "libbox2d.WindowsPhone", "..\external\Box2D\proj.win8.1-universal\libbox2d.WindowsPhone\libbox2d.WindowsPhone.vcxproj", "{22F798D8-BFFF-4754-996F-A5395343D5EC}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libSpine", "libSpine", "{6FEB795C-C98C-4C8C-A88B-A35DEE205348}"
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
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSpine.WindowsPhone", "..\cocos\editor-support\spine\proj.win8.1-universal\libSpine.WindowsPhone\libSpine.WindowsPhone.vcxproj", "{CC1DA216-A80D-4BE4-B309-ACB6AF313AFF}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "cpp-empty-test", "cpp-empty-test", "{B70EF25E-E352-4020-BCDF-388973E44637}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloCpp.Shared", "..\tests\cpp-empty-test\proj.win8.1-universal\HelloCpp.Shared\HelloCpp.Shared.vcxitems", "{A3AD93E4-0B2F-4C58-9181-69BED2E42E3E}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloCpp.Windows", "..\tests\cpp-empty-test\proj.win8.1-universal\HelloCpp.Windows\HelloCpp.Windows.vcxproj", "{79A8FCDA-4B12-4DD1-B676-FF148D651638}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloCpp.WindowsPhone", "..\tests\cpp-empty-test\proj.win8.1-universal\HelloCpp.WindowsPhone\HelloCpp.WindowsPhone.vcxproj", "{396FE85E-BB05-4B92-BCCB-F89AED4EA41A}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "js-tests", "js-tests", "{8E24A044-D83D-476D-886D-F40E3CC621DF}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "js-tests.Shared", "..\tests\js-tests\project\proj.win8.1-universal\App.Shared\js-tests.Shared.vcxitems", "{AE6763F6-1549-441E-AFB5-377BE1C776DC}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "js-tests.Windows", "..\tests\js-tests\project\proj.win8.1-universal\App.Windows\js-tests.Windows.vcxproj", "{70914FC8-7709-4CD6-B86B-C63FDE5478DB}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "js-tests.WindowsPhone", "..\tests\js-tests\project\proj.win8.1-universal\App.WindowsPhone\js-tests.WindowsPhone.vcxproj", "{94874B5B-398F-448A-A366-35A35DC1DB9C}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libcocos2d-jsb", "libcocos2d-jsb", "{60DCAEA9-E344-40C0-B90C-82FB8E671BD5}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjscocos2d.Shared", "..\cocos\scripting\js-bindings\proj.win8.1-universal\libjscocos2d\libjscocos2d.Shared\libjscocos2d.Shared.vcxitems", "{BEA66276-51DD-4C53-92A8-F3D1FEA50892}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjscocos2d.Windows", "..\cocos\scripting\js-bindings\proj.win8.1-universal\libjscocos2d\libjscocos2d.Windows\libjscocos2d.Windows.vcxproj", "{BCF5546D-66A0-4998-AFD6-C5514F618930}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjscocos2d.WindowsPhone", "..\cocos\scripting\js-bindings\proj.win8.1-universal\libjscocos2d\libjscocos2d.WindowsPhone\libjscocos2d.WindowsPhone.vcxproj", "{CA082EC4-17CE-430B-8207-D1E947A5D1E9}"
EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
..\tests\js-tests\project\proj.win8.1-universal\App.Shared\js-tests.Shared.vcxitems*{ae6763f6-1549-441e-afb5-377be1c776dc}*SharedItemsImports = 9
..\tests\js-tests\project\proj.win8.1-universal\App.Shared\js-tests.Shared.vcxitems*{94874b5b-398f-448a-a366-35a35dc1db9c}*SharedItemsImports = 4
..\cocos\2d\libcocos2d_8_1\libcocos2d_8_1\libcocos2d_8_1.Shared\libcocos2d_8_1.Shared.vcxitems*{9335005f-678e-4e8e-9b84-50037216aec8}*SharedItemsImports = 4
..\tests\cpp-tests\proj.win8.1-universal\cpp-tests.Shared\cpp-tests.Shared.vcxitems*{15247c71-5289-4913-b88f-e253cc353720}*SharedItemsImports = 4
..\tests\cpp-empty-test\proj.win8.1-universal\HelloCpp.Shared\HelloCpp.Shared.vcxitems*{a3ad93e4-0b2f-4c58-9181-69bed2e42e3e}*SharedItemsImports = 9
..\tests\js-tests\project\proj.win8.1-universal\App.Shared\js-tests.Shared.vcxitems*{70914fc8-7709-4cd6-b86b-c63fde5478db}*SharedItemsImports = 4
..\cocos\editor-support\spine\proj.win8.1-universal\libSpine.Shared\libSpine.Shared.vcxitems*{cc1da216-a80d-4be4-b309-acb6af313aff}*SharedItemsImports = 4
..\external\Box2D\proj.win8.1-universal\libbox2d.Shared\libbox2d.Shared.vcxitems*{4a3c6ba8-c227-498b-aa21-40bda27b461f}*SharedItemsImports = 9
..\tests\cpp-empty-test\proj.win8.1-universal\HelloCpp.Shared\HelloCpp.Shared.vcxitems*{79a8fcda-4b12-4dd1-b676-ff148d651638}*SharedItemsImports = 4
..\cocos\editor-support\spine\proj.win8.1-universal\libSpine.Shared\libSpine.Shared.vcxitems*{adafd00d-a0d6-46ef-9f0b-ea2880bfe1de}*SharedItemsImports = 9
..\tests\cpp-tests\proj.win8.1-universal\cpp-tests.Shared\cpp-tests.Shared.vcxitems*{be3a1791-5bce-4cea-92cd-0e2d86dde27a}*SharedItemsImports = 9
..\cocos\scripting\js-bindings\proj.win8.1-universal\libjscocos2d\libjscocos2d.Shared\libjscocos2d.Shared.vcxitems*{ca082ec4-17ce-430b-8207-d1e947a5d1e9}*SharedItemsImports = 4
..\cocos\2d\libcocos2d_8_1\libcocos2d_8_1\libcocos2d_8_1.Shared\libcocos2d_8_1.Shared.vcxitems*{5d6f020f-7e72-4494-90a0-2df11d235df9}*SharedItemsImports = 9
..\cocos\scripting\js-bindings\proj.win8.1-universal\libjscocos2d\libjscocos2d.Shared\libjscocos2d.Shared.vcxitems*{bea66276-51dd-4c53-92a8-f3d1fea50892}*SharedItemsImports = 9
..\cocos\scripting\js-bindings\proj.win8.1-universal\libjscocos2d\libjscocos2d.Shared\libjscocos2d.Shared.vcxitems*{bcf5546d-66a0-4998-afd6-c5514f618930}*SharedItemsImports = 4
..\external\Box2D\proj.win8.1-universal\libbox2d.Shared\libbox2d.Shared.vcxitems*{3b26a12d-3a44-47ea-82d2-282660fc844d}*SharedItemsImports = 4
..\cocos\2d\libcocos2d_8_1\libcocos2d_8_1\libcocos2d_8_1.Shared\libcocos2d_8_1.Shared.vcxitems*{22f3b9df-1209-4574-8331-003966f562bf}*SharedItemsImports = 4
..\external\Box2D\proj.win8.1-universal\libbox2d.Shared\libbox2d.Shared.vcxitems*{22f798d8-bfff-4754-996f-a5395343d5ec}*SharedItemsImports = 4
..\cocos\editor-support\spine\proj.win8.1-universal\libSpine.Shared\libSpine.Shared.vcxitems*{f3550fe0-c795-44f6-8feb-093eb68143ae}*SharedItemsImports = 4
..\tests\cpp-tests\proj.win8.1-universal\cpp-tests.Shared\cpp-tests.Shared.vcxitems*{f2bae06b-caae-43ee-b21b-57fa48db04fa}*SharedItemsImports = 4
..\tests\cpp-empty-test\proj.win8.1-universal\HelloCpp.Shared\HelloCpp.Shared.vcxitems*{396fe85e-bb05-4b92-bccb-f89aed4ea41a}*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
{9335005F-678E-4E8E-9B84-50037216AEC8}.Debug|ARM.ActiveCfg = Debug|ARM
{9335005F-678E-4E8E-9B84-50037216AEC8}.Debug|ARM.Build.0 = Debug|ARM
{9335005F-678E-4E8E-9B84-50037216AEC8}.Debug|Win32.ActiveCfg = Debug|Win32
{9335005F-678E-4E8E-9B84-50037216AEC8}.Debug|Win32.Build.0 = Debug|Win32
{9335005F-678E-4E8E-9B84-50037216AEC8}.Debug|x64.ActiveCfg = Debug|x64
{9335005F-678E-4E8E-9B84-50037216AEC8}.Debug|x64.Build.0 = Debug|x64
{9335005F-678E-4E8E-9B84-50037216AEC8}.Release|ARM.ActiveCfg = Release|ARM
{9335005F-678E-4E8E-9B84-50037216AEC8}.Release|ARM.Build.0 = Release|ARM
{9335005F-678E-4E8E-9B84-50037216AEC8}.Release|Win32.ActiveCfg = Release|Win32
{9335005F-678E-4E8E-9B84-50037216AEC8}.Release|Win32.Build.0 = Release|Win32
{9335005F-678E-4E8E-9B84-50037216AEC8}.Release|x64.ActiveCfg = Release|x64
{9335005F-678E-4E8E-9B84-50037216AEC8}.Release|x64.Build.0 = Release|x64
{22F3B9DF-1209-4574-8331-003966F562BF}.Debug|ARM.ActiveCfg = Debug|ARM
{22F3B9DF-1209-4574-8331-003966F562BF}.Debug|ARM.Build.0 = Debug|ARM
{22F3B9DF-1209-4574-8331-003966F562BF}.Debug|Win32.ActiveCfg = Debug|Win32
{22F3B9DF-1209-4574-8331-003966F562BF}.Debug|Win32.Build.0 = Debug|Win32
{22F3B9DF-1209-4574-8331-003966F562BF}.Debug|x64.ActiveCfg = Debug|Win32
{22F3B9DF-1209-4574-8331-003966F562BF}.Release|ARM.ActiveCfg = Release|ARM
{22F3B9DF-1209-4574-8331-003966F562BF}.Release|ARM.Build.0 = Release|ARM
{22F3B9DF-1209-4574-8331-003966F562BF}.Release|Win32.ActiveCfg = Release|Win32
{22F3B9DF-1209-4574-8331-003966F562BF}.Release|Win32.Build.0 = Release|Win32
{22F3B9DF-1209-4574-8331-003966F562BF}.Release|x64.ActiveCfg = Release|Win32
{F2BAE06B-CAAE-43EE-B21B-57FA48DB04FA}.Debug|ARM.ActiveCfg = Debug|ARM
{F2BAE06B-CAAE-43EE-B21B-57FA48DB04FA}.Debug|ARM.Build.0 = Debug|ARM
{F2BAE06B-CAAE-43EE-B21B-57FA48DB04FA}.Debug|ARM.Deploy.0 = Debug|ARM
{F2BAE06B-CAAE-43EE-B21B-57FA48DB04FA}.Debug|Win32.ActiveCfg = Debug|Win32
{F2BAE06B-CAAE-43EE-B21B-57FA48DB04FA}.Debug|Win32.Build.0 = Debug|Win32
{F2BAE06B-CAAE-43EE-B21B-57FA48DB04FA}.Debug|Win32.Deploy.0 = Debug|Win32
{F2BAE06B-CAAE-43EE-B21B-57FA48DB04FA}.Debug|x64.ActiveCfg = Debug|x64
{F2BAE06B-CAAE-43EE-B21B-57FA48DB04FA}.Debug|x64.Build.0 = Debug|x64
{F2BAE06B-CAAE-43EE-B21B-57FA48DB04FA}.Debug|x64.Deploy.0 = Debug|x64
{F2BAE06B-CAAE-43EE-B21B-57FA48DB04FA}.Release|ARM.ActiveCfg = Release|ARM
{F2BAE06B-CAAE-43EE-B21B-57FA48DB04FA}.Release|ARM.Build.0 = Release|ARM
{F2BAE06B-CAAE-43EE-B21B-57FA48DB04FA}.Release|ARM.Deploy.0 = Release|ARM
{F2BAE06B-CAAE-43EE-B21B-57FA48DB04FA}.Release|Win32.ActiveCfg = Release|Win32
{F2BAE06B-CAAE-43EE-B21B-57FA48DB04FA}.Release|Win32.Build.0 = Release|Win32
{F2BAE06B-CAAE-43EE-B21B-57FA48DB04FA}.Release|Win32.Deploy.0 = Release|Win32
{F2BAE06B-CAAE-43EE-B21B-57FA48DB04FA}.Release|x64.ActiveCfg = Release|x64
{F2BAE06B-CAAE-43EE-B21B-57FA48DB04FA}.Release|x64.Build.0 = Release|x64
{F2BAE06B-CAAE-43EE-B21B-57FA48DB04FA}.Release|x64.Deploy.0 = Release|x64
{15247C71-5289-4913-B88F-E253CC353720}.Debug|ARM.ActiveCfg = Debug|ARM
{15247C71-5289-4913-B88F-E253CC353720}.Debug|ARM.Build.0 = Debug|ARM
{15247C71-5289-4913-B88F-E253CC353720}.Debug|ARM.Deploy.0 = Debug|ARM
{15247C71-5289-4913-B88F-E253CC353720}.Debug|Win32.ActiveCfg = Debug|Win32
{15247C71-5289-4913-B88F-E253CC353720}.Debug|Win32.Build.0 = Debug|Win32
{15247C71-5289-4913-B88F-E253CC353720}.Debug|Win32.Deploy.0 = Debug|Win32
{15247C71-5289-4913-B88F-E253CC353720}.Debug|x64.ActiveCfg = Debug|Win32
{15247C71-5289-4913-B88F-E253CC353720}.Release|ARM.ActiveCfg = Release|ARM
{15247C71-5289-4913-B88F-E253CC353720}.Release|ARM.Build.0 = Release|ARM
{15247C71-5289-4913-B88F-E253CC353720}.Release|ARM.Deploy.0 = Release|ARM
{15247C71-5289-4913-B88F-E253CC353720}.Release|Win32.ActiveCfg = Release|Win32
{15247C71-5289-4913-B88F-E253CC353720}.Release|Win32.Build.0 = Release|Win32
{15247C71-5289-4913-B88F-E253CC353720}.Release|Win32.Deploy.0 = Release|Win32
{15247C71-5289-4913-B88F-E253CC353720}.Release|x64.ActiveCfg = Release|Win32
{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
{22F798D8-BFFF-4754-996F-A5395343D5EC}.Debug|ARM.ActiveCfg = Debug|ARM
{22F798D8-BFFF-4754-996F-A5395343D5EC}.Debug|ARM.Build.0 = Debug|ARM
{22F798D8-BFFF-4754-996F-A5395343D5EC}.Debug|Win32.ActiveCfg = Debug|Win32
{22F798D8-BFFF-4754-996F-A5395343D5EC}.Debug|Win32.Build.0 = Debug|Win32
{22F798D8-BFFF-4754-996F-A5395343D5EC}.Debug|x64.ActiveCfg = Debug|Win32
{22F798D8-BFFF-4754-996F-A5395343D5EC}.Release|ARM.ActiveCfg = Release|ARM
{22F798D8-BFFF-4754-996F-A5395343D5EC}.Release|ARM.Build.0 = Release|ARM
{22F798D8-BFFF-4754-996F-A5395343D5EC}.Release|Win32.ActiveCfg = Release|Win32
{22F798D8-BFFF-4754-996F-A5395343D5EC}.Release|Win32.Build.0 = Release|Win32
{22F798D8-BFFF-4754-996F-A5395343D5EC}.Release|x64.ActiveCfg = Release|Win32
{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
{CC1DA216-A80D-4BE4-B309-ACB6AF313AFF}.Debug|ARM.ActiveCfg = Debug|ARM
{CC1DA216-A80D-4BE4-B309-ACB6AF313AFF}.Debug|ARM.Build.0 = Debug|ARM
{CC1DA216-A80D-4BE4-B309-ACB6AF313AFF}.Debug|Win32.ActiveCfg = Debug|Win32
{CC1DA216-A80D-4BE4-B309-ACB6AF313AFF}.Debug|Win32.Build.0 = Debug|Win32
{CC1DA216-A80D-4BE4-B309-ACB6AF313AFF}.Debug|x64.ActiveCfg = Debug|Win32
{CC1DA216-A80D-4BE4-B309-ACB6AF313AFF}.Release|ARM.ActiveCfg = Release|ARM
{CC1DA216-A80D-4BE4-B309-ACB6AF313AFF}.Release|ARM.Build.0 = Release|ARM
{CC1DA216-A80D-4BE4-B309-ACB6AF313AFF}.Release|Win32.ActiveCfg = Release|Win32
{CC1DA216-A80D-4BE4-B309-ACB6AF313AFF}.Release|Win32.Build.0 = Release|Win32
{CC1DA216-A80D-4BE4-B309-ACB6AF313AFF}.Release|x64.ActiveCfg = Release|Win32
{79A8FCDA-4B12-4DD1-B676-FF148D651638}.Debug|ARM.ActiveCfg = Debug|ARM
{79A8FCDA-4B12-4DD1-B676-FF148D651638}.Debug|ARM.Build.0 = Debug|ARM
{79A8FCDA-4B12-4DD1-B676-FF148D651638}.Debug|ARM.Deploy.0 = Debug|ARM
{79A8FCDA-4B12-4DD1-B676-FF148D651638}.Debug|Win32.ActiveCfg = Debug|Win32
{79A8FCDA-4B12-4DD1-B676-FF148D651638}.Debug|Win32.Build.0 = Debug|Win32
{79A8FCDA-4B12-4DD1-B676-FF148D651638}.Debug|Win32.Deploy.0 = Debug|Win32
{79A8FCDA-4B12-4DD1-B676-FF148D651638}.Debug|x64.ActiveCfg = Debug|x64
{79A8FCDA-4B12-4DD1-B676-FF148D651638}.Debug|x64.Build.0 = Debug|x64
{79A8FCDA-4B12-4DD1-B676-FF148D651638}.Debug|x64.Deploy.0 = Debug|x64
{79A8FCDA-4B12-4DD1-B676-FF148D651638}.Release|ARM.ActiveCfg = Release|ARM
{79A8FCDA-4B12-4DD1-B676-FF148D651638}.Release|ARM.Build.0 = Release|ARM
{79A8FCDA-4B12-4DD1-B676-FF148D651638}.Release|ARM.Deploy.0 = Release|ARM
{79A8FCDA-4B12-4DD1-B676-FF148D651638}.Release|Win32.ActiveCfg = Release|Win32
{79A8FCDA-4B12-4DD1-B676-FF148D651638}.Release|Win32.Build.0 = Release|Win32
{79A8FCDA-4B12-4DD1-B676-FF148D651638}.Release|Win32.Deploy.0 = Release|Win32
{79A8FCDA-4B12-4DD1-B676-FF148D651638}.Release|x64.ActiveCfg = Release|x64
{79A8FCDA-4B12-4DD1-B676-FF148D651638}.Release|x64.Build.0 = Release|x64
{79A8FCDA-4B12-4DD1-B676-FF148D651638}.Release|x64.Deploy.0 = Release|x64
{396FE85E-BB05-4B92-BCCB-F89AED4EA41A}.Debug|ARM.ActiveCfg = Debug|ARM
{396FE85E-BB05-4B92-BCCB-F89AED4EA41A}.Debug|ARM.Build.0 = Debug|ARM
{396FE85E-BB05-4B92-BCCB-F89AED4EA41A}.Debug|ARM.Deploy.0 = Debug|ARM
{396FE85E-BB05-4B92-BCCB-F89AED4EA41A}.Debug|Win32.ActiveCfg = Debug|Win32
{396FE85E-BB05-4B92-BCCB-F89AED4EA41A}.Debug|Win32.Build.0 = Debug|Win32
{396FE85E-BB05-4B92-BCCB-F89AED4EA41A}.Debug|Win32.Deploy.0 = Debug|Win32
{396FE85E-BB05-4B92-BCCB-F89AED4EA41A}.Debug|x64.ActiveCfg = Debug|Win32
{396FE85E-BB05-4B92-BCCB-F89AED4EA41A}.Release|ARM.ActiveCfg = Release|ARM
{396FE85E-BB05-4B92-BCCB-F89AED4EA41A}.Release|ARM.Build.0 = Release|ARM
{396FE85E-BB05-4B92-BCCB-F89AED4EA41A}.Release|ARM.Deploy.0 = Release|ARM
{396FE85E-BB05-4B92-BCCB-F89AED4EA41A}.Release|Win32.ActiveCfg = Release|Win32
{396FE85E-BB05-4B92-BCCB-F89AED4EA41A}.Release|Win32.Build.0 = Release|Win32
{396FE85E-BB05-4B92-BCCB-F89AED4EA41A}.Release|Win32.Deploy.0 = Release|Win32
{396FE85E-BB05-4B92-BCCB-F89AED4EA41A}.Release|x64.ActiveCfg = Release|Win32
{70914FC8-7709-4CD6-B86B-C63FDE5478DB}.Debug|ARM.ActiveCfg = Debug|ARM
{70914FC8-7709-4CD6-B86B-C63FDE5478DB}.Debug|ARM.Build.0 = Debug|ARM
{70914FC8-7709-4CD6-B86B-C63FDE5478DB}.Debug|ARM.Deploy.0 = Debug|ARM
{70914FC8-7709-4CD6-B86B-C63FDE5478DB}.Debug|Win32.ActiveCfg = Debug|Win32
{70914FC8-7709-4CD6-B86B-C63FDE5478DB}.Debug|Win32.Build.0 = Debug|Win32
{70914FC8-7709-4CD6-B86B-C63FDE5478DB}.Debug|Win32.Deploy.0 = Debug|Win32
{70914FC8-7709-4CD6-B86B-C63FDE5478DB}.Debug|x64.ActiveCfg = Debug|x64
{70914FC8-7709-4CD6-B86B-C63FDE5478DB}.Debug|x64.Build.0 = Debug|x64
{70914FC8-7709-4CD6-B86B-C63FDE5478DB}.Debug|x64.Deploy.0 = Debug|x64
{70914FC8-7709-4CD6-B86B-C63FDE5478DB}.Release|ARM.ActiveCfg = Release|ARM
{70914FC8-7709-4CD6-B86B-C63FDE5478DB}.Release|ARM.Build.0 = Release|ARM
{70914FC8-7709-4CD6-B86B-C63FDE5478DB}.Release|ARM.Deploy.0 = Release|ARM
{70914FC8-7709-4CD6-B86B-C63FDE5478DB}.Release|Win32.ActiveCfg = Release|Win32
{70914FC8-7709-4CD6-B86B-C63FDE5478DB}.Release|Win32.Build.0 = Release|Win32
{70914FC8-7709-4CD6-B86B-C63FDE5478DB}.Release|Win32.Deploy.0 = Release|Win32
{70914FC8-7709-4CD6-B86B-C63FDE5478DB}.Release|x64.ActiveCfg = Release|x64
{70914FC8-7709-4CD6-B86B-C63FDE5478DB}.Release|x64.Build.0 = Release|x64
{70914FC8-7709-4CD6-B86B-C63FDE5478DB}.Release|x64.Deploy.0 = Release|x64
{94874B5B-398F-448A-A366-35A35DC1DB9C}.Debug|ARM.ActiveCfg = Debug|ARM
{94874B5B-398F-448A-A366-35A35DC1DB9C}.Debug|ARM.Build.0 = Debug|ARM
{94874B5B-398F-448A-A366-35A35DC1DB9C}.Debug|ARM.Deploy.0 = Debug|ARM
{94874B5B-398F-448A-A366-35A35DC1DB9C}.Debug|Win32.ActiveCfg = Debug|Win32
{94874B5B-398F-448A-A366-35A35DC1DB9C}.Debug|Win32.Build.0 = Debug|Win32
{94874B5B-398F-448A-A366-35A35DC1DB9C}.Debug|Win32.Deploy.0 = Debug|Win32
{94874B5B-398F-448A-A366-35A35DC1DB9C}.Debug|x64.ActiveCfg = Debug|Win32
{94874B5B-398F-448A-A366-35A35DC1DB9C}.Release|ARM.ActiveCfg = Release|ARM
{94874B5B-398F-448A-A366-35A35DC1DB9C}.Release|ARM.Build.0 = Release|ARM
{94874B5B-398F-448A-A366-35A35DC1DB9C}.Release|ARM.Deploy.0 = Release|ARM
{94874B5B-398F-448A-A366-35A35DC1DB9C}.Release|Win32.ActiveCfg = Release|Win32
{94874B5B-398F-448A-A366-35A35DC1DB9C}.Release|Win32.Build.0 = Release|Win32
{94874B5B-398F-448A-A366-35A35DC1DB9C}.Release|Win32.Deploy.0 = Release|Win32
{94874B5B-398F-448A-A366-35A35DC1DB9C}.Release|x64.ActiveCfg = Release|Win32
{BCF5546D-66A0-4998-AFD6-C5514F618930}.Debug|ARM.ActiveCfg = Debug|ARM
{BCF5546D-66A0-4998-AFD6-C5514F618930}.Debug|ARM.Build.0 = Debug|ARM
{BCF5546D-66A0-4998-AFD6-C5514F618930}.Debug|Win32.ActiveCfg = Debug|Win32
{BCF5546D-66A0-4998-AFD6-C5514F618930}.Debug|Win32.Build.0 = Debug|Win32
{BCF5546D-66A0-4998-AFD6-C5514F618930}.Debug|x64.ActiveCfg = Debug|x64
{BCF5546D-66A0-4998-AFD6-C5514F618930}.Debug|x64.Build.0 = Debug|x64
{BCF5546D-66A0-4998-AFD6-C5514F618930}.Release|ARM.ActiveCfg = Release|ARM
{BCF5546D-66A0-4998-AFD6-C5514F618930}.Release|ARM.Build.0 = Release|ARM
{BCF5546D-66A0-4998-AFD6-C5514F618930}.Release|Win32.ActiveCfg = Release|Win32
{BCF5546D-66A0-4998-AFD6-C5514F618930}.Release|Win32.Build.0 = Release|Win32
{BCF5546D-66A0-4998-AFD6-C5514F618930}.Release|x64.ActiveCfg = Release|x64
{BCF5546D-66A0-4998-AFD6-C5514F618930}.Release|x64.Build.0 = Release|x64
{CA082EC4-17CE-430B-8207-D1E947A5D1E9}.Debug|ARM.ActiveCfg = Debug|ARM
{CA082EC4-17CE-430B-8207-D1E947A5D1E9}.Debug|ARM.Build.0 = Debug|ARM
{CA082EC4-17CE-430B-8207-D1E947A5D1E9}.Debug|Win32.ActiveCfg = Debug|Win32
{CA082EC4-17CE-430B-8207-D1E947A5D1E9}.Debug|Win32.Build.0 = Debug|Win32
{CA082EC4-17CE-430B-8207-D1E947A5D1E9}.Debug|x64.ActiveCfg = Debug|Win32
{CA082EC4-17CE-430B-8207-D1E947A5D1E9}.Release|ARM.ActiveCfg = Release|ARM
{CA082EC4-17CE-430B-8207-D1E947A5D1E9}.Release|ARM.Build.0 = Release|ARM
{CA082EC4-17CE-430B-8207-D1E947A5D1E9}.Release|Win32.ActiveCfg = Release|Win32
{CA082EC4-17CE-430B-8207-D1E947A5D1E9}.Release|Win32.Build.0 = Release|Win32
{CA082EC4-17CE-430B-8207-D1E947A5D1E9}.Release|x64.ActiveCfg = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{5D6F020F-7E72-4494-90A0-2DF11D235DF9} = {B3F299D4-B4CA-4F0B-8BE2-FB328483BC13}
{9335005F-678E-4E8E-9B84-50037216AEC8} = {B3F299D4-B4CA-4F0B-8BE2-FB328483BC13}
{22F3B9DF-1209-4574-8331-003966F562BF} = {B3F299D4-B4CA-4F0B-8BE2-FB328483BC13}
{BE3A1791-5BCE-4CEA-92CD-0E2D86DDE27A} = {572742C5-9322-4548-AB8B-96C3750A1B5D}
{F2BAE06B-CAAE-43EE-B21B-57FA48DB04FA} = {572742C5-9322-4548-AB8B-96C3750A1B5D}
{15247C71-5289-4913-B88F-E253CC353720} = {572742C5-9322-4548-AB8B-96C3750A1B5D}
{B3D1A3D5-9F54-43AF-9322-230B53242B78} = {85630454-74EA-4B5B-9B62-0E459B4476CB}
{4A3C6BA8-C227-498B-AA21-40BDA27B461F} = {B3D1A3D5-9F54-43AF-9322-230B53242B78}
{3B26A12D-3A44-47EA-82D2-282660FC844D} = {B3D1A3D5-9F54-43AF-9322-230B53242B78}
{22F798D8-BFFF-4754-996F-A5395343D5EC} = {B3D1A3D5-9F54-43AF-9322-230B53242B78}
{6FEB795C-C98C-4C8C-A88B-A35DEE205348} = {85630454-74EA-4B5B-9B62-0E459B4476CB}
{ADAFD00D-A0D6-46EF-9F0B-EA2880BFE1DE} = {6FEB795C-C98C-4C8C-A88B-A35DEE205348}
{F3550FE0-C795-44F6-8FEB-093EB68143AE} = {6FEB795C-C98C-4C8C-A88B-A35DEE205348}
{CC1DA216-A80D-4BE4-B309-ACB6AF313AFF} = {6FEB795C-C98C-4C8C-A88B-A35DEE205348}
{A3AD93E4-0B2F-4C58-9181-69BED2E42E3E} = {B70EF25E-E352-4020-BCDF-388973E44637}
{79A8FCDA-4B12-4DD1-B676-FF148D651638} = {B70EF25E-E352-4020-BCDF-388973E44637}
{396FE85E-BB05-4B92-BCCB-F89AED4EA41A} = {B70EF25E-E352-4020-BCDF-388973E44637}
{AE6763F6-1549-441E-AFB5-377BE1C776DC} = {8E24A044-D83D-476D-886D-F40E3CC621DF}
{70914FC8-7709-4CD6-B86B-C63FDE5478DB} = {8E24A044-D83D-476D-886D-F40E3CC621DF}
{94874B5B-398F-448A-A366-35A35DC1DB9C} = {8E24A044-D83D-476D-886D-F40E3CC621DF}
{BEA66276-51DD-4C53-92A8-F3D1FEA50892} = {60DCAEA9-E344-40C0-B90C-82FB8E671BD5}
{BCF5546D-66A0-4998-AFD6-C5514F618930} = {60DCAEA9-E344-40C0-B90C-82FB8E671BD5}
{CA082EC4-17CE-430B-8207-D1E947A5D1E9} = {60DCAEA9-E344-40C0-B90C-82FB8E671BD5}
EndGlobalSection
EndGlobal

16
build/cocos2d-win32.vc2012.sln
View File

@ -21,10 +21,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSpine", "..\cocos\editor
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbox2d", "..\external\Box2D\proj.win32\libbox2d.vcxproj", "{929480E7-23C0-4DF6-8456-096D71547116}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjscocos2d", "..\cocos\scripting\js-bindings\proj.win32\libjscocos2d.vcxproj", "{39379840-825A-45A0-B363-C09FFEF864BD}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "js-tests", "..\tests\js-tests\project\proj.win32\js-tests.vcxproj", "{D0F06A44-A245-4D13-A498-0120C203B539}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|ARM = Debug|ARM
@ -81,18 +77,6 @@ Global
{929480E7-23C0-4DF6-8456-096D71547116}.Release|ARM.ActiveCfg = Release|Win32
{929480E7-23C0-4DF6-8456-096D71547116}.Release|Win32.ActiveCfg = Release|Win32
{929480E7-23C0-4DF6-8456-096D71547116}.Release|Win32.Build.0 = Release|Win32
{39379840-825A-45A0-B363-C09FFEF864BD}.Debug|ARM.ActiveCfg = Debug|Win32
{39379840-825A-45A0-B363-C09FFEF864BD}.Debug|Win32.ActiveCfg = Debug|Win32
{39379840-825A-45A0-B363-C09FFEF864BD}.Debug|Win32.Build.0 = Debug|Win32
{39379840-825A-45A0-B363-C09FFEF864BD}.Release|ARM.ActiveCfg = Release|Win32
{39379840-825A-45A0-B363-C09FFEF864BD}.Release|Win32.ActiveCfg = Release|Win32
{39379840-825A-45A0-B363-C09FFEF864BD}.Release|Win32.Build.0 = Release|Win32
{D0F06A44-A245-4D13-A498-0120C203B539}.Debug|ARM.ActiveCfg = Debug|Win32
{D0F06A44-A245-4D13-A498-0120C203B539}.Debug|Win32.ActiveCfg = Debug|Win32
{D0F06A44-A245-4D13-A498-0120C203B539}.Debug|Win32.Build.0 = Debug|Win32
{D0F06A44-A245-4D13-A498-0120C203B539}.Release|ARM.ActiveCfg = Release|Win32
{D0F06A44-A245-4D13-A498-0120C203B539}.Release|Win32.ActiveCfg = Release|Win32
{D0F06A44-A245-4D13-A498-0120C203B539}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

82
build/cocos2d-win8.1-universal.sln
View File

@ -45,39 +45,17 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloCpp.Windows", "..\test
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloCpp.WindowsPhone", "..\tests\cpp-empty-test\proj.win8.1-universal\HelloCpp.WindowsPhone\HelloCpp.WindowsPhone.vcxproj", "{396FE85E-BB05-4B92-BCCB-F89AED4EA41A}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libjscocos2d", "libjscocos2d", "{151000C9-1FF6-4190-8B3C-EC5DA3C7763D}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjscocos2d.Shared", "..\cocos\scripting\js-bindings\proj.win8.1-universal\libjscocos2d\libjscocos2d.Shared\libjscocos2d.Shared.vcxitems", "{BEA66276-51DD-4C53-92A8-F3D1FEA50892}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjscocos2d.Windows", "..\cocos\scripting\js-bindings\proj.win8.1-universal\libjscocos2d\libjscocos2d.Windows\libjscocos2d.Windows.vcxproj", "{BCF5546D-66A0-4998-AFD6-C5514F618930}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjscocos2d.WindowsPhone", "..\cocos\scripting\js-bindings\proj.win8.1-universal\libjscocos2d\libjscocos2d.WindowsPhone\libjscocos2d.WindowsPhone.vcxproj", "{CA082EC4-17CE-430B-8207-D1E947A5D1E9}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "js-tests", "js-tests", "{616DCDB6-4727-422A-9CD8-50F27228B237}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "js-tests.Shared", "..\tests\js-tests\project\proj.win8.1-universal\App.Shared\js-tests.Shared.vcxitems", "{AE6763F6-1549-441E-AFB5-377BE1C776DC}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "js-tests.Windows", "..\tests\js-tests\project\proj.win8.1-universal\App.Windows\js-tests.Windows.vcxproj", "{70914FC8-7709-4CD6-B86B-C63FDE5478DB}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "js-tests.WindowsPhone", "..\tests\js-tests\project\proj.win8.1-universal\App.WindowsPhone\js-tests.WindowsPhone.vcxproj", "{94874B5B-398F-448A-A366-35A35DC1DB9C}"
EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
..\tests\js-tests\project\proj.win8.1-universal\App.Shared\js-tests.Shared.vcxitems*{ae6763f6-1549-441e-afb5-377be1c776dc}*SharedItemsImports = 9
..\tests\js-tests\project\proj.win8.1-universal\App.Shared\js-tests.Shared.vcxitems*{94874b5b-398f-448a-a366-35a35dc1db9c}*SharedItemsImports = 4
..\cocos\2d\libcocos2d_8_1\libcocos2d_8_1\libcocos2d_8_1.Shared\libcocos2d_8_1.Shared.vcxitems*{9335005f-678e-4e8e-9b84-50037216aec8}*SharedItemsImports = 4
..\tests\cpp-tests\proj.win8.1-universal\cpp-tests.Shared\cpp-tests.Shared.vcxitems*{15247c71-5289-4913-b88f-e253cc353720}*SharedItemsImports = 4
..\tests\cpp-empty-test\proj.win8.1-universal\HelloCpp.Shared\HelloCpp.Shared.vcxitems*{a3ad93e4-0b2f-4c58-9181-69bed2e42e3e}*SharedItemsImports = 9
..\tests\js-tests\project\proj.win8.1-universal\App.Shared\js-tests.Shared.vcxitems*{70914fc8-7709-4cd6-b86b-c63fde5478db}*SharedItemsImports = 4
..\cocos\editor-support\spine\proj.win8.1-universal\libSpine.Shared\libSpine.Shared.vcxitems*{cc1da216-a80d-4be4-b309-acb6af313aff}*SharedItemsImports = 4
..\external\Box2D\proj.win8.1-universal\libbox2d.Shared\libbox2d.Shared.vcxitems*{4a3c6ba8-c227-498b-aa21-40bda27b461f}*SharedItemsImports = 9
..\tests\cpp-empty-test\proj.win8.1-universal\HelloCpp.Shared\HelloCpp.Shared.vcxitems*{79a8fcda-4b12-4dd1-b676-ff148d651638}*SharedItemsImports = 4
..\cocos\editor-support\spine\proj.win8.1-universal\libSpine.Shared\libSpine.Shared.vcxitems*{adafd00d-a0d6-46ef-9f0b-ea2880bfe1de}*SharedItemsImports = 9
..\tests\cpp-tests\proj.win8.1-universal\cpp-tests.Shared\cpp-tests.Shared.vcxitems*{be3a1791-5bce-4cea-92cd-0e2d86dde27a}*SharedItemsImports = 9
..\cocos\scripting\js-bindings\proj.win8.1-universal\libjscocos2d\libjscocos2d.Shared\libjscocos2d.Shared.vcxitems*{ca082ec4-17ce-430b-8207-d1e947a5d1e9}*SharedItemsImports = 4
..\cocos\2d\libcocos2d_8_1\libcocos2d_8_1\libcocos2d_8_1.Shared\libcocos2d_8_1.Shared.vcxitems*{5d6f020f-7e72-4494-90a0-2df11d235df9}*SharedItemsImports = 9
..\cocos\scripting\js-bindings\proj.win8.1-universal\libjscocos2d\libjscocos2d.Shared\libjscocos2d.Shared.vcxitems*{bea66276-51dd-4c53-92a8-f3d1fea50892}*SharedItemsImports = 9
..\cocos\scripting\js-bindings\proj.win8.1-universal\libjscocos2d\libjscocos2d.Shared\libjscocos2d.Shared.vcxitems*{bcf5546d-66a0-4998-afd6-c5514f618930}*SharedItemsImports = 4
..\external\Box2D\proj.win8.1-universal\libbox2d.Shared\libbox2d.Shared.vcxitems*{3b26a12d-3a44-47ea-82d2-282660fc844d}*SharedItemsImports = 4
..\cocos\2d\libcocos2d_8_1\libcocos2d_8_1\libcocos2d_8_1.Shared\libcocos2d_8_1.Shared.vcxitems*{22f3b9df-1209-4574-8331-003966f562bf}*SharedItemsImports = 4
..\external\Box2D\proj.win8.1-universal\libbox2d.Shared\libbox2d.Shared.vcxitems*{22f798d8-bfff-4754-996f-a5395343d5ec}*SharedItemsImports = 4
@ -224,60 +202,6 @@ Global
{396FE85E-BB05-4B92-BCCB-F89AED4EA41A}.Release|Win32.Build.0 = Release|Win32
{396FE85E-BB05-4B92-BCCB-F89AED4EA41A}.Release|Win32.Deploy.0 = Release|Win32
{396FE85E-BB05-4B92-BCCB-F89AED4EA41A}.Release|x64.ActiveCfg = Release|Win32
{BCF5546D-66A0-4998-AFD6-C5514F618930}.Debug|ARM.ActiveCfg = Debug|ARM
{BCF5546D-66A0-4998-AFD6-C5514F618930}.Debug|ARM.Build.0 = Debug|ARM
{BCF5546D-66A0-4998-AFD6-C5514F618930}.Debug|Win32.ActiveCfg = Debug|Win32
{BCF5546D-66A0-4998-AFD6-C5514F618930}.Debug|Win32.Build.0 = Debug|Win32
{BCF5546D-66A0-4998-AFD6-C5514F618930}.Debug|x64.ActiveCfg = Debug|x64
{BCF5546D-66A0-4998-AFD6-C5514F618930}.Debug|x64.Build.0 = Debug|x64
{BCF5546D-66A0-4998-AFD6-C5514F618930}.Release|ARM.ActiveCfg = Release|ARM
{BCF5546D-66A0-4998-AFD6-C5514F618930}.Release|ARM.Build.0 = Release|ARM
{BCF5546D-66A0-4998-AFD6-C5514F618930}.Release|Win32.ActiveCfg = Release|Win32
{BCF5546D-66A0-4998-AFD6-C5514F618930}.Release|Win32.Build.0 = Release|Win32
{BCF5546D-66A0-4998-AFD6-C5514F618930}.Release|x64.ActiveCfg = Release|x64
{BCF5546D-66A0-4998-AFD6-C5514F618930}.Release|x64.Build.0 = Release|x64
{CA082EC4-17CE-430B-8207-D1E947A5D1E9}.Debug|ARM.ActiveCfg = Debug|ARM
{CA082EC4-17CE-430B-8207-D1E947A5D1E9}.Debug|ARM.Build.0 = Debug|ARM
{CA082EC4-17CE-430B-8207-D1E947A5D1E9}.Debug|Win32.ActiveCfg = Debug|Win32
{CA082EC4-17CE-430B-8207-D1E947A5D1E9}.Debug|Win32.Build.0 = Debug|Win32
{CA082EC4-17CE-430B-8207-D1E947A5D1E9}.Debug|x64.ActiveCfg = Debug|Win32
{CA082EC4-17CE-430B-8207-D1E947A5D1E9}.Release|ARM.ActiveCfg = Release|ARM
{CA082EC4-17CE-430B-8207-D1E947A5D1E9}.Release|ARM.Build.0 = Release|ARM
{CA082EC4-17CE-430B-8207-D1E947A5D1E9}.Release|Win32.ActiveCfg = Release|Win32
{CA082EC4-17CE-430B-8207-D1E947A5D1E9}.Release|Win32.Build.0 = Release|Win32
{CA082EC4-17CE-430B-8207-D1E947A5D1E9}.Release|x64.ActiveCfg = Release|Win32
{70914FC8-7709-4CD6-B86B-C63FDE5478DB}.Debug|ARM.ActiveCfg = Debug|ARM
{70914FC8-7709-4CD6-B86B-C63FDE5478DB}.Debug|ARM.Build.0 = Debug|ARM
{70914FC8-7709-4CD6-B86B-C63FDE5478DB}.Debug|ARM.Deploy.0 = Debug|ARM
{70914FC8-7709-4CD6-B86B-C63FDE5478DB}.Debug|Win32.ActiveCfg = Debug|Win32
{70914FC8-7709-4CD6-B86B-C63FDE5478DB}.Debug|Win32.Build.0 = Debug|Win32
{70914FC8-7709-4CD6-B86B-C63FDE5478DB}.Debug|Win32.Deploy.0 = Debug|Win32
{70914FC8-7709-4CD6-B86B-C63FDE5478DB}.Debug|x64.ActiveCfg = Debug|x64
{70914FC8-7709-4CD6-B86B-C63FDE5478DB}.Debug|x64.Build.0 = Debug|x64
{70914FC8-7709-4CD6-B86B-C63FDE5478DB}.Debug|x64.Deploy.0 = Debug|x64
{70914FC8-7709-4CD6-B86B-C63FDE5478DB}.Release|ARM.ActiveCfg = Release|ARM
{70914FC8-7709-4CD6-B86B-C63FDE5478DB}.Release|ARM.Build.0 = Release|ARM
{70914FC8-7709-4CD6-B86B-C63FDE5478DB}.Release|ARM.Deploy.0 = Release|ARM
{70914FC8-7709-4CD6-B86B-C63FDE5478DB}.Release|Win32.ActiveCfg = Release|Win32
{70914FC8-7709-4CD6-B86B-C63FDE5478DB}.Release|Win32.Build.0 = Release|Win32
{70914FC8-7709-4CD6-B86B-C63FDE5478DB}.Release|Win32.Deploy.0 = Release|Win32
{70914FC8-7709-4CD6-B86B-C63FDE5478DB}.Release|x64.ActiveCfg = Release|x64
{70914FC8-7709-4CD6-B86B-C63FDE5478DB}.Release|x64.Build.0 = Release|x64
{70914FC8-7709-4CD6-B86B-C63FDE5478DB}.Release|x64.Deploy.0 = Release|x64
{94874B5B-398F-448A-A366-35A35DC1DB9C}.Debug|ARM.ActiveCfg = Debug|ARM
{94874B5B-398F-448A-A366-35A35DC1DB9C}.Debug|ARM.Build.0 = Debug|ARM
{94874B5B-398F-448A-A366-35A35DC1DB9C}.Debug|ARM.Deploy.0 = Debug|ARM
{94874B5B-398F-448A-A366-35A35DC1DB9C}.Debug|Win32.ActiveCfg = Debug|Win32
{94874B5B-398F-448A-A366-35A35DC1DB9C}.Debug|Win32.Build.0 = Debug|Win32
{94874B5B-398F-448A-A366-35A35DC1DB9C}.Debug|Win32.Deploy.0 = Debug|Win32
{94874B5B-398F-448A-A366-35A35DC1DB9C}.Debug|x64.ActiveCfg = Debug|Win32
{94874B5B-398F-448A-A366-35A35DC1DB9C}.Release|ARM.ActiveCfg = Release|ARM
{94874B5B-398F-448A-A366-35A35DC1DB9C}.Release|ARM.Build.0 = Release|ARM
{94874B5B-398F-448A-A366-35A35DC1DB9C}.Release|ARM.Deploy.0 = Release|ARM
{94874B5B-398F-448A-A366-35A35DC1DB9C}.Release|Win32.ActiveCfg = Release|Win32
{94874B5B-398F-448A-A366-35A35DC1DB9C}.Release|Win32.Build.0 = Release|Win32
{94874B5B-398F-448A-A366-35A35DC1DB9C}.Release|Win32.Deploy.0 = Release|Win32
{94874B5B-398F-448A-A366-35A35DC1DB9C}.Release|x64.ActiveCfg = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@ -300,11 +224,5 @@ Global
{A3AD93E4-0B2F-4C58-9181-69BED2E42E3E} = {B70EF25E-E352-4020-BCDF-388973E44637}
{79A8FCDA-4B12-4DD1-B676-FF148D651638} = {B70EF25E-E352-4020-BCDF-388973E44637}
{396FE85E-BB05-4B92-BCCB-F89AED4EA41A} = {B70EF25E-E352-4020-BCDF-388973E44637}
{BEA66276-51DD-4C53-92A8-F3D1FEA50892} = {151000C9-1FF6-4190-8B3C-EC5DA3C7763D}
{BCF5546D-66A0-4998-AFD6-C5514F618930} = {151000C9-1FF6-4190-8B3C-EC5DA3C7763D}
{CA082EC4-17CE-430B-8207-D1E947A5D1E9} = {151000C9-1FF6-4190-8B3C-EC5DA3C7763D}
{AE6763F6-1549-441E-AFB5-377BE1C776DC} = {616DCDB6-4727-422A-9CD8-50F27228B237}
{70914FC8-7709-4CD6-B86B-C63FDE5478DB} = {616DCDB6-4727-422A-9CD8-50F27228B237}
{94874B5B-398F-448A-A366-35A35DC1DB9C} = {616DCDB6-4727-422A-9CD8-50F27228B237}
EndGlobalSection
EndGlobal

845
build/cocos2d_jsb_samples.xcodeproj/project.pbxproj Normal file
View File

@ -0,0 +1,845 @@
// !$*UTF8*$!
{
archiveVersion = 1;
classes = {
};
objectVersion = 46;
objects = {
/* Begin PBXBuildFile section */
0541A76319738D8C00E45470 /* NativeOcClass.m in Sources */ = {isa = PBXBuildFile; fileRef = 0541A75D19738D5A00E45470 /* NativeOcClass.m */; };
0541A77819750DE700E45470 /* NativeOcClass.m in Sources */ = {isa = PBXBuildFile; fileRef = 0541A75D19738D5A00E45470 /* NativeOcClass.m */; };
0541A77A19750F7A00E45470 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0541A77919750F7A00E45470 /* AppKit.framework */; };
1A604F3418BF1D4900CC9A93 /* src in Resources */ = {isa = PBXBuildFile; fileRef = 1A604F3118BF1D4900CC9A93 /* src */; };
1A604F3518BF1D4900CC9A93 /* src in Resources */ = {isa = PBXBuildFile; fileRef = 1A604F3118BF1D4900CC9A93 /* src */; };
1A604F3918BF1D5600CC9A93 /* AppDelegate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A604F3718BF1D5600CC9A93 /* AppDelegate.cpp */; };
1A604F3A18BF1D5600CC9A93 /* AppDelegate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A604F3718BF1D5600CC9A93 /* AppDelegate.cpp */; };
1A604F4D18BF1D6000CC9A93 /* AppController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A604F3D18BF1D6000CC9A93 /* AppController.mm */; };
1A604F4E18BF1D6000CC9A93 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1A604F3E18BF1D6000CC9A93 /* Default-568h@2x.png */; };
1A604F4F18BF1D6000CC9A93 /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 1A604F3F18BF1D6000CC9A93 /* Default.png */; };
1A604F5018BF1D6000CC9A93 /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1A604F4018BF1D6000CC9A93 /* Default@2x.png */; };
1A604F5118BF1D6000CC9A93 /* Icon-114.png in Resources */ = {isa = PBXBuildFile; fileRef = 1A604F4118BF1D6000CC9A93 /* Icon-114.png */; };
1A604F5218BF1D6000CC9A93 /* Icon-120.png in Resources */ = {isa = PBXBuildFile; fileRef = 1A604F4218BF1D6000CC9A93 /* Icon-120.png */; };
1A604F5318BF1D6000CC9A93 /* Icon-144.png in Resources */ = {isa = PBXBuildFile; fileRef = 1A604F4318BF1D6000CC9A93 /* Icon-144.png */; };
1A604F5418BF1D6000CC9A93 /* Icon-152.png in Resources */ = {isa = PBXBuildFile; fileRef = 1A604F4418BF1D6000CC9A93 /* Icon-152.png */; };
1A604F5518BF1D6000CC9A93 /* Icon-57.png in Resources */ = {isa = PBXBuildFile; fileRef = 1A604F4518BF1D6000CC9A93 /* Icon-57.png */; };
1A604F5618BF1D6000CC9A93 /* Icon-72.png in Resources */ = {isa = PBXBuildFile; fileRef = 1A604F4618BF1D6000CC9A93 /* Icon-72.png */; };
1A604F5718BF1D6000CC9A93 /* Icon-76.png in Resources */ = {isa = PBXBuildFile; fileRef = 1A604F4718BF1D6000CC9A93 /* Icon-76.png */; };
1A604F5918BF1D6000CC9A93 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 1A604F4918BF1D6000CC9A93 /* main.m */; };
1A604F5A18BF1D6000CC9A93 /* RootViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A604F4C18BF1D6000CC9A93 /* RootViewController.mm */; };
1A604F6418BF1D6600CC9A93 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 1A604F5C18BF1D6600CC9A93 /* InfoPlist.strings */; };
1A604F6518BF1D6600CC9A93 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1A604F5E18BF1D6600CC9A93 /* MainMenu.xib */; };
1A604F6618BF1D6600CC9A93 /* Icon.icns in Resources */ = {isa = PBXBuildFile; fileRef = 1A604F6018BF1D6600CC9A93 /* Icon.icns */; };
1A604F6718BF1D6600CC9A93 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A604F6118BF1D6600CC9A93 /* main.cpp */; };
420BBD111AA8840E00493976 /* js_DrawNode3D_bindings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 420BBD0F1AA8840E00493976 /* js_DrawNode3D_bindings.cpp */; };
420BBD121AA8840E00493976 /* js_DrawNode3D_bindings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 420BBD0F1AA8840E00493976 /* js_DrawNode3D_bindings.cpp */; };
42BCD4A31AAF3BF500D035E5 /* js_Effect3D_bindings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 42BCD4A11AAF3BF500D035E5 /* js_Effect3D_bindings.cpp */; };
42BCD4A41AAF3BF500D035E5 /* js_Effect3D_bindings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 42BCD4A11AAF3BF500D035E5 /* js_Effect3D_bindings.cpp */; };
A01E18F81784C59400B0CA4A /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A035A71117822E9E00987F6C /* libsqlite3.dylib */; };
A035A5E01782290400987F6C /* libcurl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A9F808C177E98A600D9A1CB /* libcurl.dylib */; };
A035A71217822E9E00987F6C /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A035A71117822E9E00987F6C /* libsqlite3.dylib */; };
BA0613B51AC23B2D003118D6 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BA0613B41AC23B2D003118D6 /* Security.framework */; };
BA2350551948262700E17B2A /* script in Resources */ = {isa = PBXBuildFile; fileRef = BA2350541948262700E17B2A /* script */; };
BA2350561948262700E17B2A /* script in Resources */ = {isa = PBXBuildFile; fileRef = BA2350541948262700E17B2A /* script */; };
BAA7DEE418C84F5000D9A10E /* main.js in Resources */ = {isa = PBXBuildFile; fileRef = BAA7DEE218C84F5000D9A10E /* main.js */; };
BAA7DEE518C84F5000D9A10E /* main.js in Resources */ = {isa = PBXBuildFile; fileRef = BAA7DEE218C84F5000D9A10E /* main.js */; };
BAA7DEE618C84F5000D9A10E /* project.json in Resources */ = {isa = PBXBuildFile; fileRef = BAA7DEE318C84F5000D9A10E /* project.json */; };
BAA7DEE718C84F5000D9A10E /* project.json in Resources */ = {isa = PBXBuildFile; fileRef = BAA7DEE318C84F5000D9A10E /* project.json */; };
ED2719A21AE4F4F000C17085 /* GameController.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ED2719A11AE4F4F000C17085 /* GameController.framework */; };
ED2719A41AE4F51F00C17085 /* StoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ED2719A31AE4F51F00C17085 /* StoreKit.framework */; };
ED2719A61AE4F52F00C17085 /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ED2719A51AE4F52E00C17085 /* CoreTelephony.framework */; };
ED2719A81AE4F53B00C17085 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ED2719A71AE4F53B00C17085 /* Security.framework */; };
ED2719AA1AE4F54500C17085 /* MediaPlayer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ED2719A91AE4F54500C17085 /* MediaPlayer.framework */; };
ED2719AC1AE4F55000C17085 /* MessageUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ED2719AB1AE4F55000C17085 /* MessageUI.framework */; };
ED2719AE1AE4F55800C17085 /* AdSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ED2719AD1AE4F55800C17085 /* AdSupport.framework */; };
ED2719B01AE4F56500C17085 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ED2719AF1AE4F56500C17085 /* SystemConfiguration.framework */; };
ED2719B21AE4F57200C17085 /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ED2719B11AE4F57100C17085 /* CoreMotion.framework */; };
ED2719B41AE4F57E00C17085 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = ED2719B31AE4F57E00C17085 /* libz.dylib */; };
ED2719B61AE4F59500C17085 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ED2719B51AE4F59500C17085 /* Foundation.framework */; };
ED2719B81AE4F5A100C17085 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ED2719B71AE4F5A100C17085 /* AudioToolbox.framework */; };
ED2719BA1AE4F5A900C17085 /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ED2719B91AE4F5A900C17085 /* OpenAL.framework */; };
ED2719BC1AE4F5B500C17085 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ED2719BB1AE4F5B500C17085 /* QuartzCore.framework */; };
ED2719BE1AE4F5BE00C17085 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ED2719BD1AE4F5BE00C17085 /* CoreGraphics.framework */; };
ED2719C01AE4F5C500C17085 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ED2719BF1AE4F5C500C17085 /* OpenGLES.framework */; };
ED2719C21AE4F5CC00C17085 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ED2719C11AE4F5CC00C17085 /* UIKit.framework */; };
ED2719C41AE4F5D300C17085 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ED2719C31AE4F5D300C17085 /* AVFoundation.framework */; };
ED2719C61AE4F60C00C17085 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = ED2719C51AE4F60C00C17085 /* libz.dylib */; };
ED2719C81AE4F61600C17085 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ED2719C71AE4F61500C17085 /* Foundation.framework */; };
ED2719CA1AE4F61D00C17085 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ED2719C91AE4F61D00C17085 /* AudioToolbox.framework */; };
ED2719CC1AE4F62A00C17085 /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ED2719CB1AE4F62A00C17085 /* ApplicationServices.framework */; };
ED2719CE1AE4F63200C17085 /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ED2719CD1AE4F63200C17085 /* OpenAL.framework */; };
ED2719D01AE4F63D00C17085 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ED2719CF1AE4F63D00C17085 /* QuartzCore.framework */; };
ED2719D21AE4F64600C17085 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ED2719D11AE4F64600C17085 /* OpenGL.framework */; };
ED2719D41AE4F64D00C17085 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ED2719D31AE4F64D00C17085 /* Cocoa.framework */; };
ED2719D51AE4F86500C17085 /* libjscocos2d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ED2719611AE4E69800C17085 /* libjscocos2d iOS.a */; };
ED2719DA1AE4F8EB00C17085 /* libcocos2d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ED2719591AE4E68200C17085 /* libcocos2d iOS.a */; };
ED2719DB1AE4FA1200C17085 /* libcocos2d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ED2719571AE4E68200C17085 /* libcocos2d Mac.a */; };
ED2719DC1AE4FA1600C17085 /* libjscocos2d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ED27195F1AE4E69800C17085 /* libjscocos2d Mac.a */; };
ED743D1717D099F10004076B /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EDCC747E17C455FD007B692C /* IOKit.framework */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
ED2719561AE4E68200C17085 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1A604F0218BF1D1C00CC9A93 /* cocos2d_libs.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 1551A33F158F2AB200E66CFE;
remoteInfo = "libcocos2d Mac";
};
ED2719581AE4E68200C17085 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1A604F0218BF1D1C00CC9A93 /* cocos2d_libs.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = A07A4D641783777C0073F6A7;
remoteInfo = "libcocos2d iOS";
};
ED27195E1AE4E69800C17085 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1A604F2518BF1D2000CC9A93 /* cocos2d_js_bindings.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 1A5410A418B785A10016A3AF;
remoteInfo = "libjscocos2d Mac";
};
ED2719601AE4E69800C17085 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1A604F2518BF1D2000CC9A93 /* cocos2d_js_bindings.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 1A5410A518B785A10016A3AF;
remoteInfo = "libjscocos2d iOS";
};
ED2719941AE4F14A00C17085 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1A604F2518BF1D2000CC9A93 /* cocos2d_js_bindings.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = A07A4FB5178387750073F6A7;
remoteInfo = "libjscocos2d iOS";
};
ED2719961AE4F15100C17085 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1A604F0218BF1D1C00CC9A93 /* cocos2d_libs.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 1551A33E158F2AB200E66CFE;
remoteInfo = "libcocos2d Mac";
};
ED2719981AE4F15800C17085 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1A604F2518BF1D2000CC9A93 /* cocos2d_js_bindings.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = A03F31E81781479B006731B9;
remoteInfo = "libjscocos2d Mac";
};
ED27199E1AE4F48800C17085 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1A604F0218BF1D1C00CC9A93 /* cocos2d_libs.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = A07A4C241783777C0073F6A7;
remoteInfo = "libcocos2d iOS";
};
/* End PBXContainerItemProxy section */
/* Begin PBXFileReference section */
0541A75C19738D5A00E45470 /* NativeOcClass.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NativeOcClass.h; path = ../proj.ios/NativeOcClass.h; sourceTree = "<group>"; };
0541A75D19738D5A00E45470 /* NativeOcClass.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NativeOcClass.m; path = ../proj.ios/NativeOcClass.m; sourceTree = "<group>"; };
0541A77919750F7A00E45470 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
1A604F0218BF1D1C00CC9A93 /* cocos2d_libs.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; path = cocos2d_libs.xcodeproj; sourceTree = "<group>"; };
1A604F2518BF1D2000CC9A93 /* cocos2d_js_bindings.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = cocos2d_js_bindings.xcodeproj; path = "../cocos/scripting/js-bindings/proj.ios_mac/cocos2d_js_bindings.xcodeproj"; sourceTree = "<group>"; };
1A604F3118BF1D4900CC9A93 /* src */ = {isa = PBXFileReference; lastKnownFileType = folder; name = src; path = "../tests/js-tests/src"; sourceTree = "<group>"; };
1A604F3718BF1D5600CC9A93 /* AppDelegate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AppDelegate.cpp; sourceTree = "<group>"; };
1A604F3818BF1D5600CC9A93 /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
1A604F3C18BF1D6000CC9A93 /* AppController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppController.h; sourceTree = "<group>"; };
1A604F3D18BF1D6000CC9A93 /* AppController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AppController.mm; sourceTree = "<group>"; };
1A604F3E18BF1D6000CC9A93 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
1A604F3F18BF1D6000CC9A93 /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = "<group>"; };
1A604F4018BF1D6000CC9A93 /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default@2x.png"; sourceTree = "<group>"; };
1A604F4118BF1D6000CC9A93 /* Icon-114.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-114.png"; sourceTree = "<group>"; };
1A604F4218BF1D6000CC9A93 /* Icon-120.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-120.png"; sourceTree = "<group>"; };
1A604F4318BF1D6000CC9A93 /* Icon-144.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-144.png"; sourceTree = "<group>"; };
1A604F4418BF1D6000CC9A93 /* Icon-152.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-152.png"; sourceTree = "<group>"; };
1A604F4518BF1D6000CC9A93 /* Icon-57.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-57.png"; sourceTree = "<group>"; };
1A604F4618BF1D6000CC9A93 /* Icon-72.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-72.png"; sourceTree = "<group>"; };
1A604F4718BF1D6000CC9A93 /* Icon-76.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-76.png"; sourceTree = "<group>"; };
1A604F4818BF1D6000CC9A93 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
1A604F4918BF1D6000CC9A93 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
1A604F4A18BF1D6000CC9A93 /* Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Prefix.pch; sourceTree = "<group>"; };
1A604F4B18BF1D6000CC9A93 /* RootViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RootViewController.h; sourceTree = "<group>"; };
1A604F4C18BF1D6000CC9A93 /* RootViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RootViewController.mm; sourceTree = "<group>"; };
1A604F5D18BF1D6600CC9A93 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
1A604F5F18BF1D6600CC9A93 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/MainMenu.xib; sourceTree = "<group>"; };
1A604F6018BF1D6600CC9A93 /* Icon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = Icon.icns; sourceTree = "<group>"; };
1A604F6118BF1D6600CC9A93 /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = "<group>"; };
1A604F6218BF1D6600CC9A93 /* Test_Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Test_Info.plist; sourceTree = "<group>"; };
1A604F6318BF1D6600CC9A93 /* Test_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Test_Prefix.pch; sourceTree = "<group>"; };
1A9F808C177E98A600D9A1CB /* libcurl.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcurl.dylib; path = usr/lib/libcurl.dylib; sourceTree = SDKROOT; };
420BBD0F1AA8840E00493976 /* js_DrawNode3D_bindings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = js_DrawNode3D_bindings.cpp; sourceTree = "<group>"; };
420BBD101AA8840E00493976 /* js_DrawNode3D_bindings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = js_DrawNode3D_bindings.h; sourceTree = "<group>"; };
42BCD4A11AAF3BF500D035E5 /* js_Effect3D_bindings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = js_Effect3D_bindings.cpp; sourceTree = "<group>"; };
42BCD4A21AAF3BF500D035E5 /* js_Effect3D_bindings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = js_Effect3D_bindings.h; sourceTree = "<group>"; };
A01E17721784C06E00B0CA4A /* js-tests iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "js-tests iOS.app"; sourceTree = BUILT_PRODUCTS_DIR; };
A035A5EC1782290400987F6C /* js-tests Mac.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "js-tests Mac.app"; sourceTree = BUILT_PRODUCTS_DIR; };
A035A71117822E9E00987F6C /* libsqlite3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsqlite3.dylib; path = usr/lib/libsqlite3.dylib; sourceTree = SDKROOT; };
BA0613B41AC23B2D003118D6 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
BA2350541948262700E17B2A /* script */ = {isa = PBXFileReference; lastKnownFileType = text; name = script; path = "../cocos/scripting/js-bindings/script"; sourceTree = "<group>"; };
BAA7DEE218C84F5000D9A10E /* main.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = main.js; path = "../tests/js-tests/main.js"; sourceTree = "<group>"; };
BAA7DEE318C84F5000D9A10E /* project.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = project.json; path = "../tests/js-tests/project.json"; sourceTree = "<group>"; };
ED2719A11AE4F4F000C17085 /* GameController.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GameController.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS8.3.sdk/System/Library/Frameworks/GameController.framework; sourceTree = DEVELOPER_DIR; };
ED2719A31AE4F51F00C17085 /* StoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = StoreKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS8.3.sdk/System/Library/Frameworks/StoreKit.framework; sourceTree = DEVELOPER_DIR; };
ED2719A51AE4F52E00C17085 /* CoreTelephony.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreTelephony.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS8.3.sdk/System/Library/Frameworks/CoreTelephony.framework; sourceTree = DEVELOPER_DIR; };
ED2719A71AE4F53B00C17085 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS8.3.sdk/System/Library/Frameworks/Security.framework; sourceTree = DEVELOPER_DIR; };
ED2719A91AE4F54500C17085 /* MediaPlayer.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MediaPlayer.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS8.3.sdk/System/Library/Frameworks/MediaPlayer.framework; sourceTree = DEVELOPER_DIR; };
ED2719AB1AE4F55000C17085 /* MessageUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MessageUI.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS8.3.sdk/System/Library/Frameworks/MessageUI.framework; sourceTree = DEVELOPER_DIR; };
ED2719AD1AE4F55800C17085 /* AdSupport.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AdSupport.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS8.3.sdk/System/Library/Frameworks/AdSupport.framework; sourceTree = DEVELOPER_DIR; };
ED2719AF1AE4F56500C17085 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS8.3.sdk/System/Library/Frameworks/SystemConfiguration.framework; sourceTree = DEVELOPER_DIR; };
ED2719B11AE4F57100C17085 /* CoreMotion.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMotion.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS8.3.sdk/System/Library/Frameworks/CoreMotion.framework; sourceTree = DEVELOPER_DIR; };
ED2719B31AE4F57E00C17085 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS8.3.sdk/usr/lib/libz.dylib; sourceTree = DEVELOPER_DIR; };
ED2719B51AE4F59500C17085 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS8.3.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; };
ED2719B71AE4F5A100C17085 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS8.3.sdk/System/Library/Frameworks/AudioToolbox.framework; sourceTree = DEVELOPER_DIR; };
ED2719B91AE4F5A900C17085 /* OpenAL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenAL.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS8.3.sdk/System/Library/Frameworks/OpenAL.framework; sourceTree = DEVELOPER_DIR; };
ED2719BB1AE4F5B500C17085 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS8.3.sdk/System/Library/Frameworks/QuartzCore.framework; sourceTree = DEVELOPER_DIR; };
ED2719BD1AE4F5BE00C17085 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS8.3.sdk/System/Library/Frameworks/CoreGraphics.framework; sourceTree = DEVELOPER_DIR; };
ED2719BF1AE4F5C500C17085 /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS8.3.sdk/System/Library/Frameworks/OpenGLES.framework; sourceTree = DEVELOPER_DIR; };
ED2719C11AE4F5CC00C17085 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS8.3.sdk/System/Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; };
ED2719C31AE4F5D300C17085 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS8.3.sdk/System/Library/Frameworks/AVFoundation.framework; sourceTree = DEVELOPER_DIR; };
ED2719C51AE4F60C00C17085 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
ED2719C71AE4F61500C17085 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
ED2719C91AE4F61D00C17085 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
ED2719CB1AE4F62A00C17085 /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = System/Library/Frameworks/ApplicationServices.framework; sourceTree = SDKROOT; };
ED2719CD1AE4F63200C17085 /* OpenAL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenAL.framework; path = System/Library/Frameworks/OpenAL.framework; sourceTree = SDKROOT; };
ED2719CF1AE4F63D00C17085 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
ED2719D11AE4F64600C17085 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; };
ED2719D31AE4F64D00C17085 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
EDCC747E17C455FD007B692C /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
A01E17601784C06E00B0CA4A /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
ED2719DA1AE4F8EB00C17085 /* libcocos2d iOS.a in Frameworks */,
ED2719D51AE4F86500C17085 /* libjscocos2d iOS.a in Frameworks */,
ED2719C41AE4F5D300C17085 /* AVFoundation.framework in Frameworks */,
ED2719C21AE4F5CC00C17085 /* UIKit.framework in Frameworks */,
ED2719C01AE4F5C500C17085 /* OpenGLES.framework in Frameworks */,
ED2719BE1AE4F5BE00C17085 /* CoreGraphics.framework in Frameworks */,
ED2719BC1AE4F5B500C17085 /* QuartzCore.framework in Frameworks */,
ED2719BA1AE4F5A900C17085 /* OpenAL.framework in Frameworks */,
ED2719B81AE4F5A100C17085 /* AudioToolbox.framework in Frameworks */,
ED2719B61AE4F59500C17085 /* Foundation.framework in Frameworks */,
ED2719B41AE4F57E00C17085 /* libz.dylib in Frameworks */,
ED2719B21AE4F57200C17085 /* CoreMotion.framework in Frameworks */,
ED2719B01AE4F56500C17085 /* SystemConfiguration.framework in Frameworks */,
ED2719AE1AE4F55800C17085 /* AdSupport.framework in Frameworks */,
ED2719AC1AE4F55000C17085 /* MessageUI.framework in Frameworks */,
ED2719AA1AE4F54500C17085 /* MediaPlayer.framework in Frameworks */,
ED2719A81AE4F53B00C17085 /* Security.framework in Frameworks */,
ED2719A61AE4F52F00C17085 /* CoreTelephony.framework in Frameworks */,
ED2719A41AE4F51F00C17085 /* StoreKit.framework in Frameworks */,
ED2719A21AE4F4F000C17085 /* GameController.framework in Frameworks */,
A01E18F81784C59400B0CA4A /* libsqlite3.dylib in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
A035A5DA1782290400987F6C /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
ED2719DC1AE4FA1600C17085 /* libjscocos2d Mac.a in Frameworks */,
ED2719DB1AE4FA1200C17085 /* libcocos2d Mac.a in Frameworks */,
ED2719D41AE4F64D00C17085 /* Cocoa.framework in Frameworks */,
ED2719D21AE4F64600C17085 /* OpenGL.framework in Frameworks */,
ED2719D01AE4F63D00C17085 /* QuartzCore.framework in Frameworks */,
ED2719CE1AE4F63200C17085 /* OpenAL.framework in Frameworks */,
ED2719CC1AE4F62A00C17085 /* ApplicationServices.framework in Frameworks */,
ED2719CA1AE4F61D00C17085 /* AudioToolbox.framework in Frameworks */,
ED2719C81AE4F61600C17085 /* Foundation.framework in Frameworks */,
ED2719C61AE4F60C00C17085 /* libz.dylib in Frameworks */,
BA0613B51AC23B2D003118D6 /* Security.framework in Frameworks */,
0541A77A19750F7A00E45470 /* AppKit.framework in Frameworks */,
A035A71217822E9E00987F6C /* libsqlite3.dylib in Frameworks */,
A035A5E01782290400987F6C /* libcurl.dylib in Frameworks */,
ED743D1717D099F10004076B /* IOKit.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
19C28FACFE9D520D11CA2CBB /* Products */ = {
isa = PBXGroup;
children = (
A035A5EC1782290400987F6C /* js-tests Mac.app */,
A01E17721784C06E00B0CA4A /* js-tests iOS.app */,
);
name = Products;
sourceTree = "<group>";
};
1A2B72DA18D294AE00ED9E74 /* project */ = {
isa = PBXGroup;
children = (
1A604F3618BF1D5600CC9A93 /* Classes */,
1A604F3B18BF1D6000CC9A93 /* proj.ios */,
1A604F5B18BF1D6600CC9A93 /* proj.mac */,
);
name = project;
sourceTree = "<group>";
};
1A604F2E18BF1D3300CC9A93 /* js-tests */ = {
isa = PBXGroup;
children = (
BAA7DEE218C84F5000D9A10E /* main.js */,
1A2B72DA18D294AE00ED9E74 /* project */,
BAA7DEE318C84F5000D9A10E /* project.json */,
1A604F3118BF1D4900CC9A93 /* src */,
);
name = "js-tests";
sourceTree = "<group>";
};
1A604F3618BF1D5600CC9A93 /* Classes */ = {
isa = PBXGroup;
children = (
42BCD4A11AAF3BF500D035E5 /* js_Effect3D_bindings.cpp */,
42BCD4A21AAF3BF500D035E5 /* js_Effect3D_bindings.h */,
420BBD0F1AA8840E00493976 /* js_DrawNode3D_bindings.cpp */,
420BBD101AA8840E00493976 /* js_DrawNode3D_bindings.h */,
0541A75C19738D5A00E45470 /* NativeOcClass.h */,
0541A75D19738D5A00E45470 /* NativeOcClass.m */,
1A604F3718BF1D5600CC9A93 /* AppDelegate.cpp */,
1A604F3818BF1D5600CC9A93 /* AppDelegate.h */,
);
name = Classes;
path = "../tests/js-tests/project/Classes";
sourceTree = "<group>";
};
1A604F3B18BF1D6000CC9A93 /* proj.ios */ = {
isa = PBXGroup;
children = (
1A604F3C18BF1D6000CC9A93 /* AppController.h */,
1A604F3D18BF1D6000CC9A93 /* AppController.mm */,
1A604F3E18BF1D6000CC9A93 /* Default-568h@2x.png */,
1A604F3F18BF1D6000CC9A93 /* Default.png */,
1A604F4018BF1D6000CC9A93 /* Default@2x.png */,
1A604F4118BF1D6000CC9A93 /* Icon-114.png */,
1A604F4218BF1D6000CC9A93 /* Icon-120.png */,
1A604F4318BF1D6000CC9A93 /* Icon-144.png */,
1A604F4418BF1D6000CC9A93 /* Icon-152.png */,
1A604F4518BF1D6000CC9A93 /* Icon-57.png */,
1A604F4618BF1D6000CC9A93 /* Icon-72.png */,
1A604F4718BF1D6000CC9A93 /* Icon-76.png */,
1A604F4818BF1D6000CC9A93 /* Info.plist */,
1A604F4918BF1D6000CC9A93 /* main.m */,
1A604F4A18BF1D6000CC9A93 /* Prefix.pch */,
1A604F4B18BF1D6000CC9A93 /* RootViewController.h */,
1A604F4C18BF1D6000CC9A93 /* RootViewController.mm */,
);
name = proj.ios;
path = "../tests/js-tests/project/proj.ios";
sourceTree = "<group>";
};
1A604F5B18BF1D6600CC9A93 /* proj.mac */ = {
isa = PBXGroup;
children = (
1A604F5C18BF1D6600CC9A93 /* InfoPlist.strings */,
1A604F5E18BF1D6600CC9A93 /* MainMenu.xib */,
1A604F6018BF1D6600CC9A93 /* Icon.icns */,
1A604F6118BF1D6600CC9A93 /* main.cpp */,
1A604F6218BF1D6600CC9A93 /* Test_Info.plist */,
1A604F6318BF1D6600CC9A93 /* Test_Prefix.pch */,
);
name = proj.mac;
path = "../tests/js-tests/project/proj.mac";
sourceTree = "<group>";
};
29B97314FDCFA39411CA2CEA /* CustomTemplate */ = {
isa = PBXGroup;
children = (
1A604F2518BF1D2000CC9A93 /* cocos2d_js_bindings.xcodeproj */,
1A604F0218BF1D1C00CC9A93 /* cocos2d_libs.xcodeproj */,
29B97323FDCFA39411CA2CEA /* Frameworks */,
BAC9055D195C2D2500307000 /* script */,
1A604F2E18BF1D3300CC9A93 /* js-tests */,
19C28FACFE9D520D11CA2CBB /* Products */,
);
name = CustomTemplate;
sourceTree = "<group>";
};
29B97323FDCFA39411CA2CEA /* Frameworks */ = {
isa = PBXGroup;
children = (
ED2719D31AE4F64D00C17085 /* Cocoa.framework */,
ED2719D11AE4F64600C17085 /* OpenGL.framework */,
ED2719CF1AE4F63D00C17085 /* QuartzCore.framework */,
ED2719CD1AE4F63200C17085 /* OpenAL.framework */,
ED2719CB1AE4F62A00C17085 /* ApplicationServices.framework */,
ED2719C91AE4F61D00C17085 /* AudioToolbox.framework */,
ED2719C71AE4F61500C17085 /* Foundation.framework */,
ED2719C51AE4F60C00C17085 /* libz.dylib */,
ED2719C31AE4F5D300C17085 /* AVFoundation.framework */,
ED2719C11AE4F5CC00C17085 /* UIKit.framework */,
ED2719BF1AE4F5C500C17085 /* OpenGLES.framework */,
ED2719BD1AE4F5BE00C17085 /* CoreGraphics.framework */,
ED2719BB1AE4F5B500C17085 /* QuartzCore.framework */,
ED2719B91AE4F5A900C17085 /* OpenAL.framework */,
ED2719B71AE4F5A100C17085 /* AudioToolbox.framework */,
ED2719B51AE4F59500C17085 /* Foundation.framework */,
ED2719B31AE4F57E00C17085 /* libz.dylib */,
ED2719B11AE4F57100C17085 /* CoreMotion.framework */,
ED2719AF1AE4F56500C17085 /* SystemConfiguration.framework */,
ED2719AD1AE4F55800C17085 /* AdSupport.framework */,
ED2719AB1AE4F55000C17085 /* MessageUI.framework */,
ED2719A91AE4F54500C17085 /* MediaPlayer.framework */,
ED2719A71AE4F53B00C17085 /* Security.framework */,
ED2719A51AE4F52E00C17085 /* CoreTelephony.framework */,
ED2719A31AE4F51F00C17085 /* StoreKit.framework */,
ED2719A11AE4F4F000C17085 /* GameController.framework */,
BA0613B41AC23B2D003118D6 /* Security.framework */,
0541A77919750F7A00E45470 /* AppKit.framework */,
A035A71117822E9E00987F6C /* libsqlite3.dylib */,
1A9F808C177E98A600D9A1CB /* libcurl.dylib */,
EDCC747E17C455FD007B692C /* IOKit.framework */,
);
name = Frameworks;
sourceTree = "<group>";
};
BAC9055D195C2D2500307000 /* script */ = {
isa = PBXGroup;
children = (
BA2350541948262700E17B2A /* script */,
);
name = script;
sourceTree = "<group>";
};
ED2719521AE4E68200C17085 /* Products */ = {
isa = PBXGroup;
children = (
ED2719571AE4E68200C17085 /* libcocos2d Mac.a */,
ED2719591AE4E68200C17085 /* libcocos2d iOS.a */,
);
name = Products;
sourceTree = "<group>";
};
ED27195A1AE4E69800C17085 /* Products */ = {
isa = PBXGroup;
children = (
ED27195F1AE4E69800C17085 /* libjscocos2d Mac.a */,
ED2719611AE4E69800C17085 /* libjscocos2d iOS.a */,
);
name = Products;
sourceTree = "<group>";
};
/* End PBXGroup section */
/* Begin PBXNativeTarget section */
A01E16C01784C06E00B0CA4A /* js-tests iOS */ = {
isa = PBXNativeTarget;
buildConfigurationList = A01E176F1784C06E00B0CA4A /* Build configuration list for PBXNativeTarget "js-tests iOS" */;
buildPhases = (
A01E16CB1784C06E00B0CA4A /* Resources */,
A01E16F51784C06E00B0CA4A /* Sources */,
A01E17601784C06E00B0CA4A /* Frameworks */,
);
buildRules = (
);
dependencies = (
ED2719951AE4F14A00C17085 /* PBXTargetDependency */,
ED27199F1AE4F48800C17085 /* PBXTargetDependency */,
);
name = "js-tests iOS";
productName = iphone;
productReference = A01E17721784C06E00B0CA4A /* js-tests iOS.app */;
productType = "com.apple.product-type.application";
};
A035A5441782290400987F6C /* js-tests Mac */ = {
isa = PBXNativeTarget;
buildConfigurationList = A035A5E91782290400987F6C /* Build configuration list for PBXNativeTarget "js-tests Mac" */;
buildPhases = (
A035A54F1782290400987F6C /* Resources */,
A035A5701782290400987F6C /* Sources */,
A035A5DA1782290400987F6C /* Frameworks */,
);
buildRules = (
);
dependencies = (
ED2719991AE4F15800C17085 /* PBXTargetDependency */,
ED2719971AE4F15100C17085 /* PBXTargetDependency */,
);
name = "js-tests Mac";
productName = iphone;
productReference = A035A5EC1782290400987F6C /* js-tests Mac.app */;
productType = "com.apple.product-type.application";
};
/* End PBXNativeTarget section */
/* Begin PBXProject section */
29B97313FDCFA39411CA2CEA /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0510;
};
buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "cocos2d_jsb_samples" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
hasScannedForEncodings = 1;
knownRegions = (
English,
Japanese,
French,
German,
en,
);
mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */;
projectDirPath = "";
projectReferences = (
{
ProductGroup = ED27195A1AE4E69800C17085 /* Products */;
ProjectRef = 1A604F2518BF1D2000CC9A93 /* cocos2d_js_bindings.xcodeproj */;
},
{
ProductGroup = ED2719521AE4E68200C17085 /* Products */;
ProjectRef = 1A604F0218BF1D1C00CC9A93 /* cocos2d_libs.xcodeproj */;
},
);
projectRoot = "";
targets = (
A035A5441782290400987F6C /* js-tests Mac */,
A01E16C01784C06E00B0CA4A /* js-tests iOS */,
);
};
/* End PBXProject section */
/* Begin PBXReferenceProxy section */
ED2719571AE4E68200C17085 /* libcocos2d Mac.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = "libcocos2d Mac.a";
remoteRef = ED2719561AE4E68200C17085 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
ED2719591AE4E68200C17085 /* libcocos2d iOS.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = "libcocos2d iOS.a";
remoteRef = ED2719581AE4E68200C17085 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
ED27195F1AE4E69800C17085 /* libjscocos2d Mac.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = "libjscocos2d Mac.a";
remoteRef = ED27195E1AE4E69800C17085 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
ED2719611AE4E69800C17085 /* libjscocos2d iOS.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = "libjscocos2d iOS.a";
remoteRef = ED2719601AE4E69800C17085 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
/* End PBXReferenceProxy section */
/* Begin PBXResourcesBuildPhase section */
A01E16CB1784C06E00B0CA4A /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
BA2350561948262700E17B2A /* script in Resources */,
BAA7DEE718C84F5000D9A10E /* project.json in Resources */,
1A604F5518BF1D6000CC9A93 /* Icon-57.png in Resources */,
1A604F5218BF1D6000CC9A93 /* Icon-120.png in Resources */,
1A604F5618BF1D6000CC9A93 /* Icon-72.png in Resources */,
1A604F5118BF1D6000CC9A93 /* Icon-114.png in Resources */,
1A604F5718BF1D6000CC9A93 /* Icon-76.png in Resources */,
1A604F3518BF1D4900CC9A93 /* src in Resources */,
1A604F5018BF1D6000CC9A93 /* Default@2x.png in Resources */,
1A604F4E18BF1D6000CC9A93 /* Default-568h@2x.png in Resources */,
1A604F5318BF1D6000CC9A93 /* Icon-144.png in Resources */,
1A604F5418BF1D6000CC9A93 /* Icon-152.png in Resources */,
1A604F4F18BF1D6000CC9A93 /* Default.png in Resources */,
BAA7DEE518C84F5000D9A10E /* main.js in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
A035A54F1782290400987F6C /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
BAA7DEE618C84F5000D9A10E /* project.json in Resources */,
1A604F6418BF1D6600CC9A93 /* InfoPlist.strings in Resources */,
BA2350551948262700E17B2A /* script in Resources */,
1A604F6618BF1D6600CC9A93 /* Icon.icns in Resources */,
1A604F3418BF1D4900CC9A93 /* src in Resources */,
1A604F6518BF1D6600CC9A93 /* MainMenu.xib in Resources */,
BAA7DEE418C84F5000D9A10E /* main.js in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXResourcesBuildPhase section */
/* Begin PBXSourcesBuildPhase section */
A01E16F51784C06E00B0CA4A /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
0541A76319738D8C00E45470 /* NativeOcClass.m in Sources */,
1A604F5A18BF1D6000CC9A93 /* RootViewController.mm in Sources */,
42BCD4A41AAF3BF500D035E5 /* js_Effect3D_bindings.cpp in Sources */,
420BBD121AA8840E00493976 /* js_DrawNode3D_bindings.cpp in Sources */,
1A604F3A18BF1D5600CC9A93 /* AppDelegate.cpp in Sources */,
1A604F5918BF1D6000CC9A93 /* main.m in Sources */,
1A604F4D18BF1D6000CC9A93 /* AppController.mm in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
A035A5701782290400987F6C /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
0541A77819750DE700E45470 /* NativeOcClass.m in Sources */,
1A604F6718BF1D6600CC9A93 /* main.cpp in Sources */,
42BCD4A31AAF3BF500D035E5 /* js_Effect3D_bindings.cpp in Sources */,
420BBD111AA8840E00493976 /* js_DrawNode3D_bindings.cpp in Sources */,
1A604F3918BF1D5600CC9A93 /* AppDelegate.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXSourcesBuildPhase section */
/* Begin PBXTargetDependency section */
ED2719951AE4F14A00C17085 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = "libjscocos2d iOS";
targetProxy = ED2719941AE4F14A00C17085 /* PBXContainerItemProxy */;
};
ED2719971AE4F15100C17085 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = "libcocos2d Mac";
targetProxy = ED2719961AE4F15100C17085 /* PBXContainerItemProxy */;
};
ED2719991AE4F15800C17085 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = "libjscocos2d Mac";
targetProxy = ED2719981AE4F15800C17085 /* PBXContainerItemProxy */;
};
ED27199F1AE4F48800C17085 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = "libcocos2d iOS";
targetProxy = ED27199E1AE4F48800C17085 /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */
/* Begin PBXVariantGroup section */
1A604F5C18BF1D6600CC9A93 /* InfoPlist.strings */ = {
isa = PBXVariantGroup;
children = (
1A604F5D18BF1D6600CC9A93 /* en */,
);
name = InfoPlist.strings;
sourceTree = "<group>";
};
1A604F5E18BF1D6600CC9A93 /* MainMenu.xib */ = {
isa = PBXVariantGroup;
children = (
1A604F5F18BF1D6600CC9A93 /* en */,
);
name = MainMenu.xib;
sourceTree = "<group>";
};
/* End PBXVariantGroup section */
/* Begin XCBuildConfiguration section */
A01E17701784C06E00B0CA4A /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COMPRESS_PNG_FILES = NO;
COPY_PHASE_STRIP = NO;
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
GCC_DYNAMIC_NO_PIC = NO;
GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)",
CC_TARGET_OS_IPHONE,
COCOS2D_JAVASCRIPT,
);
GCC_SYMBOLS_PRIVATE_EXTERN = YES;
HEADER_SEARCH_PATHS = "";
INFOPLIST_FILE = "$(SRCROOT)/../tests/js-tests/project/proj.ios/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 5.1.1;
OTHER_LDFLAGS = "-ObjC";
PROVISIONING_PROFILE = "";
SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external/spidermonkey/include/ios";
VALID_ARCHS = "arm64 armv7";
};
name = Debug;
};
A01E17711784C06E00B0CA4A /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COMPRESS_PNG_FILES = NO;
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)",
CC_TARGET_OS_IPHONE,
COCOS2D_JAVASCRIPT,
);
GCC_SYMBOLS_PRIVATE_EXTERN = YES;
HEADER_SEARCH_PATHS = "";
INFOPLIST_FILE = "$(SRCROOT)/../tests/js-tests/project/proj.ios/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 5.1.1;
OTHER_LDFLAGS = "-ObjC";
PROVISIONING_PROFILE = "";
SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external/spidermonkey/include/ios";
VALIDATE_PRODUCT = YES;
VALID_ARCHS = "arm64 armv7";
};
name = Release;
};
A035A5EA1782290400987F6C /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)",
);
GCC_DYNAMIC_NO_PIC = NO;
GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)",
COCOS2D_JAVASCRIPT,
CC_TARGET_OS_MAC,
CC_KEYBOARD_SUPPORT,
);
GCC_SYMBOLS_PRIVATE_EXTERN = YES;
HEADER_SEARCH_PATHS = "";
INFOPLIST_FILE = "$(SRCROOT)/../tests/js-tests/project/proj.mac/Test_Info.plist";
SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../external/glfw3/include/mac $(SRCROOT)/../external/spidermonkey/include/mac";
};
name = Debug;
};
A035A5EB1782290400987F6C /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)",
);
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)",
COCOS2D_JAVASCRIPT,
CC_TARGET_OS_MAC,
CC_KEYBOARD_SUPPORT,
);
GCC_SYMBOLS_PRIVATE_EXTERN = YES;
HEADER_SEARCH_PATHS = "";
INFOPLIST_FILE = "$(SRCROOT)/../tests/js-tests/project/proj.mac/Test_Info.plist";
SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../external/glfw3/include/mac $(SRCROOT)/../external/spidermonkey/include/mac";
VALIDATE_PRODUCT = YES;
};
name = Release;
};
C01FCF4F08A954540054247B /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
CLANG_CXX_LIBRARY = "libc++";
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
GCC_C_LANGUAGE_STANDARD = c99;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = (
"COCOS2D_DEBUG=1",
USE_FILE32API,
"CC_ENABLE_CHIPMUNK_INTEGRATION=1",
);
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = "";
ONLY_ACTIVE_ARCH = YES;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/.. $(SRCROOT)/../cocos $(SRCROOT)/../cocos/base $(SRCROOT)/../cocos/physics $(SRCROOT)/../cocos/math/kazmath $(SRCROOT)/../cocos/2d $(SRCROOT)/../cocos/gui $(SRCROOT)/../cocos/network $(SRCROOT)/../cocos/audio/include $(SRCROOT)/../cocos/editor-support $(SRCROOT)/../extensions $(SRCROOT)/../external $(SRCROOT)/../external/chipmunk/include/chipmunk $(SRCROOT)/../cocos/scripting/js-bindings/auto $(SRCROOT)/../cocos/scripting/js-bindings/manual";
};
name = Debug;
};
C01FCF5008A954540054247B /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
CLANG_CXX_LIBRARY = "libc++";
COMBINE_HIDPI_IMAGES = YES;
GCC_C_LANGUAGE_STANDARD = c99;
GCC_PREPROCESSOR_DEFINITIONS = (
NDEBUG,
USE_FILE32API,
"CC_ENABLE_CHIPMUNK_INTEGRATION=1",
);
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = "";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/.. $(SRCROOT)/../cocos $(SRCROOT)/../cocos/base $(SRCROOT)/../cocos/physics $(SRCROOT)/../cocos/math/kazmath $(SRCROOT)/../cocos/2d $(SRCROOT)/../cocos/gui $(SRCROOT)/../cocos/network $(SRCROOT)/../audio/include $(SRCROOT)/../cocos/editor-support $(SRCROOT)/../extensions $(SRCROOT)/../external $(SRCROOT)/../external/chipmunk/include/chipmunk $(SRCROOT)/../cocos/scripting/js-bindings/auto $(SRCROOT)/../cocos/scripting/js-bindings/manual";
};
name = Release;
};
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
A01E176F1784C06E00B0CA4A /* Build configuration list for PBXNativeTarget "js-tests iOS" */ = {
isa = XCConfigurationList;
buildConfigurations = (
A01E17701784C06E00B0CA4A /* Debug */,
A01E17711784C06E00B0CA4A /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Debug;
};
A035A5E91782290400987F6C /* Build configuration list for PBXNativeTarget "js-tests Mac" */ = {
isa = XCConfigurationList;
buildConfigurations = (
A035A5EA1782290400987F6C /* Debug */,
A035A5EB1782290400987F6C /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Debug;
};
C01FCF4E08A954540054247B /* Build configuration list for PBXProject "cocos2d_jsb_samples" */ = {
isa = XCConfigurationList;
buildConfigurations = (
C01FCF4F08A954540054247B /* Debug */,
C01FCF5008A954540054247B /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Debug;
};
/* End XCConfigurationList section */
};
rootObject = 29B97313FDCFA39411CA2CEA /* Project object */;
}

86
build/cocos2d_jsb_samples.xcodeproj/xcshareddata/xcschemes/js-moonwarriors Mac.xcscheme Normal file
View File

@ -0,0 +1,86 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0510"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "1A2B731E18D2952200ED9E74"
BuildableName = "js-moonwarriors Mac.app"
BlueprintName = "js-moonwarriors Mac"
ReferencedContainer = "container:cocos2d_jsb_samples.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
buildConfiguration = "Debug">
<Testables>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "1A2B731E18D2952200ED9E74"
BuildableName = "js-moonwarriors Mac.app"
BlueprintName = "js-moonwarriors Mac"
ReferencedContainer = "container:cocos2d_jsb_samples.xcodeproj">
</BuildableReference>
</MacroExpansion>
</TestAction>
<LaunchAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
buildConfiguration = "Debug"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
allowLocationSimulation = "YES">
<BuildableProductRunnable>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "1A2B731E18D2952200ED9E74"
BuildableName = "js-moonwarriors Mac.app"
BlueprintName = "js-moonwarriors Mac"
ReferencedContainer = "container:cocos2d_jsb_samples.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
buildConfiguration = "Release"
debugDocumentVersioning = "YES">
<BuildableProductRunnable>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "1A2B731E18D2952200ED9E74"
BuildableName = "js-moonwarriors Mac.app"
BlueprintName = "js-moonwarriors Mac"
ReferencedContainer = "container:cocos2d_jsb_samples.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>

86
build/cocos2d_jsb_samples.xcodeproj/xcshareddata/xcschemes/js-moonwarriors iOS.xcscheme Normal file
View File

@ -0,0 +1,86 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0510"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "1A2B736B18D295DC00ED9E74"
BuildableName = "js-moonwarriors iOS.app"
BlueprintName = "js-moonwarriors iOS"
ReferencedContainer = "container:cocos2d_jsb_samples.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
buildConfiguration = "Debug">
<Testables>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "1A2B736B18D295DC00ED9E74"
BuildableName = "js-moonwarriors iOS.app"
BlueprintName = "js-moonwarriors iOS"
ReferencedContainer = "container:cocos2d_jsb_samples.xcodeproj">
</BuildableReference>
</MacroExpansion>
</TestAction>
<LaunchAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
buildConfiguration = "Debug"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
allowLocationSimulation = "YES">
<BuildableProductRunnable>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "1A2B736B18D295DC00ED9E74"
BuildableName = "js-moonwarriors iOS.app"
BlueprintName = "js-moonwarriors iOS"
ReferencedContainer = "container:cocos2d_jsb_samples.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
buildConfiguration = "Release"
debugDocumentVersioning = "YES">
<BuildableProductRunnable>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "1A2B736B18D295DC00ED9E74"
BuildableName = "js-moonwarriors iOS.app"
BlueprintName = "js-moonwarriors iOS"
ReferencedContainer = "container:cocos2d_jsb_samples.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>

86
build/cocos2d_jsb_samples.xcodeproj/xcshareddata/xcschemes/js-tests Mac.xcscheme Normal file
View File

@ -0,0 +1,86 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0510"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A035A5441782290400987F6C"
BuildableName = "js-tests Mac.app"
BlueprintName = "js-tests Mac"
ReferencedContainer = "container:cocos2d_jsb_samples.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
buildConfiguration = "Debug">
<Testables>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A035A5441782290400987F6C"
BuildableName = "js-tests Mac.app"
BlueprintName = "js-tests Mac"
ReferencedContainer = "container:cocos2d_jsb_samples.xcodeproj">
</BuildableReference>
</MacroExpansion>
</TestAction>
<LaunchAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
buildConfiguration = "Debug"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
allowLocationSimulation = "YES">
<BuildableProductRunnable>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A035A5441782290400987F6C"
BuildableName = "js-tests Mac.app"
BlueprintName = "js-tests Mac"
ReferencedContainer = "container:cocos2d_jsb_samples.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
buildConfiguration = "Release"
debugDocumentVersioning = "YES">
<BuildableProductRunnable>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A035A5441782290400987F6C"
BuildableName = "js-tests Mac.app"
BlueprintName = "js-tests Mac"
ReferencedContainer = "container:cocos2d_jsb_samples.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>

86
build/cocos2d_jsb_samples.xcodeproj/xcshareddata/xcschemes/js-tests iOS.xcscheme Normal file
View File

@ -0,0 +1,86 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0510"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A01E16C01784C06E00B0CA4A"
BuildableName = "js-tests iOS.app"
BlueprintName = "js-tests iOS"
ReferencedContainer = "container:cocos2d_jsb_samples.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
buildConfiguration = "Debug">
<Testables>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A01E16C01784C06E00B0CA4A"
BuildableName = "js-tests iOS.app"
BlueprintName = "js-tests iOS"
ReferencedContainer = "container:cocos2d_jsb_samples.xcodeproj">
</BuildableReference>
</MacroExpansion>
</TestAction>
<LaunchAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
buildConfiguration = "Debug"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
allowLocationSimulation = "YES">
<BuildableProductRunnable>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A01E16C01784C06E00B0CA4A"
BuildableName = "js-tests iOS.app"
BlueprintName = "js-tests iOS"
ReferencedContainer = "container:cocos2d_jsb_samples.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
buildConfiguration = "Release"
debugDocumentVersioning = "YES">
<BuildableProductRunnable>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A01E16C01784C06E00B0CA4A"
BuildableName = "js-tests iOS.app"
BlueprintName = "js-tests iOS"
ReferencedContainer = "container:cocos2d_jsb_samples.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>

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

@ -13,7 +13,6 @@
buildPhases = (
);
dependencies = (
FADEB2331ADCE2610018F90E /* PBXTargetDependency */,
1ADA8BA418CF277400AE24B9 /* PBXTargetDependency */,
1ADA8BA618CF277400AE24B9 /* PBXTargetDependency */,
1ADA8BA818CF277400AE24B9 /* PBXTargetDependency */,
@ -28,7 +27,6 @@
buildPhases = (
);
dependencies = (
FADEB2351ADCE2670018F90E /* PBXTargetDependency */,
1ADA8BAC18CF277C00AE24B9 /* PBXTargetDependency */,
1ADA8BAE18CF277C00AE24B9 /* PBXTargetDependency */,
1ADA8BB018CF277C00AE24B9 /* PBXTargetDependency */,
@ -842,154 +840,6 @@
D0FD03651A3B546400825BB5 /* AllocatorTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D0FD03621A3B546400825BB5 /* AllocatorTest.cpp */; };
D60AE43417F7FFE100757E4B /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D60AE43317F7FFE100757E4B /* CoreMotion.framework */; };
EDCC747F17C455FD007B692C /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EDCC747E17C455FD007B692C /* IOKit.framework */; };
FADEB1911ADCE1600018F90E /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 826294421AAF071500CB7CF7 /* Security.framework */; };
FADEB1931ADCE1600018F90E /* libcocos2d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FB01807A4F9005B8026 /* libcocos2d Mac.a */; };
FADEB1941ADCE1600018F90E /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA36018CD9AC00087CE3A /* libz.dylib */; };
FADEB1951ADCE1600018F90E /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EDCC747E17C455FD007B692C /* IOKit.framework */; };
FADEB1961ADCE1600018F90E /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA28B18CD91510087CE3A /* Foundation.framework */; };
FADEB1971ADCE1600018F90E /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA35C18CD9A9E0087CE3A /* AudioToolbox.framework */; };
FADEB1981ADCE1600018F90E /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA35A18CD9A950087CE3A /* ApplicationServices.framework */; };
FADEB1991ADCE1600018F90E /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA35818CD9A8F0087CE3A /* OpenAL.framework */; };
FADEB19A1ADCE1600018F90E /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA35618CD9A890087CE3A /* QuartzCore.framework */; };
FADEB19B1ADCE1600018F90E /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA35418CD9A820087CE3A /* OpenGL.framework */; };
FADEB19C1ADCE1600018F90E /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C64822165F391E007D4F18 /* Cocoa.framework */; };
FADEB19F1ADCE1600018F90E /* TerrainTest in Resources */ = {isa = PBXBuildFile; fileRef = B603F1B31AC8FBFB00A9579C /* TerrainTest */; };
FADEB1A01ADCE1600018F90E /* Particle3D in Resources */ = {isa = PBXBuildFile; fileRef = B63993301A49359F00B07923 /* Particle3D */; };
FADEB1A11ADCE1600018F90E /* Manifests in Resources */ = {isa = PBXBuildFile; fileRef = 15B3709219EE5D1000ABE682 /* Manifests */; };
FADEB1A21ADCE1600018F90E /* ActionTimeline in Resources */ = {isa = PBXBuildFile; fileRef = 38FA2E75194AECF800FF2BE4 /* ActionTimeline */; };
FADEB1A31ADCE1600018F90E /* src in Resources */ = {isa = PBXBuildFile; fileRef = 182C5CCC1A95D9BA00C30D34 /* src */; };
FADEB1A41ADCE1600018F90E /* Sprite3DTest in Resources */ = {isa = PBXBuildFile; fileRef = 3E92EA841921A7720094CD21 /* Sprite3DTest */; };
FADEB1A51ADCE1600018F90E /* audio in Resources */ = {isa = PBXBuildFile; fileRef = 3E2BDAD119BEA3E20055CDCD /* audio */; };
FADEB1A61ADCE1600018F90E /* Misc in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CC118CED84500F37B72 /* Misc */; };
FADEB1A71ADCE1600018F90E /* Shaders in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CC618CED84500F37B72 /* Shaders */; };
FADEB1A81ADCE1600018F90E /* components in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CB318CED84500F37B72 /* components */; };
FADEB1A91ADCE1600018F90E /* effect2.ogg in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CB718CED84500F37B72 /* effect2.ogg */; };
FADEB1AA1ADCE1600018F90E /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35DA818CEE5DA00F37B72 /* InfoPlist.strings */; };
FADEB1AB1ADCE1600018F90E /* CocosBuilderExample.ccbproj in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CAF18CED84500F37B72 /* CocosBuilderExample.ccbproj */; };
FADEB1AC1ADCE1600018F90E /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35DAA18CEE5DA00F37B72 /* MainMenu.xib */; };
FADEB1AD1ADCE1600018F90E /* hd in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CBC18CED84500F37B72 /* hd */; };
FADEB1AE1ADCE1600018F90E /* TileMaps in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CC818CED84500F37B72 /* TileMaps */; };
FADEB1AF1ADCE1600018F90E /* fonts in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CBA18CED84500F37B72 /* fonts */; };
FADEB1B01ADCE1600018F90E /* CocosBuilderExample.ccbresourcelog in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CB018CED84500F37B72 /* CocosBuilderExample.ccbresourcelog */; };
FADEB1B11ADCE1600018F90E /* configs in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CB418CED84500F37B72 /* configs */; };
FADEB1B21ADCE1600018F90E /* background.ogg in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CAD18CED84500F37B72 /* background.ogg */; };
FADEB1B31ADCE1600018F90E /* music.mid in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CC218CED84500F37B72 /* music.mid */; };
FADEB1B41ADCE1600018F90E /* background.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CAC18CED84500F37B72 /* background.mp3 */; };
FADEB1B51ADCE1600018F90E /* ccs-res in Resources */ = {isa = PBXBuildFile; fileRef = 1A221C9B191771E300FD2BE4 /* ccs-res */; };
FADEB1B61ADCE1600018F90E /* background.caf in Resources */ = {isa = PBXBuildFile; fileRef = C08689C018D370C90093E810 /* background.caf */; };
FADEB1B71ADCE1600018F90E /* effect1.wav in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CB618CED84500F37B72 /* effect1.wav */; };
FADEB1B81ADCE1600018F90E /* background.wav in Resources */ = {isa = PBXBuildFile; fileRef = 3E2BDB0019C5E5D40055CDCD /* background.wav */; };
FADEB1B91ADCE1600018F90E /* Hello.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CBD18CED84500F37B72 /* Hello.png */; };
FADEB1BA1ADCE1600018F90E /* pew-pew-lei.wav in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CC418CED84500F37B72 /* pew-pew-lei.wav */; };
FADEB1BB1ADCE1600018F90E /* Particles in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CC318CED84500F37B72 /* Particles */; };
FADEB1BC1ADCE1600018F90E /* ccb in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CAE18CED84500F37B72 /* ccb */; };
FADEB1BD1ADCE1600018F90E /* Icon.icns in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35DAC18CEE5DA00F37B72 /* Icon.icns */; };
FADEB1BE1ADCE1600018F90E /* fileLookup.plist in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CB918CED84500F37B72 /* fileLookup.plist */; };
FADEB1BF1ADCE1600018F90E /* effect1.raw in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CB518CED84500F37B72 /* effect1.raw */; };
FADEB1C01ADCE1600018F90E /* Images in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CBE18CED84500F37B72 /* Images */; };
FADEB1C11ADCE1600018F90E /* cocosbuilderRes in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35D7818CEE59900F37B72 /* cocosbuilderRes */; };
FADEB1C21ADCE1600018F90E /* zwoptex in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CC918CED84500F37B72 /* zwoptex */; };
FADEB1C31ADCE1600018F90E /* extensions in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CB818CED84500F37B72 /* extensions */; };
FADEB1C41ADCE1600018F90E /* spine in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CC718CED84500F37B72 /* spine */; };
FADEB1C51ADCE1600018F90E /* animations in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CA918CED84500F37B72 /* animations */; };
FADEB1DA1ADCE1CF0018F90E /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52B47A331A534B2B004E4C60 /* Security.framework */; };
FADEB1DC1ADCE1CF0018F90E /* libcocos2d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FBE1807A4F9005B8026 /* libcocos2d iOS.a */; };
FADEB1DD1ADCE1CF0018F90E /* MediaPlayer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3EA0FB65191B933000B170C8 /* MediaPlayer.framework */; };
FADEB1DE1ADCE1CF0018F90E /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA3AF18CDA06D0087CE3A /* libz.dylib */; };
FADEB1DF1ADCE1CF0018F90E /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D60AE43317F7FFE100757E4B /* CoreMotion.framework */; };
FADEB1E01ADCE1CF0018F90E /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA3A818CD9F130087CE3A /* AudioToolbox.framework */; };
FADEB1E11ADCE1CF0018F90E /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA3A618CD9F0D0087CE3A /* OpenAL.framework */; };
FADEB1E21ADCE1CF0018F90E /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA3A418CD9F060087CE3A /* QuartzCore.framework */; };
FADEB1E31ADCE1CF0018F90E /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA3A218CD9EFE0087CE3A /* CoreGraphics.framework */; };
FADEB1E41ADCE1CF0018F90E /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA3A018CD9EF60087CE3A /* OpenGLES.framework */; };
FADEB1E51ADCE1CF0018F90E /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA39E18CD9EE50087CE3A /* UIKit.framework */; };
FADEB1E61ADCE1CF0018F90E /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA39C18CD9ED80087CE3A /* AVFoundation.framework */; };
FADEB1E71ADCE1CF0018F90E /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C64832165F3AFD007D4F18 /* Foundation.framework */; };
FADEB1EA1ADCE1CF0018F90E /* TerrainTest in Resources */ = {isa = PBXBuildFile; fileRef = B603F1B31AC8FBFB00A9579C /* TerrainTest */; };
FADEB1EB1ADCE1CF0018F90E /* Particle3D in Resources */ = {isa = PBXBuildFile; fileRef = B63993301A49359F00B07923 /* Particle3D */; };
FADEB1EC1ADCE1CF0018F90E /* Manifests in Resources */ = {isa = PBXBuildFile; fileRef = 15B3709219EE5D1000ABE682 /* Manifests */; };
FADEB1ED1ADCE1CF0018F90E /* cocosvideo.mp4 in Resources */ = {isa = PBXBuildFile; fileRef = 3EA0FB5D191B92F100B170C8 /* cocosvideo.mp4 */; };
FADEB1EE1ADCE1CF0018F90E /* ActionTimeline in Resources */ = {isa = PBXBuildFile; fileRef = 38FA2E75194AECF800FF2BE4 /* ActionTimeline */; };
FADEB1EF1ADCE1CF0018F90E /* Sprite3DTest in Resources */ = {isa = PBXBuildFile; fileRef = 3E92EA841921A7720094CD21 /* Sprite3DTest */; };
FADEB1F01ADCE1CF0018F90E /* Misc in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CC118CED84500F37B72 /* Misc */; };
FADEB1F11ADCE1CF0018F90E /* effect1.wav in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CB618CED84500F37B72 /* effect1.wav */; };
FADEB1F21ADCE1CF0018F90E /* background.caf in Resources */ = {isa = PBXBuildFile; fileRef = C08689C018D370C90093E810 /* background.caf */; };
FADEB1F31ADCE1CF0018F90E /* fonts in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CBA18CED84500F37B72 /* fonts */; };
FADEB1F41ADCE1CF0018F90E /* ccb in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CAE18CED84500F37B72 /* ccb */; };
FADEB1F51ADCE1CF0018F90E /* hd in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CBC18CED84500F37B72 /* hd */; };
FADEB1F61ADCE1CF0018F90E /* Particles in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CC318CED84500F37B72 /* Particles */; };
FADEB1F71ADCE1CF0018F90E /* src in Resources */ = {isa = PBXBuildFile; fileRef = 182C5CCC1A95D9BA00C30D34 /* src */; };
FADEB1F81ADCE1CF0018F90E /* background.wav in Resources */ = {isa = PBXBuildFile; fileRef = 3E2BDB0019C5E5D40055CDCD /* background.wav */; };
FADEB1F91ADCE1CF0018F90E /* Icon-120.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35D8C18CEE5D100F37B72 /* Icon-120.png */; };
FADEB1FA1ADCE1CF0018F90E /* Icon-57.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35D8F18CEE5D100F37B72 /* Icon-57.png */; };
FADEB1FB1ADCE1CF0018F90E /* fileLookup.plist in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CB918CED84500F37B72 /* fileLookup.plist */; };
FADEB1FC1ADCE1CF0018F90E /* background.ogg in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CAD18CED84500F37B72 /* background.ogg */; };
FADEB1FD1ADCE1CF0018F90E /* Icon-144.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35D8D18CEE5D100F37B72 /* Icon-144.png */; };
FADEB1FE1ADCE1CF0018F90E /* pew-pew-lei.wav in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CC418CED84500F37B72 /* pew-pew-lei.wav */; };
FADEB1FF1ADCE1CF0018F90E /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35D8818CEE5D100F37B72 /* Default-568h@2x.png */; };
FADEB2001ADCE1CF0018F90E /* Default-667h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 527B1F4219EFAE13000A1F82 /* Default-667h@2x.png */; };
FADEB2011ADCE1CF0018F90E /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35D8A18CEE5D100F37B72 /* Default@2x.png */; };
FADEB2021ADCE1CF0018F90E /* components in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CB318CED84500F37B72 /* components */; };
FADEB2031ADCE1CF0018F90E /* zwoptex in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CC918CED84500F37B72 /* zwoptex */; };
FADEB2041ADCE1CF0018F90E /* CocosBuilderExample.ccbresourcelog in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CB018CED84500F37B72 /* CocosBuilderExample.ccbresourcelog */; };
FADEB2051ADCE1CF0018F90E /* music.mid in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CC218CED84500F37B72 /* music.mid */; };
FADEB2061ADCE1CF0018F90E /* Default-736h@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 527B1F4319EFAE13000A1F82 /* Default-736h@3x.png */; };
FADEB2071ADCE1CF0018F90E /* extensions in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CB818CED84500F37B72 /* extensions */; };
FADEB2081ADCE1CF0018F90E /* Images in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CBE18CED84500F37B72 /* Images */; };
FADEB2091ADCE1CF0018F90E /* effect2.ogg in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CB718CED84500F37B72 /* effect2.ogg */; };
FADEB20A1ADCE1CF0018F90E /* audio in Resources */ = {isa = PBXBuildFile; fileRef = 3E2BDAD119BEA3E20055CDCD /* audio */; };
FADEB20B1ADCE1CF0018F90E /* CocosBuilderExample.ccbproj in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CAF18CED84500F37B72 /* CocosBuilderExample.ccbproj */; };
FADEB20C1ADCE1CF0018F90E /* animations in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CA918CED84500F37B72 /* animations */; };
FADEB20D1ADCE1CF0018F90E /* ccs-res in Resources */ = {isa = PBXBuildFile; fileRef = 1A221C9B191771E300FD2BE4 /* ccs-res */; };
FADEB20E1ADCE1CF0018F90E /* Icon-72.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35D9018CEE5D100F37B72 /* Icon-72.png */; };
FADEB20F1ADCE1CF0018F90E /* Icon-76.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35D9118CEE5D100F37B72 /* Icon-76.png */; };
FADEB2101ADCE1CF0018F90E /* effect1.raw in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CB518CED84500F37B72 /* effect1.raw */; };
FADEB2111ADCE1CF0018F90E /* Shaders in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CC618CED84500F37B72 /* Shaders */; };
FADEB2121ADCE1CF0018F90E /* configs in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CB418CED84500F37B72 /* configs */; };
FADEB2131ADCE1CF0018F90E /* spine in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CC718CED84500F37B72 /* spine */; };
FADEB2141ADCE1CF0018F90E /* TileMaps in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CC818CED84500F37B72 /* TileMaps */; };
FADEB2151ADCE1CF0018F90E /* Hello.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CBD18CED84500F37B72 /* Hello.png */; };
FADEB2161ADCE1CF0018F90E /* cocosbuilderRes in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35D7818CEE59900F37B72 /* cocosbuilderRes */; };
FADEB2171ADCE1CF0018F90E /* Icon-114.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35D8B18CEE5D100F37B72 /* Icon-114.png */; };
FADEB2181ADCE1CF0018F90E /* Icon-152.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35D8E18CEE5D100F37B72 /* Icon-152.png */; };
FADEB2191ADCE1CF0018F90E /* background.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CAC18CED84500F37B72 /* background.mp3 */; };
FADEB21A1ADCE1CF0018F90E /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35D8918CEE5D100F37B72 /* Default.png */; };
FADEB9311ADCE2A80018F90E /* main.js in Resources */ = {isa = PBXBuildFile; fileRef = FADEB2551ADCE2A20018F90E /* main.js */; };
FADEB9321ADCE2A80018F90E /* main.js in Resources */ = {isa = PBXBuildFile; fileRef = FADEB2551ADCE2A20018F90E /* main.js */; };
FADEB9351ADCE2A80018F90E /* AppDelegate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FADEB2591ADCE2A20018F90E /* AppDelegate.cpp */; };
FADEB9361ADCE2A80018F90E /* AppDelegate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FADEB2591ADCE2A20018F90E /* AppDelegate.cpp */; };
FADEB9371ADCE2A80018F90E /* js_DrawNode3D_bindings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FADEB25B1ADCE2A20018F90E /* js_DrawNode3D_bindings.cpp */; };
FADEB9381ADCE2A80018F90E /* js_DrawNode3D_bindings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FADEB25B1ADCE2A20018F90E /* js_DrawNode3D_bindings.cpp */; };
FADEB9391ADCE2A80018F90E /* js_Effect3D_bindings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FADEB25D1ADCE2A20018F90E /* js_Effect3D_bindings.cpp */; };
FADEB93A1ADCE2A80018F90E /* js_Effect3D_bindings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FADEB25D1ADCE2A20018F90E /* js_Effect3D_bindings.cpp */; };
FADEBA871ADCE2A80018F90E /* project.json in Resources */ = {isa = PBXBuildFile; fileRef = FADEB3A21ADCE2A30018F90E /* project.json */; };
FADEBA881ADCE2A80018F90E /* project.json in Resources */ = {isa = PBXBuildFile; fileRef = FADEB3A21ADCE2A30018F90E /* project.json */; };
FADEC3541ADCE3280018F90E /* AppController.mm in Sources */ = {isa = PBXBuildFile; fileRef = FADEC3421ADCE3280018F90E /* AppController.mm */; };
FADEC3551ADCE3280018F90E /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FADEC3431ADCE3280018F90E /* Default-568h@2x.png */; };
FADEC3561ADCE3280018F90E /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = FADEC3441ADCE3280018F90E /* Default.png */; };
FADEC3571ADCE3280018F90E /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FADEC3451ADCE3280018F90E /* Default@2x.png */; };
FADEC3581ADCE3280018F90E /* Icon-114.png in Resources */ = {isa = PBXBuildFile; fileRef = FADEC3461ADCE3280018F90E /* Icon-114.png */; };
FADEC3591ADCE3280018F90E /* Icon-120.png in Resources */ = {isa = PBXBuildFile; fileRef = FADEC3471ADCE3280018F90E /* Icon-120.png */; };
FADEC35A1ADCE3280018F90E /* Icon-144.png in Resources */ = {isa = PBXBuildFile; fileRef = FADEC3481ADCE3280018F90E /* Icon-144.png */; };
FADEC35B1ADCE3280018F90E /* Icon-152.png in Resources */ = {isa = PBXBuildFile; fileRef = FADEC3491ADCE3280018F90E /* Icon-152.png */; };
FADEC35C1ADCE3280018F90E /* Icon-57.png in Resources */ = {isa = PBXBuildFile; fileRef = FADEC34A1ADCE3280018F90E /* Icon-57.png */; };
FADEC35D1ADCE3280018F90E /* Icon-72.png in Resources */ = {isa = PBXBuildFile; fileRef = FADEC34B1ADCE3280018F90E /* Icon-72.png */; };
FADEC35E1ADCE3280018F90E /* Icon-76.png in Resources */ = {isa = PBXBuildFile; fileRef = FADEC34C1ADCE3280018F90E /* Icon-76.png */; };
FADEC35F1ADCE3280018F90E /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = FADEC34D1ADCE3280018F90E /* Info.plist */; };
FADEC3601ADCE3280018F90E /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = FADEC34E1ADCE3280018F90E /* main.m */; };
FADEC3611ADCE3280018F90E /* NativeOcClass.m in Sources */ = {isa = PBXBuildFile; fileRef = FADEC3501ADCE3280018F90E /* NativeOcClass.m */; };
FADEC3621ADCE3280018F90E /* RootViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = FADEC3531ADCE3280018F90E /* RootViewController.mm */; };
FADEC36C1ADCE3350018F90E /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = FADEC3641ADCE3350018F90E /* InfoPlist.strings */; };
FADEC36D1ADCE3350018F90E /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = FADEC3661ADCE3350018F90E /* MainMenu.xib */; };
FADEC36E1ADCE3350018F90E /* Icon.icns in Resources */ = {isa = PBXBuildFile; fileRef = FADEC3681ADCE3350018F90E /* Icon.icns */; };
FADEC36F1ADCE3350018F90E /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FADEC3691ADCE3350018F90E /* main.cpp */; };
FADEC3701ADCE3350018F90E /* Test_Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = FADEC36A1ADCE3350018F90E /* Test_Info.plist */; };
FADEC3721ADCE3590018F90E /* src in Resources */ = {isa = PBXBuildFile; fileRef = FADEC3711ADCE3590018F90E /* src */; };
FADEC3731ADCE3590018F90E /* src in Resources */ = {isa = PBXBuildFile; fileRef = FADEC3711ADCE3590018F90E /* src */; };
FADEC3781ADCE39C0018F90E /* script in Resources */ = {isa = PBXBuildFile; fileRef = FADEC3771ADCE39C0018F90E /* script */; };
FADEC3791ADCE39C0018F90E /* script in Resources */ = {isa = PBXBuildFile; fileRef = FADEC3771ADCE39C0018F90E /* script */; };
FADEC37E1ADCE52F0018F90E /* libjscocos2d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FADEB2311ADCE2050018F90E /* libjscocos2d iOS.a */; };
FADEC3801ADCE5400018F90E /* libjscocos2d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FADEB22F1ADCE2050018F90E /* libjscocos2d Mac.a */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@ -1182,62 +1032,6 @@
remoteGlobalIDString = A07A517F1783A1D20073F6A7;
remoteInfo = "Test cpp iOS";
};
FADEB1881ADCE1600018F90E /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 1551A33E158F2AB200E66CFE;
remoteInfo = "cocos2dx Mac";
};
FADEB1CF1ADCE1CF0018F90E /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = A07A4C241783777C0073F6A7;
remoteInfo = "cocos2dx iOS";
};
FADEB22E1ADCE2050018F90E /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = FADEB2291ADCE2050018F90E /* cocos2d_js_bindings.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 1A5410A418B785A10016A3AF;
remoteInfo = "libjscocos2d Mac";
};
FADEB2301ADCE2050018F90E /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = FADEB2291ADCE2050018F90E /* cocos2d_js_bindings.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 1A5410A518B785A10016A3AF;
remoteInfo = "libjscocos2d iOS";
};
FADEB2321ADCE2610018F90E /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
proxyType = 1;
remoteGlobalIDString = FADEB1841ADCE1600018F90E;
remoteInfo = "js-tests Mac";
};
FADEB2341ADCE2670018F90E /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
proxyType = 1;
remoteGlobalIDString = FADEB1CB1ADCE1CF0018F90E;
remoteInfo = "js-tests iOS";
};
FADEC37A1ADCE3CB0018F90E /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = FADEB2291ADCE2050018F90E /* cocos2d_js_bindings.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = A03F31E81781479B006731B9;
remoteInfo = "libjscocos2d Mac";
};
FADEC37C1ADCE5210018F90E /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = FADEB2291ADCE2050018F90E /* cocos2d_js_bindings.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = A07A4FB5178387750073F6A7;
remoteInfo = "libjscocos2d iOS";
};
/* End PBXContainerItemProxy section */
/* Begin PBXFileReference section */
@ -1983,44 +1777,6 @@
D0FD03631A3B546400825BB5 /* AllocatorTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AllocatorTest.h; path = AllocatorTest/AllocatorTest.h; sourceTree = "<group>"; };
D60AE43317F7FFE100757E4B /* CoreMotion.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMotion.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.0.sdk/System/Library/Frameworks/CoreMotion.framework; sourceTree = DEVELOPER_DIR; };
EDCC747E17C455FD007B692C /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; };
FADEB1C91ADCE1600018F90E /* js-tests Mac.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "js-tests Mac.app"; sourceTree = BUILT_PRODUCTS_DIR; };
FADEB21E1ADCE1CF0018F90E /* js-tests iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "js-tests iOS.app"; sourceTree = BUILT_PRODUCTS_DIR; };
FADEB2291ADCE2050018F90E /* cocos2d_js_bindings.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = cocos2d_js_bindings.xcodeproj; path = "../cocos/scripting/js-bindings/proj.ios_mac/cocos2d_js_bindings.xcodeproj"; sourceTree = "<group>"; };
FADEB2551ADCE2A20018F90E /* main.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = main.js; sourceTree = "<group>"; };
FADEB2591ADCE2A20018F90E /* AppDelegate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AppDelegate.cpp; sourceTree = "<group>"; };
FADEB25A1ADCE2A20018F90E /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
FADEB25B1ADCE2A20018F90E /* js_DrawNode3D_bindings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = js_DrawNode3D_bindings.cpp; sourceTree = "<group>"; };
FADEB25C1ADCE2A20018F90E /* js_DrawNode3D_bindings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = js_DrawNode3D_bindings.h; sourceTree = "<group>"; };
FADEB25D1ADCE2A20018F90E /* js_Effect3D_bindings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = js_Effect3D_bindings.cpp; sourceTree = "<group>"; };
FADEB25E1ADCE2A20018F90E /* js_Effect3D_bindings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = js_Effect3D_bindings.h; sourceTree = "<group>"; };
FADEB3A21ADCE2A30018F90E /* project.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = project.json; sourceTree = "<group>"; };
FADEC3411ADCE3280018F90E /* AppController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppController.h; sourceTree = "<group>"; };
FADEC3421ADCE3280018F90E /* AppController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AppController.mm; sourceTree = "<group>"; };
FADEC3431ADCE3280018F90E /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
FADEC3441ADCE3280018F90E /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = "<group>"; };
FADEC3451ADCE3280018F90E /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default@2x.png"; sourceTree = "<group>"; };
FADEC3461ADCE3280018F90E /* Icon-114.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-114.png"; sourceTree = "<group>"; };
FADEC3471ADCE3280018F90E /* Icon-120.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-120.png"; sourceTree = "<group>"; };
FADEC3481ADCE3280018F90E /* Icon-144.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-144.png"; sourceTree = "<group>"; };
FADEC3491ADCE3280018F90E /* Icon-152.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-152.png"; sourceTree = "<group>"; };
FADEC34A1ADCE3280018F90E /* Icon-57.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-57.png"; sourceTree = "<group>"; };
FADEC34B1ADCE3280018F90E /* Icon-72.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-72.png"; sourceTree = "<group>"; };
FADEC34C1ADCE3280018F90E /* Icon-76.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-76.png"; sourceTree = "<group>"; };
FADEC34D1ADCE3280018F90E /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
FADEC34E1ADCE3280018F90E /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
FADEC34F1ADCE3280018F90E /* NativeOcClass.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NativeOcClass.h; sourceTree = "<group>"; };
FADEC3501ADCE3280018F90E /* NativeOcClass.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NativeOcClass.m; sourceTree = "<group>"; };
FADEC3511ADCE3280018F90E /* Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Prefix.pch; sourceTree = "<group>"; };
FADEC3521ADCE3280018F90E /* RootViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RootViewController.h; sourceTree = "<group>"; };
FADEC3531ADCE3280018F90E /* RootViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RootViewController.mm; sourceTree = "<group>"; };
FADEC3651ADCE3350018F90E /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
FADEC3671ADCE3350018F90E /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/MainMenu.xib; sourceTree = "<group>"; };
FADEC3681ADCE3350018F90E /* Icon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = Icon.icns; sourceTree = "<group>"; };
FADEC3691ADCE3350018F90E /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = "<group>"; };
FADEC36A1ADCE3350018F90E /* Test_Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Test_Info.plist; sourceTree = "<group>"; };
FADEC36B1ADCE3350018F90E /* Test_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Test_Prefix.pch; sourceTree = "<group>"; };
FADEC3711ADCE3590018F90E /* src */ = {isa = PBXFileReference; lastKnownFileType = folder; path = src; sourceTree = "<group>"; };
FADEC3771ADCE39C0018F90E /* script */ = {isa = PBXFileReference; lastKnownFileType = folder; name = script; path = "../../cocos/scripting/js-bindings/script"; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@ -2215,46 +1971,6 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
FADEB1901ADCE1600018F90E /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
FADEC3801ADCE5400018F90E /* libjscocos2d Mac.a in Frameworks */,
FADEB1911ADCE1600018F90E /* Security.framework in Frameworks */,
FADEB1931ADCE1600018F90E /* libcocos2d Mac.a in Frameworks */,
FADEB1941ADCE1600018F90E /* libz.dylib in Frameworks */,
FADEB1951ADCE1600018F90E /* IOKit.framework in Frameworks */,
FADEB1961ADCE1600018F90E /* Foundation.framework in Frameworks */,
FADEB1971ADCE1600018F90E /* AudioToolbox.framework in Frameworks */,
FADEB1981ADCE1600018F90E /* ApplicationServices.framework in Frameworks */,
FADEB1991ADCE1600018F90E /* OpenAL.framework in Frameworks */,
FADEB19A1ADCE1600018F90E /* QuartzCore.framework in Frameworks */,
FADEB19B1ADCE1600018F90E /* OpenGL.framework in Frameworks */,
FADEB19C1ADCE1600018F90E /* Cocoa.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
FADEB1D91ADCE1CF0018F90E /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
FADEC37E1ADCE52F0018F90E /* libjscocos2d iOS.a in Frameworks */,
FADEB1DA1ADCE1CF0018F90E /* Security.framework in Frameworks */,
FADEB1DC1ADCE1CF0018F90E /* libcocos2d iOS.a in Frameworks */,
FADEB1DD1ADCE1CF0018F90E /* MediaPlayer.framework in Frameworks */,
FADEB1DE1ADCE1CF0018F90E /* libz.dylib in Frameworks */,
FADEB1DF1ADCE1CF0018F90E /* CoreMotion.framework in Frameworks */,
FADEB1E01ADCE1CF0018F90E /* AudioToolbox.framework in Frameworks */,
FADEB1E11ADCE1CF0018F90E /* OpenAL.framework in Frameworks */,
FADEB1E21ADCE1CF0018F90E /* QuartzCore.framework in Frameworks */,
FADEB1E31ADCE1CF0018F90E /* CoreGraphics.framework in Frameworks */,
FADEB1E41ADCE1CF0018F90E /* OpenGLES.framework in Frameworks */,
FADEB1E51ADCE1CF0018F90E /* UIKit.framework in Frameworks */,
FADEB1E61ADCE1CF0018F90E /* AVFoundation.framework in Frameworks */,
FADEB1E71ADCE1CF0018F90E /* Foundation.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
@ -2356,8 +2072,6 @@
1A0EE47E18CDF799004CD58F /* lua-empty-test iOS.app */,
3E6177311960FAED00DE83F5 /* game-controller-test IOS.app */,
15CBA063196EE56C005877BB /* lua-game-controller-test iOS.app */,
FADEB1C91ADCE1600018F90E /* js-tests Mac.app */,
FADEB21E1ADCE1CF0018F90E /* js-tests iOS.app */,
);
name = Products;
sourceTree = "<group>";
@ -3714,7 +3428,6 @@
1AC35E0318CEE78300F37B72 /* tests */ = {
isa = PBXGroup;
children = (
FADEB2361ADCE2A20018F90E /* js-tests */,
15CBA087196EE66D005877BB /* lua-game-controller-test */,
3E6176B51960FA6300DE83F5 /* game-controller-test */,
1AC358B618CEC19F00F37B72 /* cpp-empty-test */,
@ -3993,7 +3706,6 @@
children = (
46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */,
1ABCA27618CD90A40087CE3A /* cocos2d_lua_bindings.xcodeproj */,
FADEB2291ADCE2050018F90E /* cocos2d_js_bindings.xcodeproj */,
29B97323FDCFA39411CA2CEA /* Frameworks */,
19C28FACFE9D520D11CA2CBB /* Products */,
1AC35E0318CEE78300F37B72 /* tests */,
@ -4295,90 +4007,6 @@
name = AllocatorTest;
sourceTree = "<group>";
};
FADEB22A1ADCE2050018F90E /* Products */ = {
isa = PBXGroup;
children = (
FADEB22F1ADCE2050018F90E /* libjscocos2d Mac.a */,
FADEB2311ADCE2050018F90E /* libjscocos2d iOS.a */,
);
name = Products;
sourceTree = "<group>";
};
FADEB2361ADCE2A20018F90E /* js-tests */ = {
isa = PBXGroup;
children = (
FADEB2571ADCE2A20018F90E /* project */,
FADEC3711ADCE3590018F90E /* src */,
FADEC3771ADCE39C0018F90E /* script */,
FADEB2551ADCE2A20018F90E /* main.js */,
FADEB3A21ADCE2A30018F90E /* project.json */,
);
name = "js-tests";
path = "../tests/js-tests";
sourceTree = "<group>";
};
FADEB2571ADCE2A20018F90E /* project */ = {
isa = PBXGroup;
children = (
FADEB2581ADCE2A20018F90E /* Classes */,
FADEC3631ADCE3350018F90E /* proj.mac */,
FADEC3401ADCE3280018F90E /* proj.ios */,
);
path = project;
sourceTree = "<group>";
};
FADEB2581ADCE2A20018F90E /* Classes */ = {
isa = PBXGroup;
children = (
FADEB2591ADCE2A20018F90E /* AppDelegate.cpp */,
FADEB25A1ADCE2A20018F90E /* AppDelegate.h */,
FADEB25B1ADCE2A20018F90E /* js_DrawNode3D_bindings.cpp */,
FADEB25C1ADCE2A20018F90E /* js_DrawNode3D_bindings.h */,
FADEB25D1ADCE2A20018F90E /* js_Effect3D_bindings.cpp */,
FADEB25E1ADCE2A20018F90E /* js_Effect3D_bindings.h */,
);
path = Classes;
sourceTree = "<group>";
};
FADEC3401ADCE3280018F90E /* proj.ios */ = {
isa = PBXGroup;
children = (
FADEC3411ADCE3280018F90E /* AppController.h */,
FADEC3421ADCE3280018F90E /* AppController.mm */,
FADEC3431ADCE3280018F90E /* Default-568h@2x.png */,
FADEC3441ADCE3280018F90E /* Default.png */,
FADEC3451ADCE3280018F90E /* Default@2x.png */,
FADEC3461ADCE3280018F90E /* Icon-114.png */,
FADEC3471ADCE3280018F90E /* Icon-120.png */,
FADEC3481ADCE3280018F90E /* Icon-144.png */,
FADEC3491ADCE3280018F90E /* Icon-152.png */,
FADEC34A1ADCE3280018F90E /* Icon-57.png */,
FADEC34B1ADCE3280018F90E /* Icon-72.png */,
FADEC34C1ADCE3280018F90E /* Icon-76.png */,
FADEC34D1ADCE3280018F90E /* Info.plist */,
FADEC34E1ADCE3280018F90E /* main.m */,
FADEC34F1ADCE3280018F90E /* NativeOcClass.h */,
FADEC3501ADCE3280018F90E /* NativeOcClass.m */,
FADEC3511ADCE3280018F90E /* Prefix.pch */,
FADEC3521ADCE3280018F90E /* RootViewController.h */,
FADEC3531ADCE3280018F90E /* RootViewController.mm */,
);
path = proj.ios;
sourceTree = "<group>";
};
FADEC3631ADCE3350018F90E /* proj.mac */ = {
isa = PBXGroup;
children = (
FADEC3641ADCE3350018F90E /* InfoPlist.strings */,
FADEC3661ADCE3350018F90E /* MainMenu.xib */,
FADEC3681ADCE3350018F90E /* Icon.icns */,
FADEC3691ADCE3350018F90E /* main.cpp */,
FADEC36A1ADCE3350018F90E /* Test_Info.plist */,
FADEC36B1ADCE3350018F90E /* Test_Prefix.pch */,
);
path = proj.mac;
sourceTree = "<group>";
};
/* End PBXGroup section */
/* Begin PBXNativeTarget section */
@ -4574,44 +4202,6 @@
productReference = A07A52291783A1D20073F6A7 /* cpp-tests iOS.app */;
productType = "com.apple.product-type.application";
};
FADEB1841ADCE1600018F90E /* js-tests Mac */ = {
isa = PBXNativeTarget;
buildConfigurationList = FADEB1C61ADCE1600018F90E /* Build configuration list for PBXNativeTarget "js-tests Mac" */;
buildPhases = (
FADEB18A1ADCE1600018F90E /* Sources */,
FADEB1901ADCE1600018F90E /* Frameworks */,
FADEB19E1ADCE1600018F90E /* Resources */,
);
buildRules = (
);
dependencies = (
FADEC37B1ADCE3CB0018F90E /* PBXTargetDependency */,
FADEB1871ADCE1600018F90E /* PBXTargetDependency */,
);
name = "js-tests Mac";
productName = "Test lua Mac";
productReference = FADEB1C91ADCE1600018F90E /* js-tests Mac.app */;
productType = "com.apple.product-type.application";
};
FADEB1CB1ADCE1CF0018F90E /* js-tests iOS */ = {
isa = PBXNativeTarget;
buildConfigurationList = FADEB21B1ADCE1CF0018F90E /* Build configuration list for PBXNativeTarget "js-tests iOS" */;
buildPhases = (
FADEB1D11ADCE1CF0018F90E /* Sources */,
FADEB1D91ADCE1CF0018F90E /* Frameworks */,
FADEB1E91ADCE1CF0018F90E /* Resources */,
);
buildRules = (
);
dependencies = (
FADEC37D1ADCE5210018F90E /* PBXTargetDependency */,
FADEB1CE1ADCE1CF0018F90E /* PBXTargetDependency */,
);
name = "js-tests iOS";
productName = "Test lua iOS";
productReference = FADEB21E1ADCE1CF0018F90E /* js-tests iOS.app */;
productType = "com.apple.product-type.application";
};
/* End PBXNativeTarget section */
/* Begin PBXProject section */
@ -4635,10 +4225,6 @@
mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */;
projectDirPath = "";
projectReferences = (
{
ProductGroup = FADEB22A1ADCE2050018F90E /* Products */;
ProjectRef = FADEB2291ADCE2050018F90E /* cocos2d_js_bindings.xcodeproj */;
},
{
ProductGroup = 46A15F9D1807A4F8005B8026 /* Products */;
ProjectRef = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */;
@ -4655,13 +4241,11 @@
1A0EE1C618CDF6DA004CD58F /* cpp-empty-test Mac */,
1ABCA28518CD91510087CE3A /* lua-tests Mac */,
1A0EE2B818CDF733004CD58F /* lua-empty-test Mac */,
FADEB1841ADCE1600018F90E /* js-tests Mac */,
A07A517B1783A1CC0073F6A7 /* build all tests iOS */,
A07A517F1783A1D20073F6A7 /* cpp-tests iOS */,
1A0EE31818CDF775004CD58F /* cpp-empty-test iOS */,
1ABCA2CC18CD93580087CE3A /* lua-tests iOS */,
1A0EE41918CDF799004CD58F /* lua-empty-test iOS */,
FADEB1CB1ADCE1CF0018F90E /* js-tests iOS */,
3E6176FF1960FAED00DE83F5 /* game-controller-test IOS */,
15CBA015196EE56C005877BB /* lua-game-controller-test iOS */,
);
@ -4697,20 +4281,6 @@
remoteRef = 46A15FBD1807A4F9005B8026 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
FADEB22F1ADCE2050018F90E /* libjscocos2d Mac.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = "libjscocos2d Mac.a";
remoteRef = FADEB22E1ADCE2050018F90E /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
FADEB2311ADCE2050018F90E /* libjscocos2d iOS.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = "libjscocos2d iOS.a";
remoteRef = FADEB2301ADCE2050018F90E /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
/* End PBXReferenceProxy section */
/* Begin PBXResourcesBuildPhase section */
@ -5042,131 +4612,6 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
FADEB19E1ADCE1600018F90E /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
FADEB19F1ADCE1600018F90E /* TerrainTest in Resources */,
FADEC36C1ADCE3350018F90E /* InfoPlist.strings in Resources */,
FADEB1A01ADCE1600018F90E /* Particle3D in Resources */,
FADEB1A11ADCE1600018F90E /* Manifests in Resources */,
FADEB1A21ADCE1600018F90E /* ActionTimeline in Resources */,
FADEB1A31ADCE1600018F90E /* src in Resources */,
FADEB1A41ADCE1600018F90E /* Sprite3DTest in Resources */,
FADEC3721ADCE3590018F90E /* src in Resources */,
FADEC3701ADCE3350018F90E /* Test_Info.plist in Resources */,
FADEB1A51ADCE1600018F90E /* audio in Resources */,
FADEB1A61ADCE1600018F90E /* Misc in Resources */,
FADEB1A71ADCE1600018F90E /* Shaders in Resources */,
FADEB1A81ADCE1600018F90E /* components in Resources */,
FADEB1A91ADCE1600018F90E /* effect2.ogg in Resources */,
FADEC36D1ADCE3350018F90E /* MainMenu.xib in Resources */,
FADEB1AA1ADCE1600018F90E /* InfoPlist.strings in Resources */,
FADEB1AB1ADCE1600018F90E /* CocosBuilderExample.ccbproj in Resources */,
FADEB1AC1ADCE1600018F90E /* MainMenu.xib in Resources */,
FADEB1AD1ADCE1600018F90E /* hd in Resources */,
FADEB1AE1ADCE1600018F90E /* TileMaps in Resources */,
FADEB1AF1ADCE1600018F90E /* fonts in Resources */,
FADEB1B01ADCE1600018F90E /* CocosBuilderExample.ccbresourcelog in Resources */,
FADEBA871ADCE2A80018F90E /* project.json in Resources */,
FADEB1B11ADCE1600018F90E /* configs in Resources */,
FADEB1B21ADCE1600018F90E /* background.ogg in Resources */,
FADEB1B31ADCE1600018F90E /* music.mid in Resources */,
FADEC3781ADCE39C0018F90E /* script in Resources */,
FADEB1B41ADCE1600018F90E /* background.mp3 in Resources */,
FADEB1B51ADCE1600018F90E /* ccs-res in Resources */,
FADEB1B61ADCE1600018F90E /* background.caf in Resources */,
FADEB1B71ADCE1600018F90E /* effect1.wav in Resources */,
FADEB1B81ADCE1600018F90E /* background.wav in Resources */,
FADEB1B91ADCE1600018F90E /* Hello.png in Resources */,
FADEB1BA1ADCE1600018F90E /* pew-pew-lei.wav in Resources */,
FADEB1BB1ADCE1600018F90E /* Particles in Resources */,
FADEB1BC1ADCE1600018F90E /* ccb in Resources */,
FADEB1BD1ADCE1600018F90E /* Icon.icns in Resources */,
FADEB1BE1ADCE1600018F90E /* fileLookup.plist in Resources */,
FADEB1BF1ADCE1600018F90E /* effect1.raw in Resources */,
FADEB1C01ADCE1600018F90E /* Images in Resources */,
FADEC36E1ADCE3350018F90E /* Icon.icns in Resources */,
FADEB1C11ADCE1600018F90E /* cocosbuilderRes in Resources */,
FADEB9311ADCE2A80018F90E /* main.js in Resources */,
FADEB1C21ADCE1600018F90E /* zwoptex in Resources */,
FADEB1C31ADCE1600018F90E /* extensions in Resources */,
FADEB1C41ADCE1600018F90E /* spine in Resources */,
FADEB1C51ADCE1600018F90E /* animations in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
FADEB1E91ADCE1CF0018F90E /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
FADEC3791ADCE39C0018F90E /* script in Resources */,
FADEC3591ADCE3280018F90E /* Icon-120.png in Resources */,
FADEB1EA1ADCE1CF0018F90E /* TerrainTest in Resources */,
FADEB1EB1ADCE1CF0018F90E /* Particle3D in Resources */,
FADEB1EC1ADCE1CF0018F90E /* Manifests in Resources */,
FADEB1ED1ADCE1CF0018F90E /* cocosvideo.mp4 in Resources */,
FADEB1EE1ADCE1CF0018F90E /* ActionTimeline in Resources */,
FADEB1EF1ADCE1CF0018F90E /* Sprite3DTest in Resources */,
FADEB9321ADCE2A80018F90E /* main.js in Resources */,
FADEB1F01ADCE1CF0018F90E /* Misc in Resources */,
FADEB1F11ADCE1CF0018F90E /* effect1.wav in Resources */,
FADEC3551ADCE3280018F90E /* Default-568h@2x.png in Resources */,
FADEB1F21ADCE1CF0018F90E /* background.caf in Resources */,
FADEBA881ADCE2A80018F90E /* project.json in Resources */,
FADEB1F31ADCE1CF0018F90E /* fonts in Resources */,
FADEB1F41ADCE1CF0018F90E /* ccb in Resources */,
FADEB1F51ADCE1CF0018F90E /* hd in Resources */,
FADEC35C1ADCE3280018F90E /* Icon-57.png in Resources */,
FADEB1F61ADCE1CF0018F90E /* Particles in Resources */,
FADEB1F71ADCE1CF0018F90E /* src in Resources */,
FADEB1F81ADCE1CF0018F90E /* background.wav in Resources */,
FADEB1F91ADCE1CF0018F90E /* Icon-120.png in Resources */,
FADEB1FA1ADCE1CF0018F90E /* Icon-57.png in Resources */,
FADEB1FB1ADCE1CF0018F90E /* fileLookup.plist in Resources */,
FADEB1FC1ADCE1CF0018F90E /* background.ogg in Resources */,
FADEB1FD1ADCE1CF0018F90E /* Icon-144.png in Resources */,
FADEC3581ADCE3280018F90E /* Icon-114.png in Resources */,
FADEB1FE1ADCE1CF0018F90E /* pew-pew-lei.wav in Resources */,
FADEB1FF1ADCE1CF0018F90E /* Default-568h@2x.png in Resources */,
FADEB2001ADCE1CF0018F90E /* Default-667h@2x.png in Resources */,
FADEB2011ADCE1CF0018F90E /* Default@2x.png in Resources */,
FADEC35F1ADCE3280018F90E /* Info.plist in Resources */,
FADEB2021ADCE1CF0018F90E /* components in Resources */,
FADEB2031ADCE1CF0018F90E /* zwoptex in Resources */,
FADEB2041ADCE1CF0018F90E /* CocosBuilderExample.ccbresourcelog in Resources */,
FADEC35E1ADCE3280018F90E /* Icon-76.png in Resources */,
FADEC3571ADCE3280018F90E /* Default@2x.png in Resources */,
FADEB2051ADCE1CF0018F90E /* music.mid in Resources */,
FADEB2061ADCE1CF0018F90E /* Default-736h@3x.png in Resources */,
FADEB2071ADCE1CF0018F90E /* extensions in Resources */,
FADEB2081ADCE1CF0018F90E /* Images in Resources */,
FADEB2091ADCE1CF0018F90E /* effect2.ogg in Resources */,
FADEB20A1ADCE1CF0018F90E /* audio in Resources */,
FADEB20B1ADCE1CF0018F90E /* CocosBuilderExample.ccbproj in Resources */,
FADEC35D1ADCE3280018F90E /* Icon-72.png in Resources */,
FADEC3561ADCE3280018F90E /* Default.png in Resources */,
FADEB20C1ADCE1CF0018F90E /* animations in Resources */,
FADEB20D1ADCE1CF0018F90E /* ccs-res in Resources */,
FADEC35B1ADCE3280018F90E /* Icon-152.png in Resources */,
FADEB20E1ADCE1CF0018F90E /* Icon-72.png in Resources */,
FADEB20F1ADCE1CF0018F90E /* Icon-76.png in Resources */,
FADEB2101ADCE1CF0018F90E /* effect1.raw in Resources */,
FADEB2111ADCE1CF0018F90E /* Shaders in Resources */,
FADEB2121ADCE1CF0018F90E /* configs in Resources */,
FADEB2131ADCE1CF0018F90E /* spine in Resources */,
FADEC3731ADCE3590018F90E /* src in Resources */,
FADEC35A1ADCE3280018F90E /* Icon-144.png in Resources */,
FADEB2141ADCE1CF0018F90E /* TileMaps in Resources */,
FADEB2151ADCE1CF0018F90E /* Hello.png in Resources */,
FADEB2161ADCE1CF0018F90E /* cocosbuilderRes in Resources */,
FADEB2171ADCE1CF0018F90E /* Icon-114.png in Resources */,
FADEB2181ADCE1CF0018F90E /* Icon-152.png in Resources */,
FADEB2191ADCE1CF0018F90E /* background.mp3 in Resources */,
FADEB21A1ADCE1CF0018F90E /* Default.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXResourcesBuildPhase section */
/* Begin PBXShellScriptBuildPhase section */
@ -5758,31 +5203,6 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
FADEB18A1ADCE1600018F90E /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
FADEC36F1ADCE3350018F90E /* main.cpp in Sources */,
FADEB9351ADCE2A80018F90E /* AppDelegate.cpp in Sources */,
FADEB9371ADCE2A80018F90E /* js_DrawNode3D_bindings.cpp in Sources */,
FADEB9391ADCE2A80018F90E /* js_Effect3D_bindings.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
FADEB1D11ADCE1CF0018F90E /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
FADEC3621ADCE3280018F90E /* RootViewController.mm in Sources */,
FADEB9381ADCE2A80018F90E /* js_DrawNode3D_bindings.cpp in Sources */,
FADEB93A1ADCE2A80018F90E /* js_Effect3D_bindings.cpp in Sources */,
FADEC3541ADCE3280018F90E /* AppController.mm in Sources */,
FADEB9361ADCE2A80018F90E /* AppDelegate.cpp in Sources */,
FADEC3601ADCE3280018F90E /* main.m in Sources */,
FADEC3611ADCE3280018F90E /* NativeOcClass.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXSourcesBuildPhase section */
/* Begin PBXTargetDependency section */
@ -5901,36 +5321,6 @@
target = A07A517F1783A1D20073F6A7 /* cpp-tests iOS */;
targetProxy = A07A526C1783AB980073F6A7 /* PBXContainerItemProxy */;
};
FADEB1871ADCE1600018F90E /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = "cocos2dx Mac";
targetProxy = FADEB1881ADCE1600018F90E /* PBXContainerItemProxy */;
};
FADEB1CE1ADCE1CF0018F90E /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = "cocos2dx iOS";
targetProxy = FADEB1CF1ADCE1CF0018F90E /* PBXContainerItemProxy */;
};
FADEB2331ADCE2610018F90E /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = FADEB1841ADCE1600018F90E /* js-tests Mac */;
targetProxy = FADEB2321ADCE2610018F90E /* PBXContainerItemProxy */;
};
FADEB2351ADCE2670018F90E /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = FADEB1CB1ADCE1CF0018F90E /* js-tests iOS */;
targetProxy = FADEB2341ADCE2670018F90E /* PBXContainerItemProxy */;
};
FADEC37B1ADCE3CB0018F90E /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = "libjscocos2d Mac";
targetProxy = FADEC37A1ADCE3CB0018F90E /* PBXContainerItemProxy */;
};
FADEC37D1ADCE5210018F90E /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = "libjscocos2d iOS";
targetProxy = FADEC37C1ADCE5210018F90E /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */
/* Begin PBXVariantGroup section */
@ -5998,22 +5388,6 @@
name = MainMenu.xib;
sourceTree = "<group>";
};
FADEC3641ADCE3350018F90E /* InfoPlist.strings */ = {
isa = PBXVariantGroup;
children = (
FADEC3651ADCE3350018F90E /* en */,
);
name = InfoPlist.strings;
sourceTree = "<group>";
};
FADEC3661ADCE3350018F90E /* MainMenu.xib */ = {
isa = PBXVariantGroup;
children = (
FADEC3671ADCE3350018F90E /* en */,
);
name = MainMenu.xib;
sourceTree = "<group>";
};
/* End PBXVariantGroup section */
/* Begin XCBuildConfiguration section */
@ -6540,98 +5914,6 @@
};
name = Release;
};
FADEB1C71ADCE1600018F90E /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)",
CC_TARGET_OS_MAC,
);
INFOPLIST_FILE = "$(SRCROOT)/../tests/js-tests/project/proj.mac/Test_Info.plist";
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
OTHER_LDFLAGS = (
"-pagezero_size",
10000,
"-image_base",
100000000,
);
PRODUCT_NAME = "js-tests Mac";
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../external/glfw3/include/mac $(SRCROOT)/../external/spidermonkey/include/mac $(SRCROOT)/../cocos/scripting/js-bindings/auto $(SRCROOT)/../cocos/scripting/js-bindings/manual $(SRCROOT)/../cocos/audio/include";
};
name = Debug;
};
FADEB1C81ADCE1600018F90E /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)",
CC_TARGET_OS_MAC,
);
INFOPLIST_FILE = "$(SRCROOT)/../tests/js-tests/project/proj.mac/Test_Info.plist";
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
OTHER_LDFLAGS = (
"-pagezero_size",
10000,
"-image_base",
100000000,
);
PRODUCT_NAME = "js-tests Mac";
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../external/glfw3/include/mac $(SRCROOT)/../external/spidermonkey/include/mac $(SRCROOT)/../cocos/scripting/js-bindings/auto $(SRCROOT)/../cocos/scripting/js-bindings/manual $(SRCROOT)/../cocos/audio/include";
VALIDATE_PRODUCT = YES;
};
name = Release;
};
FADEB21C1ADCE1CF0018F90E /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_IDENTITY = "iPhone Developer";
GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)",
CC_TARGET_OS_IPHONE,
);
INFOPLIST_FILE = "$(SRCROOT)/../tests/js-tests/project/proj.ios/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 5.1.1;
LIBRARY_SEARCH_PATHS = "";
"OTHER_LDFLAGS[sdk=iphonesimulator*][arch=x86_64]" = (
"-pagezero_size",
10000,
"-image_base",
100000000,
);
PRODUCT_NAME = "js-tests iOS";
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../plugin/jsbindings/auto $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../cocos/scripting/js-bindings/manual $(SRCROOT)/../cocos/scripting/js-bindings/auto $(SRCROOT)/../external/spidermonkey/include/ios $(SRCROOT)/../plugin/jsbindings/manual $(SRCROOT)/../cocos/audio/include";
VALID_ARCHS = "arm64 armv7";
};
name = Debug;
};
FADEB21D1ADCE1CF0018F90E /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_IDENTITY = "iPhone Developer";
GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)",
CC_TARGET_OS_IPHONE,
);
INFOPLIST_FILE = "$(SRCROOT)/../tests/js-tests/project/proj.ios/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 5.1.1;
LIBRARY_SEARCH_PATHS = "";
"OTHER_LDFLAGS[sdk=iphonesimulator*][arch=x86_64]" = (
"-pagezero_size",
10000,
"-image_base",
100000000,
);
PRODUCT_NAME = "js-tests iOS";
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../plugin/jsbindings/auto $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../cocos/scripting/js-bindings/manual $(SRCROOT)/../cocos/scripting/js-bindings/auto $(SRCROOT)/../external/spidermonkey/include/ios $(SRCROOT)/../plugin/jsbindings/manual $(SRCROOT)/../cocos/audio/include";
VALIDATE_PRODUCT = YES;
VALID_ARCHS = "arm64 armv7";
};
name = Release;
};
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
@ -6752,24 +6034,6 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Debug;
};
FADEB1C61ADCE1600018F90E /* Build configuration list for PBXNativeTarget "js-tests Mac" */ = {
isa = XCConfigurationList;
buildConfigurations = (
FADEB1C71ADCE1600018F90E /* Debug */,
FADEB1C81ADCE1600018F90E /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Debug;
};
FADEB21B1ADCE1CF0018F90E /* Build configuration list for PBXNativeTarget "js-tests iOS" */ = {
isa = XCConfigurationList;
buildConfigurations = (
FADEB21C1ADCE1CF0018F90E /* Debug */,
FADEB21D1ADCE1CF0018F90E /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Debug;
};
/* End XCConfigurationList section */
};
rootObject = 29B97313FDCFA39411CA2CEA /* Project object */;

2
cocos/2d/CCAction.cpp
View File

@ -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)

2
cocos/2d/CCActionCamera.cpp
View File

@ -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;

2
cocos/2d/CCActionCatmullRom.cpp
View File

@ -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

46
cocos/2d/CCActionGrid3D.cpp
View File

@ -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));

2
cocos/2d/CCActionInterval.cpp
View File

@ -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:

6
cocos/2d/CCActionTiledGrid.cpp
View File

@ -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 )
{

8
cocos/2d/CCClippingNode.cpp
View File

@ -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);

2
cocos/2d/CCDrawingPrimitives.cpp
View File

@ -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));

8
cocos/2d/CCFastTMXLayer.cpp
View File

@ -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;

54
cocos/2d/CCLabel.cpp
View File

@ -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;

1
cocos/2d/CCLabel.h
View File

@ -323,6 +323,7 @@ public:
/**
* Disable all effect to Label.
* @warning Please use disableEffect(LabelEffect::ALL) instead of this API.
*/
virtual void disableEffect();

2
cocos/2d/CCLayer.cpp
View File

@ -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)

2
cocos/2d/CCMenu.cpp
View File

@ -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))
{

3
cocos/2d/CCMotionStreak.cpp
View File

@ -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;

11
cocos/2d/CCNode.cpp
View File

@ -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

2
cocos/2d/CCParallaxNode.cpp
View File

@ -66,7 +66,7 @@ private:
ParallaxNode::ParallaxNode()
{
_parallaxArray = ccArrayNew(5);
_lastPosition = Vec2(-100,-100);
_lastPosition.set(-100.0f, -100.0f);
}
ParallaxNode::~ParallaxNode()

22
cocos/2d/CCParticleExamples.cpp
View File

@ -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;

7
cocos/2d/CCParticleSystem.cpp
View File

@ -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)
{

2
cocos/2d/CCParticleSystemQuad.cpp
View File

@ -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

12
cocos/2d/CCProgressTimer.cpp
View File

@ -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

2
cocos/2d/CCSprite.cpp
View File

@ -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));

15
cocos/2d/CCTMXLayer.cpp
View File

@ -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;
}

1
cocos/2d/CCTMXObjectGroup.cpp
View File

@ -34,7 +34,6 @@ NS_CC_BEGIN
TMXObjectGroup::TMXObjectGroup()
: _groupName("")
, _positionOffset(Vec2::ZERO)
{
}

3
cocos/2d/CCTMXXMLParser.cpp
View File

@ -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();

24
cocos/3d/CCTerrain.cpp
View File

@ -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;
}

4
cocos/base/CCNS.cpp
View File

@ -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;

3
cocos/base/ccTypes.h
View File

@ -556,7 +556,8 @@ enum class LabelEffect {
NORMAL,
OUTLINE,
SHADOW,
GLOW
GLOW,
ALL
};
/** @struct Acceleration

2
cocos/deprecated/CCDeprecated.cpp
View File

@ -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;

2
cocos/editor-support/cocosbuilder/CCNode+CCBRelativePositioning.cpp
View File

@ -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;

6
cocos/editor-support/cocostudio/CCArmature.cpp
View File

@ -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;
}
}

4
cocos/editor-support/cocostudio/CCDisplayManager.cpp
View File

@ -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);
}

2
cocos/editor-support/cocostudio/CCUtilMath.cpp
View File

@ -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);
}

2
cocos/editor-support/cocostudio/FlatBuffersSerialize.cpp
View File

@ -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();

10
cocos/editor-support/cocostudio/WidgetReader/NodeReader/NodeReader.cpp
View File

@ -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;

2
cocos/editor-support/cocostudio/WidgetReader/Sprite3DReader/Sprite3DReader.cpp
View File

@ -77,7 +77,7 @@ namespace cocostudio
if(!attribute)
return Vec2::ZERO;
Vec2 ret(Vec2::ZERO);
Vec2 ret;
std::string attriname;
while (attribute)

2
cocos/editor-support/cocostudio/WidgetReader/UserCameraReader/UserCameraReader.cpp
View File

@ -76,7 +76,7 @@ namespace cocostudio
if(!attribute)
return Vec2::ZERO;
Vec2 ret(Vec2::ZERO);
Vec2 ret;
std::string attriname;
while (attribute)

10
cocos/editor-support/cocostudio/WidgetReader/WidgetReader.cpp
View File

@ -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;

4
cocos/math/CCVertex.cpp
View File

@ -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);
}

5
cocos/math/MathUtil.cpp
View File

@ -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

12
cocos/math/MathUtil.h
View File

@ -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();

144
cocos/math/Vec2.cpp
View File

@ -67,57 +67,12 @@ float crossProduct2Vector(const Vec2& A, const Vec2& B, const Vec2& C, const Vec
return (D.y - C.y) * (B.x - A.x) - (D.x - C.x) * (B.y - A.y);
}
Vec2::Vec2()
: x(0.0f), y(0.0f)
{
}
Vec2::Vec2(float xx, float yy)
: x(xx), y(yy)
{
}
Vec2::Vec2(const float* array)
{
set(array);
}
Vec2::Vec2(const Vec2& p1, const Vec2& p2)
{
set(p1, p2);
}
Vec2::Vec2(const Vec2& copy)
{
set(copy);
}
Vec2::~Vec2()
{
}
bool Vec2::isZero() const
{
return x == 0.0f && y == 0.0f;
}
bool Vec2::isOne() const
{
return x == 1.0f && y == 1.0f;
}
float Vec2::angle(const Vec2& v1, const Vec2& v2)
{
float dz = v1.x * v2.y - v1.y * v2.x;
return atan2f(fabsf(dz) + MATH_FLOAT_SMALL, dot(v1, v2));
}
void Vec2::add(const Vec2& v)
{
x += v.x;
y += v.y;
}
void Vec2::add(const Vec2& v1, const Vec2& v2, Vec2* dst)
{
GP_ASSERT(dst);
@ -171,18 +126,6 @@ float Vec2::distance(const Vec2& v) const
return sqrt(dx * dx + dy * dy);
}
float Vec2::distanceSquared(const Vec2& v) const
{
float dx = v.x - x;
float dy = v.y - y;
return (dx * dx + dy * dy);
}
float Vec2::dot(const Vec2& v) const
{
return (x * v.x + y * v.y);
}
float Vec2::dot(const Vec2& v1, const Vec2& v2)
{
return (v1.x * v2.x + v1.y * v2.y);
@ -193,17 +136,6 @@ float Vec2::length() const
return sqrt(x * x + y * y);
}
float Vec2::lengthSquared() const
{
return (x * x + y * y);
}
void Vec2::negate()
{
x = -x;
y = -y;
}
void Vec2::normalize()
{
float n = x * x + y * y;
@ -228,18 +160,6 @@ Vec2 Vec2::getNormalized() const
return v;
}
void Vec2::scale(float scalar)
{
x *= scalar;
y *= scalar;
}
void Vec2::scale(const Vec2& scale)
{
x *= scale.x;
y *= scale.y;
}
void Vec2::rotate(const Vec2& point, float angle)
{
double sinAngle = sin(angle);
@ -261,12 +181,6 @@ void Vec2::rotate(const Vec2& point, float angle)
}
}
void Vec2::set(float xx, float yy)
{
this->x = xx;
this->y = yy;
}
void Vec2::set(const float* array)
{
GP_ASSERT(array);
@ -275,24 +189,6 @@ void Vec2::set(const float* array)
y = array[1];
}
void Vec2::set(const Vec2& v)
{
this->x = v.x;
this->y = v.y;
}
void Vec2::set(const Vec2& p1, const Vec2& p2)
{
x = p2.x - p1.x;
y = p2.y - p1.y;
}
void Vec2::subtract(const Vec2& v)
{
x -= v.x;
y -= v.y;
}
void Vec2::subtract(const Vec2& v1, const Vec2& v2, Vec2* dst)
{
GP_ASSERT(dst);
@ -301,20 +197,6 @@ void Vec2::subtract(const Vec2& v1, const Vec2& v2, Vec2* dst)
dst->y = v1.y - v2.y;
}
void Vec2::smooth(const Vec2& target, float elapsedTime, float responseTime)
{
if (elapsedTime > 0)
{
*this += (target - *this) * (elapsedTime / (elapsedTime + responseTime));
}
}
void Vec2::setPoint(float xx, float yy)
{
this->x = xx;
this->y = yy;
}
bool Vec2::equals(const Vec2& target) const
{
return (fabs(this->x - target.x) < FLT_EPSILON)
@ -449,18 +331,18 @@ Vec2 Vec2::getIntersectPoint(const Vec2& A, const Vec2& B, const Vec2& C, const
return Vec2::ZERO;
}
const Vec2 Vec2::ZERO = Vec2(0.0f, 0.0f);
const Vec2 Vec2::ONE = Vec2(1.0f, 1.0f);
const Vec2 Vec2::UNIT_X = Vec2(1.0f, 0.0f);
const Vec2 Vec2::UNIT_Y = Vec2(0.0f, 1.0f);
const Vec2 Vec2::ANCHOR_MIDDLE = Vec2(0.5f, 0.5f);
const Vec2 Vec2::ANCHOR_BOTTOM_LEFT = Vec2(0.0f, 0.0f);
const Vec2 Vec2::ANCHOR_TOP_LEFT = Vec2(0.0f, 1.0f);
const Vec2 Vec2::ANCHOR_BOTTOM_RIGHT = Vec2(1.0f, 0.0f);
const Vec2 Vec2::ANCHOR_TOP_RIGHT = Vec2(1.0f, 1.0f);
const Vec2 Vec2::ANCHOR_MIDDLE_RIGHT = Vec2(1.0f, 0.5f);
const Vec2 Vec2::ANCHOR_MIDDLE_LEFT = Vec2(0.0f, 0.5f);
const Vec2 Vec2::ANCHOR_MIDDLE_TOP = Vec2(0.5f, 1.0f);
const Vec2 Vec2::ANCHOR_MIDDLE_BOTTOM = Vec2(0.5f, 0.0f);
const Vec2 Vec2::ZERO(0.0f, 0.0f);
const Vec2 Vec2::ONE(1.0f, 1.0f);
const Vec2 Vec2::UNIT_X(1.0f, 0.0f);
const Vec2 Vec2::UNIT_Y(0.0f, 1.0f);
const Vec2 Vec2::ANCHOR_MIDDLE(0.5f, 0.5f);
const Vec2 Vec2::ANCHOR_BOTTOM_LEFT(0.0f, 0.0f);
const Vec2 Vec2::ANCHOR_TOP_LEFT(0.0f, 1.0f);
const Vec2 Vec2::ANCHOR_BOTTOM_RIGHT(1.0f, 0.0f);
const Vec2 Vec2::ANCHOR_TOP_RIGHT(1.0f, 1.0f);
const Vec2 Vec2::ANCHOR_MIDDLE_RIGHT(1.0f, 0.5f);
const Vec2 Vec2::ANCHOR_MIDDLE_LEFT(0.0f, 0.5f);
const Vec2 Vec2::ANCHOR_MIDDLE_TOP(0.5f, 1.0f);
const Vec2 Vec2::ANCHOR_MIDDLE_BOTTOM(0.5f, 0.0f);
NS_CC_MATH_END

35
cocos/math/Vec2.h
View File

@ -109,14 +109,14 @@ public:
*
* @return true if this vector contains all zeros, false otherwise.
*/
bool isZero() const;
inline bool isZero() const;
/**
* Indicates whether this vector contains all ones.
*
* @return true if this vector contains all ones, false otherwise.
*/
bool isOne() const;
inline bool isOne() const;
/**
* Returns the angle (in radians) between the specified vectors.
@ -133,7 +133,7 @@ public:
*
* @param v The vector to add.
*/
void add(const Vec2& v);
inline void add(const Vec2& v);
/**
* Adds the specified vectors and stores the result in dst.
@ -187,7 +187,7 @@ public:
*
* @see distance
*/
float distanceSquared(const Vec2& v) const;
inline float distanceSquared(const Vec2& v) const;
/**
* Returns the dot product of this vector and the specified vector.
@ -196,7 +196,7 @@ public:
*
* @return The dot product.
*/
float dot(const Vec2& v) const;
inline float dot(const Vec2& v) const;
/**
* Returns the dot product between the specified vectors.
@ -229,12 +229,12 @@ public:
*
* @see length
*/
float lengthSquared() const;
inline float lengthSquared() const;
/**
* Negates this vector.
*/
void negate();
inline void negate();
/**
* Normalizes this vector.
@ -259,14 +259,14 @@ public:
*
* @param scalar The scalar value.
*/
void scale(float scalar);
inline void scale(float scalar);
/**
* Scales each element of this vector by the matching component of scale.
*
* @param scale The vector to scale by.
*/
void scale(const Vec2& scale);
inline void scale(const Vec2& scale);
/**
* Rotates this vector by angle (specified in radians) around the given point.
@ -282,7 +282,7 @@ public:
* @param xx The new x coordinate.
* @param yy The new y coordinate.
*/
void set(float xx, float yy);
inline void set(float xx, float yy);
/**
* Sets the elements of this vector from the values in the specified array.
@ -296,7 +296,7 @@ public:
*
* @param v The vector to copy.
*/
void set(const Vec2& v);
inline void set(const Vec2& v);
/**
* Sets this vector to the directional vector between the specified points.
@ -304,7 +304,12 @@ public:
* @param p1 The first point.
* @param p2 The second point.
*/
void set(const Vec2& p1, const Vec2& p2);
inline void set(const Vec2& p1, const Vec2& p2);
/**
* Sets the elements of this vector to zero.
*/
inline void setZero();
/**
* Subtracts this vector and the specified vector as (this - v)
@ -312,7 +317,7 @@ public:
*
* @param v The vector to subtract.
*/
void subtract(const Vec2& v);
inline void subtract(const Vec2& v);
/**
* Subtracts the specified vectors and stores the result in dst.
@ -335,7 +340,7 @@ public:
* @param elapsedTime elapsed time between calls.
* @param responseTime response time (in the same units as elapsedTime).
*/
void smooth(const Vec2& target, float elapsedTime, float responseTime);
inline void smooth(const Vec2& target, float elapsedTime, float responseTime);
/**
* Calculates the sum of this vector with the given vector.
@ -452,7 +457,7 @@ public:
* @js NA
* @lua NA
*/
void setPoint(float xx, float yy);
inline void setPoint(float xx, float yy);
/**
* @js NA
*/

123
cocos/math/Vec2.inl
View File

@ -22,6 +22,123 @@
NS_CC_MATH_BEGIN
inline Vec2::Vec2()
: x(0.0f), y(0.0f)
{
}
inline Vec2::Vec2(float xx, float yy)
: x(xx), y(yy)
{
}
inline Vec2::Vec2(const float* array)
{
set(array);
}
inline Vec2::Vec2(const Vec2& p1, const Vec2& p2)
{
set(p1, p2);
}
inline Vec2::Vec2(const Vec2& copy)
{
set(copy);
}
inline Vec2::~Vec2()
{
}
inline bool Vec2::isZero() const
{
return x == 0.0f && y == 0.0f;
}
bool Vec2::isOne() const
{
return x == 1.0f && y == 1.0f;
}
inline void Vec2::add(const Vec2& v)
{
x += v.x;
y += v.y;
}
inline float Vec2::distanceSquared(const Vec2& v) const
{
float dx = v.x - x;
float dy = v.y - y;
return (dx * dx + dy * dy);
}
inline float Vec2::dot(const Vec2& v) const
{
return (x * v.x + y * v.y);
}
inline float Vec2::lengthSquared() const
{
return (x * x + y * y);
}
inline void Vec2::negate()
{
x = -x;
y = -y;
}
inline void Vec2::scale(float scalar)
{
x *= scalar;
y *= scalar;
}
inline void Vec2::scale(const Vec2& scale)
{
x *= scale.x;
y *= scale.y;
}
inline void Vec2::set(float xx, float yy)
{
this->x = xx;
this->y = yy;
}
inline void Vec2::set(const Vec2& v)
{
this->x = v.x;
this->y = v.y;
}
inline void Vec2::set(const Vec2& p1, const Vec2& p2)
{
x = p2.x - p1.x;
y = p2.y - p1.y;
}
void Vec2::setZero()
{
x = y = 0.0f;
}
inline void Vec2::subtract(const Vec2& v)
{
x -= v.x;
y -= v.y;
}
inline void Vec2::smooth(const Vec2& target, float elapsedTime, float responseTime)
{
if (elapsedTime > 0)
{
*this += (target - *this) * (elapsedTime / (elapsedTime + responseTime));
}
}
inline const Vec2 Vec2::operator+(const Vec2& v) const
{
Vec2 result(*this);
@ -108,4 +225,10 @@ inline const Vec2 operator*(float x, const Vec2& v)
return result;
}
void Vec2::setPoint(float xx, float yy)
{
this->x = xx;
this->y = yy;
}
NS_CC_MATH_END

6
cocos/math/Vec3.h
View File

@ -361,6 +361,12 @@ public:
*/
void smooth(const Vec3& target, float elapsedTime, float responseTime);
/**
* Linear interpolation between two vectors A and B by alpha which
* is in the range [0,1]
*/
inline Vec3 lerp(const Vec3& target, float alpha) const;
/**
* Calculates the sum of this vector with the given vector.
*

5
cocos/math/Vec3.inl
View File

@ -72,6 +72,11 @@ inline void Vec3::scale(float scalar)
z *= scalar;
}
inline Vec3 Vec3::lerp(const Vec3 &target, float alpha) const
{
return *this * (1.f - alpha) + target * alpha;
}
inline void Vec3::set(float xx, float yy, float zz)
{
this->x = xx;

1
cocos/physics/CCPhysicsBody.cpp
View File

@ -69,7 +69,6 @@ PhysicsBody::PhysicsBody()
, _angularDamping(0.0f)
, _tag(0)
, _positionInitDirty(true)
, _recordedPosition(Vec2::ZERO)
, _rotationOffset(0)
, _recordedRotation(0.0f)
, _recordedAngle(0.0)

39
cocos/platform/CCImage.cpp
View File

@ -880,12 +880,45 @@ bool Image::decodeWithWIC(const unsigned char *data, ssize_t dataLen)
bool Image::encodeWithWIC(const std::string& filePath, bool isToRGB, GUID containerFormat)
{
WICPixelFormatGUID format = isToRGB ? GUID_WICPixelFormat24bppRGB : GUID_WICPixelFormat32bppRGBA;
// Save formats supported by WIC
WICPixelFormatGUID targetFormat = isToRGB ? GUID_WICPixelFormat24bppBGR : GUID_WICPixelFormat32bppBGRA;
unsigned char *pSaveData = nullptr;
int saveLen = _dataLen;
int bpp = 4;
WICImageLoader img;
return img.encodeImageData(filePath, _data, _dataLen, format, _width, _height, containerFormat);
if (targetFormat == GUID_WICPixelFormat24bppBGR && _renderFormat == Texture2D::PixelFormat::RGBA8888)
{
bpp = 3;
saveLen = _width * _height * bpp;
pSaveData = new unsigned char[saveLen];
int indL = 0, indR = 0;
while (indL < saveLen && indR < _dataLen)
{
memcpy(&pSaveData[indL], &_data[indR], 3);
indL += 3;
indR += 4;
}
}
else
{
pSaveData = new unsigned char[saveLen];
memcpy(pSaveData, _data, saveLen);
}
for (int ind = 2; ind < saveLen; ind += bpp) {
std::swap(pSaveData[ind - 2], pSaveData[ind]);
}
bool bRet = false;
WICImageLoader img;
bRet = img.encodeImageData(filePath, pSaveData, saveLen, targetFormat, _width, _height, containerFormat);
delete[] pSaveData;
return bRet;
}
#endif //CC_USE_WIC
bool Image::initWithJpgData(const unsigned char * data, ssize_t dataLen)

1
cocos/platform/android/Android.mk
View File

@ -33,7 +33,6 @@ LOCAL_EXPORT_LDLIBS := -lGLESv1_CM \
-lGLESv2 \
-lEGL \
-llog \
-lz \
-landroid
LOCAL_CPPFLAGS := -Wno-extern-c-compat

35
cocos/platform/win8.1-universal/OpenGLESPage.xaml.cpp
View File

@ -36,6 +36,10 @@ using namespace Windows::UI::Xaml::Input;
using namespace Windows::UI::Xaml::Media;
using namespace Windows::UI::Xaml::Navigation;
#if (WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP)
using namespace Windows::Phone::UI::Input;
#endif
OpenGLESPage::OpenGLESPage() :
OpenGLESPage(nullptr)
{
@ -76,6 +80,7 @@ OpenGLESPage::OpenGLESPage(OpenGLES* openGLES) :
#if (WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP)
Windows::UI::ViewManagement::StatusBar::GetForCurrentView()->HideAsync();
HardwareButtons::BackPressed += ref new EventHandler<BackPressedEventArgs^>(this, &OpenGLESPage::OnBackButtonPressed);
#else
// Disable all pointer visual feedback for better performance when touching.
// This is not supported on Windows Phone applications.
@ -163,6 +168,21 @@ void OpenGLESPage::OnVisibilityChanged(Windows::UI::Core::CoreWindow^ sender, Wi
}
}
#if (WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP)
void OpenGLESPage::OnBackButtonPressed(Object^ sender, BackPressedEventArgs^ args)
{
bool myAppCanNavigate = false;
if (myAppCanNavigate)
{
args->Handled = true;
}
else {
// Do nothing. Leave args->Handled set to the current value, false.
}
}
#endif
void OpenGLESPage::OnSwapChainPanelSizeChanged(Object^ sender, Windows::UI::Xaml::SizeChangedEventArgs^ e)
{
// Size change events occur outside of the render thread. A lock is required when updating
@ -283,6 +303,11 @@ void OpenGLESPage::StartRenderLoop()
{
m_deviceLost = true;
if (m_renderer)
{
m_renderer->Pause();
}
// XAML objects like the SwapChainPanel must only be manipulated on the UI thread.
swapChainPanel->Dispatcher->RunAsync(Windows::UI::Core::CoreDispatcherPriority::High, ref new Windows::UI::Core::DispatchedHandler([=]()
{
@ -292,6 +317,11 @@ void OpenGLESPage::StartRenderLoop()
return;
}
}
if (m_renderer)
{
m_renderer->Pause();
}
});
// Run task on a dedicated high priority background thread.
@ -305,9 +335,4 @@ void OpenGLESPage::StopRenderLoop()
mRenderLoopWorker->Cancel();
mRenderLoopWorker = nullptr;
}
if (m_renderer)
{
m_renderer->Pause();
}
}

3
cocos/platform/win8.1-universal/OpenGLESPage.xaml.h
View File

@ -39,6 +39,9 @@ namespace cocos2d
void OnPageLoaded(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e);
void OnVisibilityChanged(Windows::UI::Core::CoreWindow^ sender, Windows::UI::Core::VisibilityChangedEventArgs^ args);
void OnSwapChainPanelSizeChanged(Platform::Object^ sender, Windows::UI::Xaml::SizeChangedEventArgs^ e);
#if (WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP)
void OnBackButtonPressed(Platform::Object^ sender, Windows::Phone::UI::Input::BackPressedEventArgs^ args);
#endif
void GetSwapChainPanelSize(GLsizei* width, GLsizei* height);
void CreateRenderSurface();
void DestroyRenderSurface();

44
cocos/platform/winrt/WICImageLoader-win.cpp
View File

@ -325,23 +325,21 @@ WICPixelFormatGUID WICImageLoader::getPixelFormat()
return _format;
}
bool WICImageLoader::encodeImageData(std::string path, ImageBlob data, size_t dataLen, WICPixelFormatGUID pixelFormat, int width, int height, GUID containerFormat)
bool WICImageLoader::encodeImageData(std::string path, const unsigned char* data, size_t dataLen, WICPixelFormatGUID pixelFormat, int width, int height, GUID containerFormat)
{
assert(data != NULL);
assert(dataLen > 0 && width > 0 && height > 0);
IWICImagingFactory* pFact = getWICFactory();
HRESULT hr = S_FALSE;
HRESULT hr = E_FAIL;
IWICStream* pStream = NULL;
if(NULL != pFact)
{
if (NULL != pFact) {
hr = pFact->CreateStream(&pStream);
}
if(SUCCEEDED(hr))
{
if (SUCCEEDED(hr)) {
std::wstring wpath;
wpath.assign(path.begin(), path.end());
hr = pStream->InitializeFromFilename(wpath.c_str(), GENERIC_WRITE);
@ -349,54 +347,50 @@ bool WICImageLoader::encodeImageData(std::string path, ImageBlob data, size_t da
IWICBitmapEncoder* pEnc = NULL;
if(SUCCEEDED(hr))
{
if (SUCCEEDED(hr)) {
hr = pFact->CreateEncoder(containerFormat, NULL, &pEnc);
}
if(SUCCEEDED(hr))
{
if (SUCCEEDED(hr)) {
hr = pEnc->Initialize(pStream, WICBitmapEncoderNoCache);
}
IWICBitmapFrameEncode* pFrame = NULL;
IPropertyBag2* pProp = NULL;
if(SUCCEEDED(hr))
{
if (SUCCEEDED(hr)) {
hr = pEnc->CreateNewFrame(&pFrame, &pProp);
}
if(SUCCEEDED(hr))
{
if (SUCCEEDED(hr)) {
hr = pFrame->Initialize(pProp);
}
if(SUCCEEDED(hr))
{
if (SUCCEEDED(hr)) {
hr = pFrame->SetSize(width, height);
}
if(SUCCEEDED(hr))
{
hr = pFrame->SetPixelFormat(&pixelFormat);
if (SUCCEEDED(hr)) {
WICPixelFormatGUID targetFormat = pixelFormat;
hr = pFrame->SetPixelFormat(&targetFormat);
if (targetFormat != pixelFormat) {
hr = E_INVALIDARG;
}
}
if(SUCCEEDED(hr))
{
if (SUCCEEDED(hr)) {
size_t bpp = getBitsPerPixel(pixelFormat);
size_t stride = (width * bpp + 7) / 8;
hr = pFrame->WritePixels(height, stride, dataLen, (BYTE*)data);
}
if(SUCCEEDED(hr))
{
if (SUCCEEDED(hr)) {
hr = pFrame->Commit();
}
if(SUCCEEDED(hr))
{
if (SUCCEEDED(hr)) {
hr = pEnc->Commit();
}

2
cocos/platform/winrt/WICImageLoader-win.h
View File

@ -59,7 +59,7 @@ public:
WICPixelFormatGUID getPixelFormat();
int getImageData(ImageBlob rawData, size_t dataLen);
bool decodeImageData(ImageBlob data, size_t dataLen);
bool encodeImageData(std::string path, ImageBlob data, size_t dataLen, WICPixelFormatGUID pixelFormat, int width, int height, GUID containerFormat);
bool encodeImageData(std::string path, const unsigned char* data, size_t dataLen, WICPixelFormatGUID pixelFormat, int width, int height, GUID containerFormat);
protected:
bool processImage(IWICBitmapDecoder* decoder);

2
cocos/scripting/lua-bindings/manual/LuaBasicConversions.cpp
View File

@ -630,7 +630,7 @@ bool luaval_to_color4b(lua_State* L,int lo,Color4B* outValue, const char* funcNa
lua_pushstring(L, "a");
lua_gettable(L,lo);
outValue->a = lua_isnil(L,-1) ? 0 : lua_tonumber(L,-1);
outValue->a = lua_isnil(L,-1) ? 255 : lua_tonumber(L,-1);
lua_pop(L,1);
}

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

@ -17,7 +17,6 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../.. \
LOCAL_EXPORT_LDLIBS := -lGLESv2 \
-llog \
-lz \
-landroid
LOCAL_STATIC_LIBRARIES := luajit_static
@ -111,13 +110,6 @@ LOCAL_SRC_FILES += ../manual/ui/lua_cocos2dx_experimental_video_manual.cpp \
../auto/lua_cocos2dx_experimental_video_auto.cpp \
../auto/lua_cocos2dx_ui_auto.cpp
#quick
LOCAL_SRC_FILES += ../../../../external/lua/quick/lua_cocos2dx_quick_manual.cpp \
../../../../external/lua/quick/LuaEventNode.cpp \
../../../../external/lua/quick/LuaNodeManager.cpp \
../../../../external/lua/quick/LuaTouchEventManager.cpp \
../../../../external/lua/quick/LuaTouchTargetNode.cpp
#extension
LOCAL_SRC_FILES += ../manual/extension/lua_cocos2dx_extension_manual.cpp \
../auto/lua_cocos2dx_extension_auto.cpp \
@ -147,8 +139,7 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../../external/lua/tolua \
$(LOCAL_PATH)/../manual/ui \
$(LOCAL_PATH)/../../../../external/xxtea \
$(LOCAL_PATH)/../../../.. \
$(LOCAL_PATH)/../../../../external/lua \
$(LOCAL_PATH)/../../../../external/lua/quick
$(LOCAL_PATH)/../../../../external/lua
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../../external/lua/tolua \
$(LOCAL_PATH)/../../../../external/lua/luajit/include \
@ -164,7 +155,6 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../../external/lua/tolua \
$(LOCAL_PATH)/../manual/spine \
$(LOCAL_PATH)/../manual/extension \
$(LOCAL_PATH)/../manual/ui \
$(LOCAL_PATH)/../../../../external/lua/quick \
$(LOCAL_PATH)/../../../..
LOCAL_WHOLE_STATIC_LIBRARIES := cocos2d_lua_android_static

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

@ -263,26 +263,6 @@
F4FE0D5819ECD00100B8B12B /* luasocket_scripts.c in Sources */ = {isa = PBXBuildFile; fileRef = F4FE0D5519ECD00100B8B12B /* luasocket_scripts.c */; };
F4FE0D5919ECD00100B8B12B /* luasocket_scripts.h in Headers */ = {isa = PBXBuildFile; fileRef = F4FE0D5619ECD00100B8B12B /* luasocket_scripts.h */; };
F4FE0D5A19ECD00100B8B12B /* luasocket_scripts.h in Headers */ = {isa = PBXBuildFile; fileRef = F4FE0D5619ECD00100B8B12B /* luasocket_scripts.h */; };
F4FE0D6619ECD02400B8B12B /* lua_cocos2dx_quick_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F4FE0D5C19ECD02400B8B12B /* lua_cocos2dx_quick_manual.cpp */; };
F4FE0D6719ECD02400B8B12B /* lua_cocos2dx_quick_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F4FE0D5C19ECD02400B8B12B /* lua_cocos2dx_quick_manual.cpp */; };
F4FE0D6819ECD02400B8B12B /* lua_cocos2dx_quick_manual.hpp in Headers */ = {isa = PBXBuildFile; fileRef = F4FE0D5D19ECD02400B8B12B /* lua_cocos2dx_quick_manual.hpp */; };
F4FE0D6919ECD02400B8B12B /* lua_cocos2dx_quick_manual.hpp in Headers */ = {isa = PBXBuildFile; fileRef = F4FE0D5D19ECD02400B8B12B /* lua_cocos2dx_quick_manual.hpp */; };
F4FE0D6A19ECD02400B8B12B /* LuaEventNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F4FE0D5E19ECD02400B8B12B /* LuaEventNode.cpp */; };
F4FE0D6B19ECD02400B8B12B /* LuaEventNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F4FE0D5E19ECD02400B8B12B /* LuaEventNode.cpp */; };
F4FE0D6C19ECD02400B8B12B /* LuaEventNode.h in Headers */ = {isa = PBXBuildFile; fileRef = F4FE0D5F19ECD02400B8B12B /* LuaEventNode.h */; };
F4FE0D6D19ECD02400B8B12B /* LuaEventNode.h in Headers */ = {isa = PBXBuildFile; fileRef = F4FE0D5F19ECD02400B8B12B /* LuaEventNode.h */; };
F4FE0D6E19ECD02400B8B12B /* LuaNodeManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F4FE0D6019ECD02400B8B12B /* LuaNodeManager.cpp */; };
F4FE0D6F19ECD02400B8B12B /* LuaNodeManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F4FE0D6019ECD02400B8B12B /* LuaNodeManager.cpp */; };
F4FE0D7019ECD02400B8B12B /* LuaNodeManager.h in Headers */ = {isa = PBXBuildFile; fileRef = F4FE0D6119ECD02400B8B12B /* LuaNodeManager.h */; };
F4FE0D7119ECD02400B8B12B /* LuaNodeManager.h in Headers */ = {isa = PBXBuildFile; fileRef = F4FE0D6119ECD02400B8B12B /* LuaNodeManager.h */; };
F4FE0D7219ECD02400B8B12B /* LuaTouchEventManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F4FE0D6219ECD02400B8B12B /* LuaTouchEventManager.cpp */; };
F4FE0D7319ECD02400B8B12B /* LuaTouchEventManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F4FE0D6219ECD02400B8B12B /* LuaTouchEventManager.cpp */; };
F4FE0D7419ECD02400B8B12B /* LuaTouchEventManager.h in Headers */ = {isa = PBXBuildFile; fileRef = F4FE0D6319ECD02400B8B12B /* LuaTouchEventManager.h */; };
F4FE0D7519ECD02400B8B12B /* LuaTouchEventManager.h in Headers */ = {isa = PBXBuildFile; fileRef = F4FE0D6319ECD02400B8B12B /* LuaTouchEventManager.h */; };
F4FE0D7619ECD02400B8B12B /* LuaTouchTargetNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F4FE0D6419ECD02400B8B12B /* LuaTouchTargetNode.cpp */; };
F4FE0D7719ECD02400B8B12B /* LuaTouchTargetNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F4FE0D6419ECD02400B8B12B /* LuaTouchTargetNode.cpp */; };
F4FE0D7819ECD02400B8B12B /* LuaTouchTargetNode.h in Headers */ = {isa = PBXBuildFile; fileRef = F4FE0D6519ECD02400B8B12B /* LuaTouchTargetNode.h */; };
F4FE0D7919ECD02400B8B12B /* LuaTouchTargetNode.h in Headers */ = {isa = PBXBuildFile; fileRef = F4FE0D6519ECD02400B8B12B /* LuaTouchTargetNode.h */; };
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
@ -426,16 +406,6 @@
C0D9BAFA1974D30000EC35BB /* liblua.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblua.a; path = ../../../../external/lua/lua/prebuilt/ios/liblua.a; sourceTree = "<group>"; };
F4FE0D5519ECD00100B8B12B /* luasocket_scripts.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = luasocket_scripts.c; sourceTree = "<group>"; };
F4FE0D5619ECD00100B8B12B /* luasocket_scripts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = luasocket_scripts.h; sourceTree = "<group>"; };
F4FE0D5C19ECD02400B8B12B /* lua_cocos2dx_quick_manual.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_cocos2dx_quick_manual.cpp; sourceTree = "<group>"; };
F4FE0D5D19ECD02400B8B12B /* lua_cocos2dx_quick_manual.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = lua_cocos2dx_quick_manual.hpp; sourceTree = "<group>"; };
F4FE0D5E19ECD02400B8B12B /* LuaEventNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LuaEventNode.cpp; sourceTree = "<group>"; };
F4FE0D5F19ECD02400B8B12B /* LuaEventNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LuaEventNode.h; sourceTree = "<group>"; };
F4FE0D6019ECD02400B8B12B /* LuaNodeManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LuaNodeManager.cpp; sourceTree = "<group>"; };
F4FE0D6119ECD02400B8B12B /* LuaNodeManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LuaNodeManager.h; sourceTree = "<group>"; };
F4FE0D6219ECD02400B8B12B /* LuaTouchEventManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LuaTouchEventManager.cpp; sourceTree = "<group>"; };
F4FE0D6319ECD02400B8B12B /* LuaTouchEventManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LuaTouchEventManager.h; sourceTree = "<group>"; };
F4FE0D6419ECD02400B8B12B /* LuaTouchTargetNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LuaTouchTargetNode.cpp; sourceTree = "<group>"; };
F4FE0D6519ECD02400B8B12B /* LuaTouchTargetNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LuaTouchTargetNode.h; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@ -678,7 +648,6 @@
children = (
1ABCA1E318CD8F2D0087CE3A /* luajit */,
1ABCA20E18CD8F7D0087CE3A /* luasocket */,
F4FE0D5B19ECD02400B8B12B /* quick */,
1ABCA1E418CD8F330087CE3A /* tolua */,
1540AF54193EC30500717D8E /* xxtea */,
);
@ -788,24 +757,6 @@
path = audioengine;
sourceTree = "<group>";
};
F4FE0D5B19ECD02400B8B12B /* quick */ = {
isa = PBXGroup;
children = (
F4FE0D5C19ECD02400B8B12B /* lua_cocos2dx_quick_manual.cpp */,
F4FE0D5D19ECD02400B8B12B /* lua_cocos2dx_quick_manual.hpp */,
F4FE0D5E19ECD02400B8B12B /* LuaEventNode.cpp */,
F4FE0D5F19ECD02400B8B12B /* LuaEventNode.h */,
F4FE0D6019ECD02400B8B12B /* LuaNodeManager.cpp */,
F4FE0D6119ECD02400B8B12B /* LuaNodeManager.h */,
F4FE0D6219ECD02400B8B12B /* LuaTouchEventManager.cpp */,
F4FE0D6319ECD02400B8B12B /* LuaTouchEventManager.h */,
F4FE0D6419ECD02400B8B12B /* LuaTouchTargetNode.cpp */,
F4FE0D6519ECD02400B8B12B /* LuaTouchTargetNode.h */,
);
name = quick;
path = ../../../../external/lua/quick;
sourceTree = "<group>";
};
/* End PBXGroup section */
/* Begin PBXHeadersBuildPhase section */
@ -832,7 +783,6 @@
15AC69DF1987711400D17520 /* lua.h in Headers */,
15AC69E01987711400D17520 /* luaconf.h in Headers */,
155C7DF819A71C4400F08B25 /* lua_cocos2dx_cocosdenshion_manual.h in Headers */,
F4FE0D7419ECD02400B8B12B /* LuaTouchEventManager.h in Headers */,
15415AAF19A71A53004F1E71 /* except.h in Headers */,
150906F319D556D1002C4D97 /* lua_cocos2dx_audioengine_manual.h in Headers */,
155C7E0419A71C6D00F08B25 /* lua_cocos2dx_cocosbuilder_manual.h in Headers */,
@ -860,10 +810,7 @@
15C1C2D5198749BC00A46ACC /* LuaOpengl.h in Headers */,
155C7E2819A71CE600F08B25 /* lua_cocos2dx_ui_manual.hpp in Headers */,
15C1C2D6198749BC00A46ACC /* lua_cocos2dx_deprecated.h in Headers */,
F4FE0D6C19ECD02400B8B12B /* LuaEventNode.h in Headers */,
15C1C2D7198749BC00A46ACC /* lua_cocos2dx_experimental_manual.hpp in Headers */,
F4FE0D7019ECD02400B8B12B /* LuaNodeManager.h in Headers */,
F4FE0D6819ECD02400B8B12B /* lua_cocos2dx_quick_manual.hpp in Headers */,
15C1C2D8198749BC00A46ACC /* lua_cocos2dx_manual.hpp in Headers */,
155C7E0819A71C7B00F08B25 /* lua_cocos2dx_extension_manual.h in Headers */,
155C7E1819A71CB300F08B25 /* lua_xml_http_request.h in Headers */,
@ -872,7 +819,6 @@
15C1C2DA198749BC00A46ACC /* LuaScriptHandlerMgr.h in Headers */,
15AC69D619876EA200D17520 /* lua_cocos2dx_physics_auto.hpp in Headers */,
155C7E0019A71C6000F08B25 /* CCBProxy.h in Headers */,
F4FE0D7819ECD02400B8B12B /* LuaTouchTargetNode.h in Headers */,
15415AC719A71A53004F1E71 /* select.h in Headers */,
155C7E1C19A71CC200F08B25 /* lua_cocos2dx_spine_manual.hpp in Headers */,
15C1C2D41987499F00A46ACC /* lua_cocos2dx_auto.hpp in Headers */,
@ -904,7 +850,6 @@
15EFA64B198B3320000C57D3 /* tolua_event.h in Headers */,
15EFA64C198B3320000C57D3 /* tolua++.h in Headers */,
155C7DF919A71C4500F08B25 /* lua_cocos2dx_cocosdenshion_manual.h in Headers */,
F4FE0D7519ECD02400B8B12B /* LuaTouchEventManager.h in Headers */,
15415AB019A71A53004F1E71 /* except.h in Headers */,
3E2BDB0B19C5E6100055CDCD /* lua_cocos2dx_audioengine_manual.h in Headers */,
155C7E0519A71C6F00F08B25 /* lua_cocos2dx_cocosbuilder_manual.h in Headers */,
@ -932,10 +877,7 @@
15EFA62C198B3220000C57D3 /* lua_cocos2dx_deprecated.h in Headers */,
155C7E2919A71CE800F08B25 /* lua_cocos2dx_ui_manual.hpp in Headers */,
15EFA62D198B3220000C57D3 /* lua_cocos2dx_experimental_manual.hpp in Headers */,
F4FE0D6D19ECD02400B8B12B /* LuaEventNode.h in Headers */,
15EFA62E198B3220000C57D3 /* lua_cocos2dx_manual.hpp in Headers */,
F4FE0D7119ECD02400B8B12B /* LuaNodeManager.h in Headers */,
F4FE0D6919ECD02400B8B12B /* lua_cocos2dx_quick_manual.hpp in Headers */,
15EFA62F198B3220000C57D3 /* lua_cocos2dx_physics_manual.hpp in Headers */,
155C7E0919A71C8500F08B25 /* lua_cocos2dx_extension_manual.h in Headers */,
155C7E1919A71CB500F08B25 /* lua_xml_http_request.h in Headers */,
@ -944,7 +886,6 @@
15EFA622198B2E74000C57D3 /* lua_cocos2dx_experimental_auto.hpp in Headers */,
15EFA623198B2E74000C57D3 /* lua_cocos2dx_auto.hpp in Headers */,
155C7E0119A71C6300F08B25 /* CCBProxy.h in Headers */,
F4FE0D7919ECD02400B8B12B /* LuaTouchTargetNode.h in Headers */,
15415AC819A71A53004F1E71 /* select.h in Headers */,
155C7E1D19A71CC300F08B25 /* lua_cocos2dx_spine_manual.hpp in Headers */,
15EFA624198B2E74000C57D3 /* lua_cocos2dx_physics_auto.hpp in Headers */,
@ -1056,8 +997,6 @@
15415AC919A71A53004F1E71 /* serial.c in Sources */,
155C7E0219A71C6700F08B25 /* lua_cocos2dx_cocosbuilder_manual.cpp in Sources */,
15C1C2DF19874B8800A46ACC /* CCLuaStack.cpp in Sources */,
F4FE0D6619ECD02400B8B12B /* lua_cocos2dx_quick_manual.cpp in Sources */,
F4FE0D6E19ECD02400B8B12B /* LuaNodeManager.cpp in Sources */,
15C1C2E019874B8800A46ACC /* CCLuaValue.cpp in Sources */,
155C7DF219A71C3200F08B25 /* lua_cocos2dx_3d_manual.cpp in Sources */,
15415AB119A71A53004F1E71 /* inet.c in Sources */,
@ -1072,15 +1011,12 @@
566F015F19B5EB0F00FCA620 /* CustomGUIReader.cpp in Sources */,
15415AC119A71A53004F1E71 /* options.c in Sources */,
150906F019D556C5002C4D97 /* lua_cocos2dx_audioengine_auto.cpp in Sources */,
F4FE0D7619ECD02400B8B12B /* LuaTouchTargetNode.cpp in Sources */,
155C7E0A19A71C8B00F08B25 /* lua_cocos2dx_network_manual.cpp in Sources */,
15415AD119A71A53004F1E71 /* timeout.c in Sources */,
15C1C2CF1987498B00A46ACC /* lua_cocos2dx_deprecated.cpp in Sources */,
155C7E2219A71CD300F08B25 /* lua_cocos2dx_experimental_video_manual.cpp in Sources */,
155C7DFA19A71C4C00F08B25 /* lua_cocos2dx_coco_studio_manual.cpp in Sources */,
155C7E2619A71CDD00F08B25 /* lua_cocos2dx_ui_manual.cpp in Sources */,
F4FE0D6A19ECD02400B8B12B /* LuaEventNode.cpp in Sources */,
F4FE0D7219ECD02400B8B12B /* LuaTouchEventManager.cpp in Sources */,
15415A7019A71768004F1E71 /* lua_cocos2dx_extension_auto.cpp in Sources */,
155C7DF619A71C3E00F08B25 /* lua_cocos2dx_cocosdenshion_manual.cpp in Sources */,
15415AA519A71A53004F1E71 /* auxiliar.c in Sources */,
@ -1135,8 +1071,6 @@
15EFA627198B31FB000C57D3 /* lua_cocos2dx_experimental_manual.cpp in Sources */,
155C7E0319A71C6900F08B25 /* lua_cocos2dx_cocosbuilder_manual.cpp in Sources */,
15415ABE19A71A53004F1E71 /* mime.c in Sources */,
F4FE0D6719ECD02400B8B12B /* lua_cocos2dx_quick_manual.cpp in Sources */,
F4FE0D6F19ECD02400B8B12B /* LuaNodeManager.cpp in Sources */,
15415ADA19A71A53004F1E71 /* unix.c in Sources */,
155C7DF319A71C3400F08B25 /* lua_cocos2dx_3d_manual.cpp in Sources */,
15415ADE19A71A53004F1E71 /* usocket.c in Sources */,
@ -1151,15 +1085,12 @@
566F016019B5EB0F00FCA620 /* CustomGUIReader.cpp in Sources */,
155C7DF119A71C2300F08B25 /* lua_cocos2dx_studio_auto.cpp in Sources */,
3E2BDB0519C5E5FE0055CDCD /* lua_cocos2dx_audioengine_auto.cpp in Sources */,
F4FE0D7719ECD02400B8B12B /* LuaTouchTargetNode.cpp in Sources */,
155C7E0B19A71C8D00F08B25 /* lua_cocos2dx_network_manual.cpp in Sources */,
15415AAE19A71A53004F1E71 /* except.c in Sources */,
15415AAA19A71A53004F1E71 /* buffer.c in Sources */,
155C7E2319A71CD500F08B25 /* lua_cocos2dx_experimental_video_manual.cpp in Sources */,
155C7DFB19A71C4E00F08B25 /* lua_cocos2dx_coco_studio_manual.cpp in Sources */,
155C7E2719A71CDE00F08B25 /* lua_cocos2dx_ui_manual.cpp in Sources */,
F4FE0D6B19ECD02400B8B12B /* LuaEventNode.cpp in Sources */,
F4FE0D7319ECD02400B8B12B /* LuaTouchEventManager.cpp in Sources */,
15415AB619A71A53004F1E71 /* io.c in Sources */,
155C7DF719A71C4000F08B25 /* lua_cocos2dx_cocosdenshion_manual.cpp in Sources */,
155C7DEF19A71C0900F08B25 /* lua_cocos2dx_ui_auto.cpp in Sources */,

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

@ -25,11 +25,6 @@
<ClCompile Include="..\..\..\..\external\lua\luasocket\timeout.c" />
<ClCompile Include="..\..\..\..\external\lua\luasocket\udp.c" />
<ClCompile Include="..\..\..\..\external\lua\luasocket\wsocket.c" />
<ClCompile Include="..\..\..\..\external\lua\quick\LuaEventNode.cpp" />
<ClCompile Include="..\..\..\..\external\lua\quick\LuaNodeManager.cpp" />
<ClCompile Include="..\..\..\..\external\lua\quick\LuaTouchEventManager.cpp" />
<ClCompile Include="..\..\..\..\external\lua\quick\LuaTouchTargetNode.cpp" />
<ClCompile Include="..\..\..\..\external\lua\quick\lua_cocos2dx_quick_manual.cpp" />
<ClCompile Include="..\..\..\..\external\lua\tolua\tolua_event.c" />
<ClCompile Include="..\..\..\..\external\lua\tolua\tolua_is.c" />
<ClCompile Include="..\..\..\..\external\lua\tolua\tolua_map.c" />
@ -101,11 +96,6 @@
<ClInclude Include="..\..\..\..\external\lua\luasocket\timeout.h" />
<ClInclude Include="..\..\..\..\external\lua\luasocket\udp.h" />
<ClInclude Include="..\..\..\..\external\lua\luasocket\wsocket.h" />
<ClInclude Include="..\..\..\..\external\lua\quick\LuaEventNode.h" />
<ClInclude Include="..\..\..\..\external\lua\quick\LuaNodeManager.h" />
<ClInclude Include="..\..\..\..\external\lua\quick\LuaTouchEventManager.h" />
<ClInclude Include="..\..\..\..\external\lua\quick\LuaTouchTargetNode.h" />
<ClInclude Include="..\..\..\..\external\lua\quick\lua_cocos2dx_quick_manual.hpp" />
<ClInclude Include="..\..\..\..\external\lua\tolua\tolua++.h" />
<ClInclude Include="..\..\..\..\external\lua\tolua\tolua_event.h" />
<ClInclude Include="..\..\..\..\external\xxtea\xxtea.h" />

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

@ -70,9 +70,6 @@
<Filter Include="luasocket">
<UniqueIdentifier>{617e3909-01ff-4c11-bae5-790787963c34}</UniqueIdentifier>
</Filter>
<Filter Include="quick">
<UniqueIdentifier>{e6d6c5da-e7da-40cf-bde0-f383f9dd9dbe}</UniqueIdentifier>
</Filter>
<Filter Include="manual\audioengine">
<UniqueIdentifier>{08e7d51a-6f8a-4e54-8abe-a86101be8dad}</UniqueIdentifier>
</Filter>
@ -255,21 +252,6 @@
<ClCompile Include="..\manual\cocostudio\CustomGUIReader.cpp">
<Filter>manual\cocostudio</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\external\lua\quick\LuaTouchEventManager.cpp">
<Filter>quick</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\external\lua\quick\LuaTouchTargetNode.cpp">
<Filter>quick</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\external\lua\quick\lua_cocos2dx_quick_manual.cpp">
<Filter>quick</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\external\lua\quick\LuaEventNode.cpp">
<Filter>quick</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\external\lua\quick\LuaNodeManager.cpp">
<Filter>quick</Filter>
</ClCompile>
<ClCompile Include="..\auto\lua_cocos2dx_audioengine_auto.cpp">
<Filter>auto</Filter>
</ClCompile>
@ -470,21 +452,6 @@
<ClInclude Include="..\manual\cocostudio\CustomGUIReader.h">
<Filter>manual\cocostudio</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\external\lua\quick\LuaNodeManager.h">
<Filter>quick</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\external\lua\quick\LuaTouchEventManager.h">
<Filter>quick</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\external\lua\quick\LuaTouchTargetNode.h">
<Filter>quick</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\external\lua\quick\lua_cocos2dx_quick_manual.hpp">
<Filter>quick</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\external\lua\quick\LuaEventNode.h">
<Filter>quick</Filter>
</ClInclude>
<ClInclude Include="..\auto\lua_cocos2dx_audioengine_auto.hpp">
<Filter>auto</Filter>
</ClInclude>

10
cocos/ui/UILayout.cpp
View File

@ -502,11 +502,11 @@ void Layout::setStencilClippingSize(const Size &size)
if (_clippingEnabled && _clippingType == ClippingType::STENCIL)
{
Vec2 rect[4];
rect[0] = Vec2::ZERO;
rect[1] = Vec2(_contentSize.width, 0);
rect[2] = Vec2(_contentSize.width, _contentSize.height);
rect[3] = Vec2(0, _contentSize.height);
Color4F green(0, 1, 0, 1);
// rect[0].setZero(); Zero default
rect[1].set(_contentSize.width, 0.0f);
rect[2].set(_contentSize.width, _contentSize.height);
rect[3].set(0.0f, _contentSize.height);
Color4F green(0.0f, 1.0f, 0.0f, 1.0f);
_clippingStencil->clear();
_clippingStencil->drawPolygon(rect, 4, green, 0, green);
}

12
cocos/ui/UIScrollView.cpp
View File

@ -30,17 +30,16 @@ namespace ui {
static const float AUTOSCROLLMAXSPEED = 1000.0f;
const Vec2 SCROLLDIR_UP = Vec2(0.0f, 1.0f);
const Vec2 SCROLLDIR_DOWN = Vec2(0.0f, -1.0f);
const Vec2 SCROLLDIR_LEFT = Vec2(-1.0f, 0.0f);
const Vec2 SCROLLDIR_RIGHT = Vec2(1.0f, 0.0f);
const Vec2 SCROLLDIR_UP(0.0f, 1.0f);
const Vec2 SCROLLDIR_DOWN(0.0f, -1.0f);
const Vec2 SCROLLDIR_LEFT(-1.0f, 0.0f);
const Vec2 SCROLLDIR_RIGHT(1.0f, 0.0f);
IMPLEMENT_CLASS_GUI_INFO(ScrollView)
ScrollView::ScrollView():
_innerContainer(nullptr),
_direction(Direction::VERTICAL),
_autoScrollDir(Vec2::ZERO),
_topBoundary(0.0f),
_bottomBoundary(0.0f),
_leftBoundary(0.0f),
@ -55,10 +54,8 @@ _autoScrollOriginalSpeed(0.0f),
_autoScrollAcceleration(-1000.0f),
_isAutoScrollSpeedAttenuated(false),
_needCheckAutoScrollDestination(false),
_autoScrollDestination(Vec2::ZERO),
_bePressed(false),
_slidTime(0.0f),
_moveChildPoint(Vec2::ZERO),
_childFocusCancelOffset(5.0f),
_leftBounceNeeded(false),
_topBounceNeeded(false),
@ -66,7 +63,6 @@ _rightBounceNeeded(false),
_bottomBounceNeeded(false),
_bounceEnabled(false),
_bouncing(false),
_bounceDir(Vec2::ZERO),
_bounceOriginalSpeed(0.0f),
_inertiaScrollEnabled(true),
_scrollViewEventListener(nullptr),

23
cocos/ui/UIWidget.cpp
View File

@ -154,13 +154,8 @@ _sizeType(SizeType::ABSOLUTE),
_positionType(PositionType::ABSOLUTE),
_actionTag(0),
_customSize(Size::ZERO),
_sizePercent(Vec2::ZERO),
_positionPercent(Vec2::ZERO),
_hitted(false),
_touchListener(nullptr),
_touchBeganPosition(Vec2::ZERO),
_touchMovePosition(Vec2::ZERO),
_touchEndPosition(Vec2::ZERO),
_flippedX(false),
_flippedY(false),
_layoutParameterType(LayoutParameter::Type::NONE),
@ -309,7 +304,7 @@ void Widget::setContentSize(const cocos2d::Size &contentSize)
{
spy = _customSize.height / pSize.height;
}
_sizePercent = Vec2(spx, spy);
_sizePercent.set(spx, spy);
}
onSizeChanged();
}
@ -387,7 +382,7 @@ void Widget::updateSizeAndPosition(const cocos2d::Size &parentSize)
{
spy = _customSize.height / parentSize.height;
}
_sizePercent = Vec2(spx, spy);
_sizePercent.set(spx, spy);
break;
}
case SizeType::PERCENT:
@ -416,17 +411,17 @@ void Widget::updateSizeAndPosition(const cocos2d::Size &parentSize)
{
if (parentSize.width <= 0.0f || parentSize.height <= 0.0f)
{
_positionPercent = Vec2::ZERO;
_positionPercent.setZero();
}
else
{
_positionPercent = Vec2(absPos.x / parentSize.width, absPos.y / parentSize.height);
_positionPercent.set(absPos.x / parentSize.width, absPos.y / parentSize.height);
}
break;
}
case PositionType::PERCENT:
{
absPos = Vec2(parentSize.width * _positionPercent.x, parentSize.height * _positionPercent.y);
absPos.set(parentSize.width * _positionPercent.x, parentSize.height * _positionPercent.y);
break;
}
default:
@ -994,11 +989,11 @@ void Widget::setPosition(const Vec2 &pos)
Size pSize = widgetParent->getContentSize();
if (pSize.width <= 0.0f || pSize.height <= 0.0f)
{
_positionPercent = Vec2::ZERO;
_positionPercent.setZero();
}
else
{
_positionPercent = Vec2(pos.x / pSize.width, pos.y / pSize.height);
_positionPercent.set(pos.x / pSize.width, pos.y / pSize.height);
}
}
}
@ -1023,7 +1018,7 @@ void Widget::setPositionPercent(const Vec2 &percent)
if (widgetParent)
{
Size parentSize = widgetParent->getContentSize();
Vec2 absPos = Vec2(parentSize.width * _positionPercent.x, parentSize.height * _positionPercent.y);
Vec2 absPos(parentSize.width * _positionPercent.x, parentSize.height * _positionPercent.y);
setPosition(absPos);
}
}
@ -1038,7 +1033,7 @@ const Vec2& Widget::getPositionPercent(){
float percentX = component->getPositionPercentX();
float percentY = component->getPositionPercentY();
_positionPercent = Vec2(percentX, percentY);
_positionPercent.set(percentX, percentY);
}
return _positionPercent;
}

16
docs/RELEASE_NOTES.md
View File

@ -13,8 +13,10 @@
- [Windows](#windows)
- [Linux](#linux)
- [How to start a new game](#how-to-start-a-new-game)
- [v3.6alpha0](#v36alpha0)
- [v3.6beta0](#v36beta0)
- [Highlights of v3.6beta0](#highlights-of-v36beta0)
- [v3.6alpha0](#v36alpha0)
- [Highlights of v3.6alpha0](#highlights-of-v36alpha0)
- [Features in detail](#features-in-detail-1)
- [3D TextureCube](#3d-texturecube)
- [3D Skybox](#3d-skybox)
@ -111,6 +113,18 @@ Run
Please refer to this document: [ReadMe](../README.md)
# v3.6beta0
## Hilights of v3.6beta0
* 3rd: updated Spine runtime to v2.1.25
* MotionStreak: added `getStroke()` and `setStroke()`
* Rect: added `intersectsCircle()`
* UI:Text: added `disableEffect(LabelEffect)` to disable a specific effect
* Fixed link error on VS2012 caused by libpng
* Optimized memory usage for `ui:button`
* Some bugs fixed for `Particle3D` and other modules
# v3.6alpha0
## Highlights of v3.6alpha0

2
extensions/GUI/CCControlExtension/CCControlSaturationBrightnessPicker.cpp
View File

@ -108,7 +108,7 @@ void ControlSaturationBrightnessPicker::updateWithHSV(HSV hsv)
void ControlSaturationBrightnessPicker::updateDraggerWithHSV(HSV hsv)
{
// Set the position of the slider to the correct saturation and brightness
Vec2 pos = Vec2(_startPos.x + boxPos + (boxSize*(1 - hsv.s)),
Vec2 pos(_startPos.x + boxPos + (boxSize*(1 - hsv.s)),
_startPos.y + boxPos + (boxSize*hsv.v));
// update

14
extensions/GUI/CCScrollView/CCScrollView.cpp
View File

@ -254,7 +254,7 @@ void ScrollView::setZoomScale(float s)
if (_touchLength == 0.0f)
{
center = Vec2(_viewSize.width*0.5f, _viewSize.height*0.5f);
center.set(_viewSize.width*0.5f, _viewSize.height*0.5f);
center = this->convertToWorldSpace(center);
}
else
@ -481,10 +481,10 @@ void ScrollView::updateInset()
if (this->getContainer() != nullptr)
{
_maxInset = this->maxContainerOffset();
_maxInset = Vec2(_maxInset.x + _viewSize.width * INSET_RATIO,
_maxInset.set(_maxInset.x + _viewSize.width * INSET_RATIO,
_maxInset.y + _viewSize.height * INSET_RATIO);
_minInset = this->minContainerOffset();
_minInset = Vec2(_minInset.x - _viewSize.width * INSET_RATIO,
_minInset.set(_minInset.x - _viewSize.width * INSET_RATIO,
_minInset.y - _viewSize.height * INSET_RATIO);
}
}
@ -664,7 +664,7 @@ bool ScrollView::onTouchBegan(Touch* touch, Event* event)
_touchPoint = this->convertTouchToNodeSpace(touch);
_touchMoved = false;
_dragging = true; //dragging started
_scrollDistance = Vec2(0.0f, 0.0f);
_scrollDistance.setZero();
_touchLength = 0.0f;
}
else if (_touches.size() == 2)
@ -740,7 +740,7 @@ void ScrollView::onTouchMoved(Touch* touch, Event* event)
if (!_touchMoved)
{
moveDistance = Vec2::ZERO;
moveDistance.setZero();
}
_touchPoint = newPoint;
@ -751,10 +751,10 @@ void ScrollView::onTouchMoved(Touch* touch, Event* event)
switch (_direction)
{
case Direction::VERTICAL:
moveDistance = Vec2(0.0f, moveDistance.y);
moveDistance.set(0.0f, moveDistance.y);
break;
case Direction::HORIZONTAL:
moveDistance = Vec2(moveDistance.x, 0.0f);
moveDistance.set(moveDistance.x, 0.0f);
break;
default:
break;

4
extensions/GUI/CCScrollView/CCTableView.cpp
View File

@ -320,10 +320,10 @@ Vec2 TableView::__offsetFromIndex(ssize_t index)
switch (this->getDirection())
{
case Direction::HORIZONTAL:
offset = Vec2(_vCellsPositions[index], 0.0f);
offset.set(_vCellsPositions[index], 0.0f);
break;
default:
offset = Vec2(0.0f, _vCellsPositions[index]);
offset.set(0.0f, _vCellsPositions[index]);
break;
}

8
extensions/Particle3D/CCParticle3DRender.cpp
View File

@ -124,19 +124,19 @@ void Particle3DQuadRender::render(Renderer* renderer, const Mat4 &transform, Par
position = particle->position;
_posuvcolors[vertexindex].position = (position + (- halfwidth - halfheight));
_posuvcolors[vertexindex].color = particle->color;
_posuvcolors[vertexindex].uv = Vec2(particle->lb_uv);
_posuvcolors[vertexindex].uv.set(particle->lb_uv);
_posuvcolors[vertexindex + 1].position = (position + (halfwidth - halfheight));
_posuvcolors[vertexindex + 1].color = particle->color;
_posuvcolors[vertexindex + 1].uv = Vec2(particle->rt_uv.x, particle->lb_uv.y);
_posuvcolors[vertexindex + 1].uv.set(particle->rt_uv.x, particle->lb_uv.y);
_posuvcolors[vertexindex + 2].position = (position + (- halfwidth + halfheight));
_posuvcolors[vertexindex + 2].color = particle->color;
_posuvcolors[vertexindex + 2].uv = Vec2(particle->lb_uv.x, particle->rt_uv.y);
_posuvcolors[vertexindex + 2].uv.set(particle->lb_uv.x, particle->rt_uv.y);
_posuvcolors[vertexindex + 3].position = (position + (halfwidth + halfheight));
_posuvcolors[vertexindex + 3].color = particle->color;
_posuvcolors[vertexindex + 3].uv = Vec2(particle->rt_uv);
_posuvcolors[vertexindex + 3].uv.set(particle->rt_uv);
_indexData[index] = vertexindex;

1
extensions/Particle3D/CCParticleSystem3D.cpp
View File

@ -32,7 +32,6 @@ NS_CC_BEGIN
Particle3D::Particle3D()
: position(Vec3::ZERO)
, color(Vec4::ONE)
, lb_uv(Vec2::ZERO)
, rt_uv(Vec2::ONE)
, width(1.0f)
, height(1.0f)

38
extensions/Particle3D/PU/CCPURender.cpp
View File

@ -174,20 +174,20 @@ void PUParticle3DQuadRender::render(Renderer* renderer, const Mat4 &transform, P
float sintheta = sinf(-particle->zRotation);
Vec2 texOffset = particle->lb_uv + 0.5f * (particle->rt_uv - particle->lb_uv);
Vec2 val;
val = Vec2((particle->lb_uv.x - texOffset.x), (particle->lb_uv.y - texOffset.y));
val = Vec2(val.x * costheta - val.y * sintheta, val.x * sintheta + val.y * costheta);
val.set((particle->lb_uv.x - texOffset.x), (particle->lb_uv.y - texOffset.y));
val.set(val.x * costheta - val.y * sintheta, val.x * sintheta + val.y * costheta);
fillVertex(vertexindex, (position + (- halfwidth - halfheight + halfwidth * offsetX + halfheight * offsetY)), particle->color, Vec2(val.x + texOffset.x, val.y + texOffset.y));
val = Vec2(particle->rt_uv.x - texOffset.x, particle->lb_uv.y - texOffset.y);
val = Vec2(val.x * costheta - val.y * sintheta, val.x * sintheta + val.y * costheta);
val.set(particle->rt_uv.x - texOffset.x, particle->lb_uv.y - texOffset.y);
val.set(val.x * costheta - val.y * sintheta, val.x * sintheta + val.y * costheta);
fillVertex(vertexindex + 1, (position + (halfwidth - halfheight + halfwidth * offsetX + halfheight * offsetY)), particle->color, Vec2(val.x + texOffset.x, val.y + texOffset.y));
val = Vec2(particle->lb_uv.x - texOffset.x, particle->rt_uv.y - texOffset.y);
val = Vec2(val.x * costheta - val.y * sintheta, val.x * sintheta + val.y * costheta);
val.set(particle->lb_uv.x - texOffset.x, particle->rt_uv.y - texOffset.y);
val.set(val.x * costheta - val.y * sintheta, val.x * sintheta + val.y * costheta);
fillVertex(vertexindex + 2, (position + (- halfwidth + halfheight + halfwidth * offsetX + halfheight * offsetY)), particle->color, Vec2(val.x + texOffset.x, val.y + texOffset.y));
val = Vec2(particle->rt_uv.x - texOffset.x, particle->rt_uv.y - texOffset.y);
val = Vec2(val.x * costheta - val.y * sintheta, val.x * sintheta + val.y * costheta);
val.set(particle->rt_uv.x - texOffset.x, particle->rt_uv.y - texOffset.y);
val.set(val.x * costheta - val.y * sintheta, val.x * sintheta + val.y * costheta);
fillVertex(vertexindex + 3, (position + (halfwidth + halfheight + halfwidth * offsetX + halfheight * offsetY)), particle->color, Vec2(val.x + texOffset.x, val.y + texOffset.y));
}else{
Mat4::createRotation(backward, -particle->zRotation, &pRotMat);
@ -202,25 +202,25 @@ void PUParticle3DQuadRender::render(Renderer* renderer, const Mat4 &transform, P
//_posuvcolors[vertexindex].position = (position + (- halfwidth - halfheight + halfwidth * offsetX + halfheight * offsetY));
//_posuvcolors[vertexindex].color = particle->color;
//_posuvcolors[vertexindex].uv = Vec2(val.x + texOffset.x, val.y + texOffset.y);
//_posuvcolors[vertexindex].uv.set(val.x + texOffset.x, val.y + texOffset.y);
//val = Vec2(particle->rt_uv.x - texOffset.x, particle->lb_uv.y - texOffset.y);
//val = Vec2(val.x * costheta - val.y * sintheta, val.x * sintheta + val.y * costheta);
//val.set(particle->rt_uv.x - texOffset.x, particle->lb_uv.y - texOffset.y);
//val.set(val.x * costheta - val.y * sintheta, val.x * sintheta + val.y * costheta);
//_posuvcolors[vertexindex + 1].position = (position + (halfwidth - halfheight + halfwidth * offsetX + halfheight * offsetY));
//_posuvcolors[vertexindex + 1].color = particle->color;
//_posuvcolors[vertexindex + 1].uv = Vec2(val.x + texOffset.x, val.y + texOffset.y);
//_posuvcolors[vertexindex + 1].uv.set(val.x + texOffset.x, val.y + texOffset.y);
//
//val = Vec2(particle->lb_uv.x - texOffset.x, particle->rt_uv.y - texOffset.y);
//val = Vec2(val.x * costheta - val.y * sintheta, val.x * sintheta + val.y * costheta);
//val.set(particle->lb_uv.x - texOffset.x, particle->rt_uv.y - texOffset.y);
//val.set(val.x * costheta - val.y * sintheta, val.x * sintheta + val.y * costheta);
//_posuvcolors[vertexindex + 2].position = (position + (- halfwidth + halfheight + halfwidth * offsetX + halfheight * offsetY));
//_posuvcolors[vertexindex + 2].color = particle->color;
//_posuvcolors[vertexindex + 2].uv = Vec2(val.x + texOffset.x, val.y + texOffset.y);
//_posuvcolors[vertexindex + 2].uv.set(val.x + texOffset.x, val.y + texOffset.y);
//
//val = Vec2(particle->rt_uv.x - texOffset.x, particle->rt_uv.y - texOffset.y);
//val = Vec2(val.x * costheta - val.y * sintheta, val.x * sintheta + val.y * costheta);
//val.set(particle->rt_uv.x - texOffset.x, particle->rt_uv.y - texOffset.y);
//val.set(val.x * costheta - val.y * sintheta, val.x * sintheta + val.y * costheta);
//_posuvcolors[vertexindex + 3].position = (position + (halfwidth + halfheight + halfwidth * offsetX + halfheight * offsetY));
//_posuvcolors[vertexindex + 3].color = particle->color;
//_posuvcolors[vertexindex + 3].uv = Vec2(val.x + texOffset.x, val.y + texOffset.y);
//_posuvcolors[vertexindex + 3].uv.set(val.x + texOffset.x, val.y + texOffset.y);
//
//
//_indexData[index] = vertexindex;
@ -372,7 +372,7 @@ void PUParticle3DQuadRender::determineUVCoords( PUParticle3D *particle )
unsigned short currentCol = particle->textureCoordsCurrent - _textureCoordsColumns * currentRow;
currentRow = _textureCoordsRows - currentRow - 1;
particle->lb_uv = Vec2(_textureCoordsColStep * currentCol, _textureCoordsRowStep * currentRow);
particle->lb_uv.set(_textureCoordsColStep * currentCol, _textureCoordsRowStep * currentRow);
particle->rt_uv = particle->lb_uv + Vec2(_textureCoordsColStep, _textureCoordsRowStep);
}

6
extensions/physics-nodes/CCPhysicsSprite.cpp
View File

@ -265,14 +265,14 @@ const Vec2& PhysicsSprite::getPosFromPhysics() const
#if CC_ENABLE_CHIPMUNK_INTEGRATION
cpVect cpPos = cpBodyGetPos(_CPBody);
s_physicPosion = Vec2(cpPos.x, cpPos.y);
s_physicPosion.set(cpPos.x, cpPos.y);
#elif CC_ENABLE_BOX2D_INTEGRATION
b2Vec2 pos = _pB2Body->GetPosition();
float x = pos.x * _PTMRatio;
float y = pos.y * _PTMRatio;
s_physicPosion = Vec2(x,y);
s_physicPosion.set(x,y);
#endif
return s_physicPosion;
}
@ -376,7 +376,7 @@ void PhysicsSprite::syncPhysicsTransform() const
float c = cosf(radians);
float s = sinf(radians);
if (!_anchorPointInPoints.equals(Vec2::ZERO))
if (!_anchorPointInPoints.isZero())
{
x += ((c * -_anchorPointInPoints.x * _scaleX) + (-s * -_anchorPointInPoints.y * _scaleY));
y += ((s * -_anchorPointInPoints.x * _scaleX) + (c * -_anchorPointInPoints.y * _scaleY));

35
templates/cpp-template-default/proj.win8.1-universal/App.Shared/OpenGLESPage.xaml.cpp
View File

@ -36,6 +36,10 @@ using namespace Windows::UI::Xaml::Input;
using namespace Windows::UI::Xaml::Media;
using namespace Windows::UI::Xaml::Navigation;
#if (WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP)
using namespace Windows::Phone::UI::Input;
#endif
OpenGLESPage::OpenGLESPage() :
OpenGLESPage(nullptr)
{
@ -76,6 +80,7 @@ OpenGLESPage::OpenGLESPage(OpenGLES* openGLES) :
#if (WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP)
Windows::UI::ViewManagement::StatusBar::GetForCurrentView()->HideAsync();
HardwareButtons::BackPressed += ref new EventHandler<BackPressedEventArgs^>(this, &OpenGLESPage::OnBackButtonPressed);
#else
// Disable all pointer visual feedback for better performance when touching.
// This is not supported on Windows Phone applications.
@ -163,6 +168,21 @@ void OpenGLESPage::OnVisibilityChanged(Windows::UI::Core::CoreWindow^ sender, Wi
}
}
#if (WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP)
void OpenGLESPage::OnBackButtonPressed(Object^ sender, BackPressedEventArgs^ args)
{
bool myAppCanNavigate = false;
if (myAppCanNavigate)
{
args->Handled = true;
}
else {
// Do nothing. Leave args->Handled set to the current value, false.
}
}
#endif
void OpenGLESPage::OnSwapChainPanelSizeChanged(Object^ sender, Windows::UI::Xaml::SizeChangedEventArgs^ e)
{
// Size change events occur outside of the render thread. A lock is required when updating
@ -283,6 +303,11 @@ void OpenGLESPage::StartRenderLoop()
{
m_deviceLost = true;
if (m_renderer)
{
m_renderer->Pause();
}
// XAML objects like the SwapChainPanel must only be manipulated on the UI thread.
swapChainPanel->Dispatcher->RunAsync(Windows::UI::Core::CoreDispatcherPriority::High, ref new Windows::UI::Core::DispatchedHandler([=]()
{
@ -292,6 +317,11 @@ void OpenGLESPage::StartRenderLoop()
return;
}
}
if (m_renderer)
{
m_renderer->Pause();
}
});
// Run task on a dedicated high priority background thread.
@ -305,9 +335,4 @@ void OpenGLESPage::StopRenderLoop()
mRenderLoopWorker->Cancel();
mRenderLoopWorker = nullptr;
}
if (m_renderer)
{
m_renderer->Pause();
}
}

3
templates/cpp-template-default/proj.win8.1-universal/App.Shared/OpenGLESPage.xaml.h
View File

@ -39,6 +39,9 @@ namespace cocos2d
void OnPageLoaded(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e);
void OnVisibilityChanged(Windows::UI::Core::CoreWindow^ sender, Windows::UI::Core::VisibilityChangedEventArgs^ args);
void OnSwapChainPanelSizeChanged(Platform::Object^ sender, Windows::UI::Xaml::SizeChangedEventArgs^ e);
#if (WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP)
void OnBackButtonPressed(Platform::Object^ sender, Windows::Phone::UI::Input::BackPressedEventArgs^ args);
#endif
void GetSwapChainPanelSize(GLsizei* width, GLsizei* height);
void CreateRenderSurface();
void DestroyRenderSurface();

1
templates/lua-template-default/frameworks/runtime-src/Classes/lua_module_register.h
View File

@ -10,7 +10,6 @@
#include "spine/lua_cocos2dx_spine_manual.hpp"
#include "3d/lua_cocos2dx_3d_manual.h"
#include "audioengine/lua_cocos2dx_audioengine_manual.h"
#include "lua/quick/lua_cocos2dx_quick_manual.hpp"
int lua_module_register(lua_State* L)
{

BIN
tests/js-tests/project/proj.win32/res/js-tests.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 46 KiB