Skip to content

Commit d2cf4bf

Browse files
ricardoquesadaricardoquesada
committed
Squashed commit of the following:
commit 2c810a8e931e07b06498c07db37cbf20a2bcfc92 Merge: 61788a0 082caaf Author: Ricardo Quesada <[email protected]> Date: Thu Aug 13 00:13:38 2015 -0700 Merge branch 'v3' into downloader_decouple commit 61788a0 Merge: 8c1e211 5e21580 Author: Ricardo Quesada <[email protected]> Date: Wed Aug 12 20:45:12 2015 -0700 Merge branch 'v3' into downloader_decouple commit 8c1e211 Merge: 2ea66af 8d73883 Author: Ricardo Quesada <[email protected]> Date: Wed Aug 12 20:42:04 2015 -0700 Merge pull request #6 from minggo/downloader_decouple fix js binding error commit 8d73883 Author: minggo <[email protected]> Date: Thu Aug 13 11:09:58 2015 +0800 fix js binding error commit 2ea66af Merge: 8cdb0b6 bc964e8 Author: Ricardo Quesada <[email protected]> Date: Wed Aug 12 09:14:22 2015 -0700 Merge branch 'v3' into downloader_decouple commit 8cdb0b6 Merge: 9272765 08eeca9 Author: Ricardo Quesada <[email protected]> Date: Tue Aug 11 20:11:46 2015 -0700 Merge pull request #5 from minggo/downloader_decouple fix lua-binding error commit 08eeca9 Author: minggo <[email protected]> Date: Wed Aug 12 10:34:05 2015 +0800 fix lua-binding error commit 9272765 Merge: 8252464 6f4ed8a Author: Ricardo Quesada <[email protected]> Date: Tue Aug 11 10:39:22 2015 -0700 Merge branch 'v3' into downloader_decouple commit 8252464 Merge: 5dddbb6 138df42 Author: Ricardo Quesada <[email protected]> Date: Tue Aug 11 06:53:48 2015 -0700 Merge pull request #4 from minggo/downloader_decouple fix linking error in lua-tests on Android commit 138df42 Author: minggo <[email protected]> Date: Tue Aug 11 16:23:53 2015 +0800 fix link error in lua-tests commit 5dddbb6 Author: Ricardo Quesada <[email protected]> Date: Fri Aug 7 23:22:50 2015 -0700 works for real on win32 commit ddadaf8 Author: Ricardo Quesada <[email protected]> Date: Fri Aug 7 22:26:59 2015 -0700 compiles on win32 commit 733f1d4 Author: Ricardo Quesada <[email protected]> Date: Fri Aug 7 21:57:49 2015 -0700 compiles on iOS!! commit f706f97 Author: Ricardo Quesada <[email protected]> Date: Fri Aug 7 21:27:03 2015 -0700 compiles and runs Ok on windows. Tested all downloadertests + assetmanagertest commit 5e333f4 Author: Ricardo Quesada <[email protected]> Date: Fri Aug 7 20:24:28 2015 -0700 updates windows projects commit e77fd8a Author: Ricardo Quesada <[email protected]> Date: Fri Aug 7 19:56:10 2015 -0700 compiles on Android commit 5f515e3 Author: Ricardo Quesada <[email protected]> Date: Fri Aug 7 18:34:33 2015 -0700 trying to fix a compile issue on iOS WIP commit b144ea6 Author: Ricardo Quesada <[email protected]> Date: Fri Aug 7 18:25:11 2015 -0700 make bug fixes adds public `getHeader` commit a228799 Author: Ricardo Quesada <[email protected]> Date: Fri Aug 7 17:42:19 2015 -0700 some linux fixes commit 2cab23d Author: Ricardo Quesada <[email protected]> Date: Fri Aug 7 16:58:53 2015 -0700 Squashed commit of the following: commit 86227e9 Author: Ricardo Quesada <[email protected]> Date: Fri Aug 7 16:55:17 2015 -0700 works %100 and uses less memory than before commit a9cafa6 Merge: 0bbc62e 0cbd71f Author: Ricardo Quesada <[email protected]> Date: Fri Aug 7 15:49:33 2015 -0700 Merge branch 'v3' into cocos_net commit 0bbc62e Author: Ricardo Quesada <[email protected]> Date: Fri Aug 7 15:46:55 2015 -0700 more tests... and works but there is huge bug. ProgData <vector> needs the position of DownloadUnits <unordered_map> but <unordered_map> does not guaranty the order. So in my next commit I"ll merge DownloadUnit with ProgressData commit 389ed86 Author: Ricardo Quesada <[email protected]> Date: Fri Aug 7 13:47:07 2015 -0700 debugging info commit af0dc45 Author: Ricardo Quesada <[email protected]> Date: Fri Aug 7 11:47:31 2015 -0700 sync and async tests working ok commit 999fa7a Author: Ricardo Quesada <[email protected]> Date: Fri Aug 7 11:38:38 2015 -0700 adding tests commit 91ee294 Merge: 76ab703 7f215e9 Author: Ricardo Quesada <[email protected]> Date: Fri Aug 7 10:03:50 2015 -0700 Merge branch 'v3' into cocos_net commit 76ab703 Author: Ricardo Quesada <[email protected]> Date: Fri Aug 7 00:22:20 2015 -0700 Downloader tests commit b65c4da Author: Ricardo Quesada <[email protected]> Date: Thu Aug 6 21:34:54 2015 -0700 compiles on Xcode 7 commit ec0d663 Merge: 878e4b5 0d77838 Author: Ricardo Quesada <[email protected]> Date: Thu Aug 6 11:02:24 2015 -0700 Merge branch 'v3' into cocos_net commit 878e4b5 Author: Ricardo Quesada <[email protected]> Date: Wed Aug 5 18:07:02 2015 -0700 working, yeah! commit ad1e763 Author: Ricardo Quesada <[email protected]> Date: Wed Aug 5 17:49:59 2015 -0700 code is more thread-safe friendly commit 8c6baae Author: Ricardo Quesada <[email protected]> Date: Wed Aug 5 16:39:02 2015 -0700 fixes callbacks commit ddab4d7 Author: Ricardo Quesada <[email protected]> Date: Wed Aug 5 15:43:51 2015 -0700 cleaner code runs callbacks in cocos2d thread only if needed commit ef75844 Author: Ricardo Quesada <[email protected]> Date: Wed Aug 5 11:58:04 2015 -0700 removed weak_ptr<> from ProgressData that logic of the code is added in the callbacks commit d9c7436 Author: Ricardo Quesada <[email protected]> Date: Wed Aug 5 11:54:07 2015 -0700 checks whether or not the callbacks are in the cocos2d thread commit ae6594a Merge: 4c61069 6831e24 Author: Ricardo Quesada <[email protected]> Date: Wed Aug 5 10:48:34 2015 -0700 Merge branch 'v3' into cocos_net commit 4c61069 Author: Ricardo Quesada <[email protected]> Date: Tue Aug 4 21:36:50 2015 -0700 almost there... Downloader has std::vector<FILE*> instead of FileDescriptors code cleaner... commit c34d04a Author: Ricardo Quesada <[email protected]> Date: Tue Aug 4 20:38:44 2015 -0700 passes progressData to batch no need to alloc memory for each ProgressData commit f7e8bbd Author: Ricardo Quesada <[email protected]> Date: Tue Aug 4 17:47:23 2015 -0700 tidier code and more optimizations commit a486dc7 Merge: 4178327 a06421b Author: Ricardo Quesada <[email protected]> Date: Tue Aug 4 14:03:22 2015 -0700 Merge branch 'v3' into cocos_net commit 4178327 Author: Ricardo Quesada <[email protected]> Date: Mon Aug 3 18:13:13 2015 -0700 not finished yet... ...but trying to have a common inteface with batched and non-batched downloads commit 1d0e465 Author: Ricardo Quesada <[email protected]> Date: Mon Aug 3 16:29:39 2015 -0700 ErrorCallback compiles starting the batching code commit 6645a28 Merge: c180425 8d836da Author: Ricardo Quesada <[email protected]> Date: Mon Aug 3 10:28:51 2015 -0700 Merge branch 'v3' into cocos_net commit c180425 Author: Ricardo Quesada <[email protected]> Date: Fri Jul 31 15:35:53 2015 -0700 More progress on migrating multiple-file downloader to the implementation file commit 5fa273e Author: Ricardo Quesada <[email protected]> Date: Fri Jul 31 14:00:02 2015 -0700 Dowloader moved to `cocos2d::network` commit 14b1d08 Merge: 13cfc8d f744383 Author: Ricardo Quesada <[email protected]> Date: Fri Jul 31 11:13:55 2015 -0700 Merge branch 'v3' into cocos_net commit 13cfc8d Author: Ricardo Quesada <[email protected]> Date: Fri Jul 31 11:11:45 2015 -0700 DownloadUnits belong to network commit e6e1756 Author: Ricardo Quesada <[email protected]> Date: Thu Jul 30 12:23:36 2015 -0700 adds `check for option` commit 5cb76df Author: Ricardo Quesada <[email protected]> Date: Thu Jul 30 10:37:51 2015 -0700 Downloader: using URLDownload in one case. 3 more to go. Not tested yet commit 9b26e9c Merge: 20fe063 253d9c4 Author: Ricardo Quesada <[email protected]> Date: Thu Jul 30 08:35:53 2015 -0700 Merge branch 'v3' into cocos_net commit 20fe063 Author: Ricardo Quesada <[email protected]> Date: Wed Jul 29 17:36:07 2015 -0700 URLDownload: initial commit HttpAsyncConnection -> HttpAsyncConnection-apple: follows the cocos2d guidelines Adds `CCIRULDownload` interface. Adds `CCURLDownload` implementation based on libcurl. Not working yet. `Downloader` uses `URLDownload` for some of its functions. WIP commit 3a5d3b8 Merge: e408fe0 642ccac Author: Ricardo Quesada <[email protected]> Date: Wed Jul 29 14:00:43 2015 -0700 Merge remote-tracking branch 'cocos2d/v3' into cocos_net commit e408fe0 Author: Ricardo Quesada <[email protected]> Date: Wed Jul 29 13:59:46 2015 -0700 Adds more files to Xcode project ...even if they are not being compiled. Much easier to add missing functionality to the rest of the platforms commit 11d86ac Author: Ricardo Quesada <[email protected]> Date: Wed Jul 29 11:36:57 2015 -0700 removes unneeded headers
1 parent 082caaf commit d2cf4bf

File tree

69 files changed

+2395
-1477
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+2395
-1477
lines changed

‎build/cocos2d_libs.xcodeproj/project.pbxproj‎

Lines changed: 112 additions & 32 deletions
Large diffs are not rendered by default.

‎build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/libcocos2d iOS.xcscheme‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
33
LastUpgradeVersion = "0700"
4-
version = "1.3">
4+
version = "1.8">
55
<BuildAction
66
parallelizeBuildables = "YES"
77
buildImplicitDependencies = "YES">
@@ -23,21 +23,21 @@
2323
</BuildActionEntries>
2424
</BuildAction>
2525
<TestAction
26-
buildConfiguration = "Debug"
2726
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2827
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
shouldUseLaunchSchemeArgsEnv = "YES">
28+
shouldUseLaunchSchemeArgsEnv = "YES"
29+
buildConfiguration = "Debug">
3030
<Testables>
3131
</Testables>
3232
<AdditionalOptions>
3333
</AdditionalOptions>
3434
</TestAction>
3535
<LaunchAction
36-
buildConfiguration = "Debug"
3736
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
3837
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
3938
launchStyle = "0"
4039
useCustomWorkingDirectory = "NO"
40+
buildConfiguration = "Debug"
4141
ignoresPersistentStateOnLaunch = "NO"
4242
debugDocumentVersioning = "YES"
4343
debugServiceExtension = "internal"
@@ -55,10 +55,10 @@
5555
</AdditionalOptions>
5656
</LaunchAction>
5757
<ProfileAction
58-
buildConfiguration = "Release"
5958
shouldUseLaunchSchemeArgsEnv = "YES"
6059
savedToolIdentifier = ""
6160
useCustomWorkingDirectory = "NO"
61+
buildConfiguration = "Release"
6262
debugDocumentVersioning = "YES">
6363
<MacroExpansion>
6464
<BuildableReference

‎build/cocos2d_tests.xcodeproj/project.pbxproj‎

Lines changed: 46 additions & 7 deletions
Large diffs are not rendered by default.

‎cocos/2d/libcocos2d.vcxproj‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,6 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\chipmunk\prebuilt\win32\release-lib\*.*
186186
<ClCompile Include="..\..\extensions\assets-manager\AssetsManagerEx.cpp" />
187187
<ClCompile Include="..\..\extensions\assets-manager\CCEventAssetsManagerEx.cpp" />
188188
<ClCompile Include="..\..\extensions\assets-manager\CCEventListenerAssetsManagerEx.cpp" />
189-
<ClCompile Include="..\..\extensions\assets-manager\Downloader.cpp" />
190189
<ClCompile Include="..\..\extensions\assets-manager\Manifest.cpp" />
191190
<ClCompile Include="..\..\extensions\GUI\CCControlExtension\CCControl.cpp" />
192191
<ClCompile Include="..\..\extensions\GUI\CCControlExtension\CCControlButton.cpp" />
@@ -576,6 +575,8 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\chipmunk\prebuilt\win32\release-lib\*.*
576575
<ClCompile Include="..\navmesh\CCNavMeshDebugDraw.cpp" />
577576
<ClCompile Include="..\navmesh\CCNavMeshObstacle.cpp" />
578577
<ClCompile Include="..\navmesh\CCNavMeshUtils.cpp" />
578+
<ClCompile Include="..\network\CCDownloader.cpp" />
579+
<ClCompile Include="..\network\CCDownloaderImpl.cpp" />
579580
<ClCompile Include="..\network\HttpClient.cpp" />
580581
<ClCompile Include="..\network\SocketIO.cpp" />
581582
<ClCompile Include="..\network\WebSocket.cpp" />
@@ -738,7 +739,6 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\chipmunk\prebuilt\win32\release-lib\*.*
738739
<ClInclude Include="..\..\extensions\assets-manager\AssetsManagerEx.h" />
739740
<ClInclude Include="..\..\extensions\assets-manager\CCEventAssetsManagerEx.h" />
740741
<ClInclude Include="..\..\extensions\assets-manager\CCEventListenerAssetsManagerEx.h" />
741-
<ClInclude Include="..\..\extensions\assets-manager\Downloader.h" />
742742
<ClInclude Include="..\..\extensions\assets-manager\Manifest.h" />
743743
<ClInclude Include="..\..\extensions\cocos-ext.h" />
744744
<ClInclude Include="..\..\extensions\ExtensionExport.h" />
@@ -1179,6 +1179,9 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\chipmunk\prebuilt\win32\release-lib\*.*
11791179
<ClInclude Include="..\navmesh\CCNavMeshDebugDraw.h" />
11801180
<ClInclude Include="..\navmesh\CCNavMeshObstacle.h" />
11811181
<ClInclude Include="..\navmesh\CCNavMeshUtils.h" />
1182+
<ClInclude Include="..\network\CCDownloader.h" />
1183+
<ClInclude Include="..\network\CCDownloaderImpl.h" />
1184+
<ClInclude Include="..\network\CCIDownloaderImpl.h" />
11821185
<ClInclude Include="..\network\HttpClient.h" />
11831186
<ClInclude Include="..\network\HttpRequest.h" />
11841187
<ClInclude Include="..\network\HttpResponse.h" />
@@ -1374,4 +1377,4 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\chipmunk\prebuilt\win32\release-lib\*.*
13741377
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
13751378
<ImportGroup Label="ExtensionTargets">
13761379
</ImportGroup>
1377-
</Project>
1380+
</Project>

‎cocos/2d/libcocos2d.vcxproj.filters‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1249,9 +1249,6 @@
12491249
<ClCompile Include="..\..\extensions\assets-manager\CCEventListenerAssetsManagerEx.cpp">
12501250
<Filter>extension\AssetsManager</Filter>
12511251
</ClCompile>
1252-
<ClCompile Include="..\..\extensions\assets-manager\Downloader.cpp">
1253-
<Filter>extension\AssetsManager</Filter>
1254-
</ClCompile>
12551252
<ClCompile Include="..\..\extensions\assets-manager\Manifest.cpp">
12561253
<Filter>extension\AssetsManager</Filter>
12571254
</ClCompile>
@@ -1928,6 +1925,12 @@
19281925
<ClCompile Include="..\editor-support\cocostudio\CCComExtensionData.cpp">
19291926
<Filter>cocostudio\components</Filter>
19301927
</ClCompile>
1928+
<ClCompile Include="..\network\CCDownloader.cpp">
1929+
<Filter>network\Source Files</Filter>
1930+
</ClCompile>
1931+
<ClCompile Include="..\network\CCDownloaderImpl.cpp">
1932+
<Filter>network\Source Files</Filter>
1933+
</ClCompile>
19311934
</ItemGroup>
19321935
<ItemGroup>
19331936
<ClInclude Include="..\physics\CCPhysicsBody.h">
@@ -3047,9 +3050,6 @@
30473050
<ClInclude Include="..\..\extensions\assets-manager\CCEventListenerAssetsManagerEx.h">
30483051
<Filter>extension\AssetsManager</Filter>
30493052
</ClInclude>
3050-
<ClInclude Include="..\..\extensions\assets-manager\Downloader.h">
3051-
<Filter>extension\AssetsManager</Filter>
3052-
</ClInclude>
30533053
<ClInclude Include="..\..\extensions\assets-manager\Manifest.h">
30543054
<Filter>extension\AssetsManager</Filter>
30553055
</ClInclude>
@@ -3756,6 +3756,15 @@
37563756
<ClInclude Include="..\editor-support\cocostudio\CCComExtensionData.h">
37573757
<Filter>cocostudio\components</Filter>
37583758
</ClInclude>
3759+
<ClInclude Include="..\network\CCDownloader.h">
3760+
<Filter>network\Header Files</Filter>
3761+
</ClInclude>
3762+
<ClInclude Include="..\network\CCDownloaderImpl.h">
3763+
<Filter>network\Header Files</Filter>
3764+
</ClInclude>
3765+
<ClInclude Include="..\network\CCIDownloaderImpl.h">
3766+
<Filter>network\Header Files</Filter>
3767+
</ClInclude>
37593768
</ItemGroup>
37603769
<ItemGroup>
37613770
<None Include="..\math\Mat4.inl">

‎cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\..\extensions\assets-manager\AssetsManagerEx.h" />
1919
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\..\extensions\assets-manager\CCEventAssetsManagerEx.h" />
2020
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\..\extensions\assets-manager\CCEventListenerAssetsManagerEx.h" />
21-
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\..\extensions\assets-manager\Downloader.h" />
2221
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\..\extensions\assets-manager\Manifest.h" />
2322
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\..\extensions\cocos-ext.h" />
2423
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\..\extensions\ExtensionExport.h" />
@@ -453,6 +452,9 @@
453452
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\navmesh\CCNavMeshDebugDraw.h" />
454453
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\navmesh\CCNavMeshObstacle.h" />
455454
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\navmesh\CCNavMeshUtils.h" />
455+
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\network\CCDownloader.h" />
456+
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\network\CCDownloaderImpl.h" />
457+
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\network\CCIDownloaderImpl.h" />
456458
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\network\HttpClient.h" />
457459
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\network\HttpRequest.h" />
458460
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\network\HttpResponse.h" />
@@ -640,7 +642,6 @@
640642
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\..\extensions\assets-manager\AssetsManagerEx.cpp" />
641643
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\..\extensions\assets-manager\CCEventAssetsManagerEx.cpp" />
642644
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\..\extensions\assets-manager\CCEventListenerAssetsManagerEx.cpp" />
643-
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\..\extensions\assets-manager\Downloader.cpp" />
644645
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\..\extensions\assets-manager\Manifest.cpp" />
645646
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\..\extensions\GUI\CCControlExtension\CCControl.cpp" />
646647
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\..\extensions\GUI\CCControlExtension\CCControlButton.cpp" />
@@ -1055,6 +1056,8 @@
10551056
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\navmesh\CCNavMeshDebugDraw.cpp" />
10561057
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\navmesh\CCNavMeshObstacle.cpp" />
10571058
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\navmesh\CCNavMeshUtils.cpp" />
1059+
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\network\CCDownloader.cpp" />
1060+
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\network\CCDownloaderImpl.cpp" />
10581061
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\network\HttpClient.cpp" />
10591062
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\network\SocketIO.cpp" />
10601063
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\network\WebSocket.cpp" />
@@ -1274,4 +1277,4 @@
12741277
<ItemGroup>
12751278
<Text Include="$(MSBuildThisFileDirectory)..\..\..\..\physics3d\CMakeLists.txt" />
12761279
</ItemGroup>
1277-
</Project>
1280+
</Project>

‎cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -772,9 +772,6 @@
772772
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\..\extensions\assets-manager\CCEventListenerAssetsManagerEx.h">
773773
<Filter>extension\AssetsManager</Filter>
774774
</ClInclude>
775-
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\..\extensions\assets-manager\Downloader.h">
776-
<Filter>extension\AssetsManager</Filter>
777-
</ClInclude>
778775
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\..\extensions\assets-manager\Manifest.h">
779776
<Filter>extension\AssetsManager</Filter>
780777
</ClInclude>
@@ -1858,6 +1855,15 @@
18581855
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\CCComExtensionData.h">
18591856
<Filter>cocostudio\components</Filter>
18601857
</ClInclude>
1858+
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\network\CCDownloader.h">
1859+
<Filter>network\Header Files</Filter>
1860+
</ClInclude>
1861+
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\network\CCDownloaderImpl.h">
1862+
<Filter>network\Header Files</Filter>
1863+
</ClInclude>
1864+
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\network\CCIDownloaderImpl.h">
1865+
<Filter>network\Header Files</Filter>
1866+
</ClInclude>
18611867
</ItemGroup>
18621868
<ItemGroup>
18631869
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\cocos2d.cpp">
@@ -2523,9 +2529,6 @@
25232529
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\..\extensions\assets-manager\CCEventListenerAssetsManagerEx.cpp">
25242530
<Filter>extension\AssetsManager</Filter>
25252531
</ClCompile>
2526-
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\..\extensions\assets-manager\Downloader.cpp">
2527-
<Filter>extension\AssetsManager</Filter>
2528-
</ClCompile>
25292532
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\..\extensions\assets-manager\Manifest.cpp">
25302533
<Filter>extension\AssetsManager</Filter>
25312534
</ClCompile>
@@ -3549,6 +3552,12 @@
35493552
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\CCComExtensionData.cpp">
35503553
<Filter>cocostudio\components</Filter>
35513554
</ClCompile>
3555+
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\network\CCDownloader.cpp">
3556+
<Filter>network\Source Files</Filter>
3557+
</ClCompile>
3558+
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\network\CCDownloaderImpl.cpp">
3559+
<Filter>network\Source Files</Filter>
3560+
</ClCompile>
35523561
</ItemGroup>
35533562
<ItemGroup>
35543563
<Filter Include="2d">
@@ -3939,4 +3948,4 @@
39393948
<ItemGroup>
39403949
<Text Include="$(MSBuildThisFileDirectory)..\..\..\..\physics3d\CMakeLists.txt" />
39413950
</ItemGroup>
3942-
</Project>
3951+
</Project>

‎cocos/Android.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,7 @@ LOCAL_STATIC_LIBRARIES += cocos_webp_static
270270
LOCAL_STATIC_LIBRARIES += cocos_chipmunk_static
271271
LOCAL_STATIC_LIBRARIES += cocos_zlib_static
272272
LOCAL_STATIC_LIBRARIES += recast_static
273+
LOCAL_STATIC_LIBRARIES += bullet_static
273274

274275
LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dxandroid_static
275276

@@ -295,7 +296,6 @@ LOCAL_STATIC_LIBRARIES += cocos3d_static
295296
LOCAL_STATIC_LIBRARIES += spine_static
296297
LOCAL_STATIC_LIBRARIES += cocos_network_static
297298
LOCAL_STATIC_LIBRARIES += audioengine_static
298-
LOCAL_STATIC_LIBRARIES += bullet_static
299299

300300
include $(BUILD_STATIC_LIBRARY)
301301
#==============================================================

‎cocos/base/CCDirector.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1303,6 +1303,8 @@ void DisplayLinkDirector::startAnimation()
13031303

13041304
_invalid = false;
13051305

1306+
_cocos2d_thread_id = std::this_thread::get_id();
1307+
13061308
#ifndef WP8_SHADER_COMPILER
13071309
Application::getInstance()->setAnimationInterval(_animationInterval);
13081310
#endif

‎cocos/base/CCDirector.h‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ THE SOFTWARE.
2929
#define __CCDIRECTOR_H__
3030

3131
#include <stack>
32+
#include <thread>
3233

3334
#include "platform/CCPlatformMacros.h"
3435
#include "base/CCRef.h"
@@ -488,6 +489,12 @@ class CC_DLL Director : public Ref
488489
*/
489490
void resetMatrixStack();
490491

492+
/**
493+
* returns the cocos2d thread id.
494+
Useful to know if certain code is already running on the cocos2d thread
495+
*/
496+
const std::thread::id& getCocos2dThreadId() const { return _cocos2d_thread_id; }
497+
491498
protected:
492499
void reset();
493500

@@ -606,6 +613,9 @@ class CC_DLL Director : public Ref
606613

607614
bool _isStatusLabelUpdated;
608615

616+
/* cocos2d thread id */
617+
std::thread::id _cocos2d_thread_id;
618+
609619
// GLView will recreate stats labels to fit visible rect
610620
friend class GLView;
611621
};

0 commit comments

Comments
 (0)