From a5f838496c4053cc20be3542035bad58e8bb5344 Mon Sep 17 00:00:00 2001 From: Dhilan007 Date: Mon, 20 Oct 2014 16:25:24 +0800 Subject: [PATCH 1/2] Move `CCCamera.cpp/h` `CCLight.cpp/h` into 2d --- cocos/{base => 2d}/CCCamera.cpp | 2 +- cocos/{base => 2d}/CCCamera.h | 0 cocos/{base => 2d}/CCLight.cpp | 2 +- cocos/{base => 2d}/CCLight.h | 0 cocos/2d/CCNode.cpp | 2 +- cocos/2d/CCScene.cpp | 2 +- cocos/2d/CMakeLists.txt | 2 ++ cocos/2d/libcocos2d.vcxproj | 8 +++---- cocos/2d/libcocos2d.vcxproj.filters | 24 +++++++++---------- cocos/2d/libcocos2d_wp8.vcxproj | 8 +++---- cocos/2d/libcocos2d_wp8.vcxproj.filters | 24 +++++++++---------- cocos/3d/CCBillBoard.cpp | 2 +- cocos/3d/CCSprite3D.cpp | 4 ++-- cocos/Android.mk | 4 ++-- cocos/base/CCDirector.cpp | 2 +- cocos/base/CMakeLists.txt | 2 -- cocos/cocos2d.h | 5 ++-- cocos/renderer/CCMeshCommand.cpp | 2 +- cocos/renderer/CCRenderer.cpp | 2 +- .../Classes/BillBoardTest/BillBoardTest.cpp | 1 - .../Classes/Camera3DTest/Camera3DTest.h | 1 - tests/cpp-tests/Classes/LightTest/LightTest.h | 1 - .../Classes/Sprite3DTest/Sprite3DTest.cpp | 1 - 23 files changed, 49 insertions(+), 52 deletions(-) rename cocos/{base => 2d}/CCCamera.cpp (99%) rename cocos/{base => 2d}/CCCamera.h (100%) rename cocos/{base => 2d}/CCLight.cpp (99%) rename cocos/{base => 2d}/CCLight.h (100%) diff --git a/cocos/base/CCCamera.cpp b/cocos/2d/CCCamera.cpp similarity index 99% rename from cocos/base/CCCamera.cpp rename to cocos/2d/CCCamera.cpp index 6067830fd1..27dd0284db 100644 --- a/cocos/base/CCCamera.cpp +++ b/cocos/2d/CCCamera.cpp @@ -21,7 +21,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "base/CCCamera.h" +#include "2d/CCCamera.h" #include "base/CCDirector.h" #include "platform/CCGLView.h" #include "2d/CCScene.h" diff --git a/cocos/base/CCCamera.h b/cocos/2d/CCCamera.h similarity index 100% rename from cocos/base/CCCamera.h rename to cocos/2d/CCCamera.h diff --git a/cocos/base/CCLight.cpp b/cocos/2d/CCLight.cpp similarity index 99% rename from cocos/base/CCLight.cpp rename to cocos/2d/CCLight.cpp index 904082f5b7..30c98b37a4 100644 --- a/cocos/base/CCLight.cpp +++ b/cocos/2d/CCLight.cpp @@ -1,4 +1,4 @@ -#include "base/CCLight.h" +#include "2d/CCLight.h" #include "2d/CCScene.h" NS_CC_BEGIN diff --git a/cocos/base/CCLight.h b/cocos/2d/CCLight.h similarity index 100% rename from cocos/base/CCLight.h rename to cocos/2d/CCLight.h diff --git a/cocos/2d/CCNode.cpp b/cocos/2d/CCNode.cpp index b451526062..2a0d78965e 100644 --- a/cocos/2d/CCNode.cpp +++ b/cocos/2d/CCNode.cpp @@ -37,7 +37,7 @@ THE SOFTWARE. #include "base/CCDirector.h" #include "base/CCScheduler.h" #include "base/CCEventDispatcher.h" -#include "base/CCCamera.h" +#include "2d/CCCamera.h" #include "2d/CCActionManager.h" #include "2d/CCScene.h" #include "2d/CCComponent.h" diff --git a/cocos/2d/CCScene.cpp b/cocos/2d/CCScene.cpp index 8672741d00..f2b0094bac 100644 --- a/cocos/2d/CCScene.cpp +++ b/cocos/2d/CCScene.cpp @@ -27,7 +27,7 @@ THE SOFTWARE. #include "2d/CCScene.h" #include "base/CCDirector.h" -#include "base/CCCamera.h" +#include "2d/CCCamera.h" #include "base/CCEventDispatcher.h" #include "base/CCEventListenerCustom.h" #include "renderer/CCRenderer.h" diff --git a/cocos/2d/CMakeLists.txt b/cocos/2d/CMakeLists.txt index b9fdb4de4b..82e9c60dc4 100644 --- a/cocos/2d/CMakeLists.txt +++ b/cocos/2d/CMakeLists.txt @@ -20,6 +20,7 @@ set(COCOS_2D_SRC 2d/CCAnimationCache.cpp 2d/CCAnimation.cpp 2d/CCAtlasNode.cpp + 2d/CCCamera.cpp 2d/CCClippingNode.cpp 2d/CCClippingRectangleNode.cpp 2d/CCComponentContainer.cpp @@ -43,6 +44,7 @@ set(COCOS_2D_SRC 2d/CCLabelTextFormatter.cpp 2d/CCLabelTTF.cpp 2d/CCLayer.cpp + 2d/CCLight.cpp 2d/CCMenu.cpp 2d/CCMenuItem.cpp 2d/CCMotionStreak.cpp diff --git a/cocos/2d/libcocos2d.vcxproj b/cocos/2d/libcocos2d.vcxproj index a3eba12da0..544f865743 100644 --- a/cocos/2d/libcocos2d.vcxproj +++ b/cocos/2d/libcocos2d.vcxproj @@ -253,7 +253,6 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\chipmunk\prebuilt\win32\release-lib\*.* - @@ -277,7 +276,6 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\chipmunk\prebuilt\win32\release-lib\*.* - @@ -481,6 +479,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\chipmunk\prebuilt\win32\release-lib\*.* + @@ -504,6 +503,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\chipmunk\prebuilt\win32\release-lib\*.* + @@ -637,7 +637,6 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\chipmunk\prebuilt\win32\release-lib\*.* - @@ -664,7 +663,6 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\chipmunk\prebuilt\win32\release-lib\*.* - @@ -905,6 +903,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\chipmunk\prebuilt\win32\release-lib\*.* + @@ -928,6 +927,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\chipmunk\prebuilt\win32\release-lib\*.* + diff --git a/cocos/2d/libcocos2d.vcxproj.filters b/cocos/2d/libcocos2d.vcxproj.filters index 0d904b439f..23097393ae 100644 --- a/cocos/2d/libcocos2d.vcxproj.filters +++ b/cocos/2d/libcocos2d.vcxproj.filters @@ -727,9 +727,6 @@ 2d - - base - renderer @@ -1198,9 +1195,6 @@ ui\UIWidgets - - base - audioengine @@ -1265,6 +1259,12 @@ cocostudio\json\protobuf-lite\stubs + + 2d + + + 2d + @@ -1841,9 +1841,6 @@ 2d - - base - renderer @@ -2414,9 +2411,6 @@ ui\UIWidgets - - base - audioengine @@ -2529,6 +2523,12 @@ cocostudio\json\protobuf-lite\stubs + + 2d + + + 2d + diff --git a/cocos/2d/libcocos2d_wp8.vcxproj b/cocos/2d/libcocos2d_wp8.vcxproj index e3bdf159a3..5fca0d41de 100644 --- a/cocos/2d/libcocos2d_wp8.vcxproj +++ b/cocos/2d/libcocos2d_wp8.vcxproj @@ -266,7 +266,6 @@ - @@ -293,7 +292,6 @@ - @@ -542,6 +540,7 @@ + @@ -565,6 +564,7 @@ + @@ -733,7 +733,6 @@ - @@ -782,7 +781,6 @@ NotUsing - @@ -1000,6 +998,7 @@ + @@ -1023,6 +1022,7 @@ + diff --git a/cocos/2d/libcocos2d_wp8.vcxproj.filters b/cocos/2d/libcocos2d_wp8.vcxproj.filters index 9cf444227e..b71852073f 100644 --- a/cocos/2d/libcocos2d_wp8.vcxproj.filters +++ b/cocos/2d/libcocos2d_wp8.vcxproj.filters @@ -286,6 +286,9 @@ 2d + + 2d + 2d @@ -352,6 +355,9 @@ 2d + + 2d + 2d @@ -493,9 +499,6 @@ base - - base - base @@ -565,9 +568,6 @@ base - - base - base @@ -1343,6 +1343,9 @@ 2d + + 2d + 2d @@ -1409,6 +1412,9 @@ 2d + + 2d + 2d @@ -1556,9 +1562,6 @@ base - - base - base @@ -1637,9 +1640,6 @@ base - - base - base diff --git a/cocos/3d/CCBillBoard.cpp b/cocos/3d/CCBillBoard.cpp index f3aaa846b8..62ad110ad2 100644 --- a/cocos/3d/CCBillBoard.cpp +++ b/cocos/3d/CCBillBoard.cpp @@ -25,7 +25,7 @@ #include "3d/CCBillBoard.h" #include "2d/CCSpriteFrameCache.h" #include "base/CCDirector.h" -#include "base/CCCamera.h" +#include "2d/CCCamera.h" #include "renderer/CCRenderer.h" #include "renderer/CCGLProgramCache.h" diff --git a/cocos/3d/CCSprite3D.cpp b/cocos/3d/CCSprite3D.cpp index 825dd1c1a2..d47de90238 100644 --- a/cocos/3d/CCSprite3D.cpp +++ b/cocos/3d/CCSprite3D.cpp @@ -31,8 +31,8 @@ #include "3d/CCMesh.h" #include "base/CCDirector.h" -#include "base/CCLight.h" -#include "base/CCCamera.h" +#include "2d/CCLight.h" +#include "2d/CCCamera.h" #include "base/ccMacros.h" #include "platform/CCPlatformMacros.h" #include "platform/CCFileUtils.h" diff --git a/cocos/Android.mk b/cocos/Android.mk index 79950b1e77..0efa4badc1 100644 --- a/cocos/Android.mk +++ b/cocos/Android.mk @@ -24,6 +24,7 @@ cocos2d.cpp \ 2d/CCAnimation.cpp \ 2d/CCAnimationCache.cpp \ 2d/CCAtlasNode.cpp \ +2d/CCCamera.cpp \ 2d/CCClippingNode.cpp \ 2d/CCClippingRectangleNode.cpp \ 2d/CCComponent.cpp \ @@ -45,6 +46,7 @@ cocos2d.cpp \ 2d/CCLabelTTF.cpp \ 2d/CCLabelTextFormatter.cpp \ 2d/CCLayer.cpp \ +2d/CCLight.cpp \ 2d/CCMenu.cpp \ 2d/CCMenuItem.cpp \ 2d/CCMotionStreak.cpp \ @@ -91,7 +93,6 @@ math/Vec2.cpp \ math/Vec3.cpp \ math/Vec4.cpp \ base/CCAutoreleasePool.cpp \ -base/CCCamera.cpp \ base/CCConfiguration.cpp \ base/CCConsole.cpp \ base/CCData.cpp \ @@ -115,7 +116,6 @@ base/CCEventListenerTouch.cpp \ base/CCEventMouse.cpp \ base/CCEventTouch.cpp \ base/CCIMEDispatcher.cpp \ -base/CCLight.cpp \ base/CCNS.cpp \ base/CCProfiling.cpp \ base/ccRandom.cpp \ diff --git a/cocos/base/CCDirector.cpp b/cocos/base/CCDirector.cpp index a531f632c9..4ff32be3ab 100644 --- a/cocos/base/CCDirector.cpp +++ b/cocos/base/CCDirector.cpp @@ -47,7 +47,7 @@ THE SOFTWARE. #include "renderer/CCTextureCache.h" #include "renderer/ccGLStateCache.h" #include "renderer/CCRenderer.h" -#include "base/CCCamera.h" +#include "2d/CCCamera.h" #include "base/CCUserDefault.h" #include "base/ccFPSImages.h" #include "base/CCScheduler.h" diff --git a/cocos/base/CMakeLists.txt b/cocos/base/CMakeLists.txt index 680c9a2cc0..2c4dd88b97 100644 --- a/cocos/base/CMakeLists.txt +++ b/cocos/base/CMakeLists.txt @@ -8,10 +8,8 @@ endif() # todo: also base/CCController-android.cpp set(COCOS_BASE_SRC - base/CCLight.cpp base/ccFPSImages.c base/CCAutoreleasePool.cpp - base/CCCamera.cpp base/CCConfiguration.cpp base/CCConsole.cpp base/CCController.cpp diff --git a/cocos/cocos2d.h b/cocos/cocos2d.h index acf8bdcc3c..bdfabeb043 100644 --- a/cocos/cocos2d.h +++ b/cocos/cocos2d.h @@ -61,8 +61,6 @@ THE SOFTWARE. #include "base/CCIMEDelegate.h" #include "base/CCIMEDispatcher.h" #include "base/ccUtils.h" -#include "base/CCCamera.h" -#include "base/CCLight.h" // EventDispatcher #include "base/CCEventType.h" @@ -140,6 +138,9 @@ THE SOFTWARE. #include "2d/CCGrabber.h" #include "2d/CCGrid.h" +#include "2d/CCCamera.h" +#include "2d/CCLight.h" + // include #include "base/CCProtocols.h" diff --git a/cocos/renderer/CCMeshCommand.cpp b/cocos/renderer/CCMeshCommand.cpp index 8017974901..74f8b6b9bd 100644 --- a/cocos/renderer/CCMeshCommand.cpp +++ b/cocos/renderer/CCMeshCommand.cpp @@ -31,7 +31,7 @@ #include "base/CCEventDispatcher.h" #include "base/CCEventType.h" #include "base/CCConfiguration.h" -#include "base/CCLight.h" +#include "2d/CCLight.h" #include "renderer/ccGLStateCache.h" #include "renderer/CCGLProgramState.h" #include "renderer/CCRenderer.h" diff --git a/cocos/renderer/CCRenderer.cpp b/cocos/renderer/CCRenderer.cpp index b8e8087474..6479b54d08 100644 --- a/cocos/renderer/CCRenderer.cpp +++ b/cocos/renderer/CCRenderer.cpp @@ -40,7 +40,7 @@ #include "base/CCEventDispatcher.h" #include "base/CCEventListenerCustom.h" #include "base/CCEventType.h" -#include "base/CCCamera.h" +#include "2d/CCCamera.h" #include "2d/CCScene.h" NS_CC_BEGIN diff --git a/tests/cpp-tests/Classes/BillBoardTest/BillBoardTest.cpp b/tests/cpp-tests/Classes/BillBoardTest/BillBoardTest.cpp index cbb49e7a2e..3369b50b87 100644 --- a/tests/cpp-tests/Classes/BillBoardTest/BillBoardTest.cpp +++ b/tests/cpp-tests/Classes/BillBoardTest/BillBoardTest.cpp @@ -25,7 +25,6 @@ #include "BillBoardTest.h" #include "3d/CCBillBoard.h" -#include "base/CCCamera.h" #include #include "../testResource.h" diff --git a/tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.h b/tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.h index 633bfd3155..9d24a0fdb7 100644 --- a/tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.h +++ b/tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.h @@ -28,7 +28,6 @@ THE SOFTWARE. #include "../testBasic.h" #include "../BaseTest.h" #include -#include "base/CCCamera.h" namespace cocos2d { class Sprite3D; class Delay; diff --git a/tests/cpp-tests/Classes/LightTest/LightTest.h b/tests/cpp-tests/Classes/LightTest/LightTest.h index d8458fc4a9..02e7bfd3b7 100644 --- a/tests/cpp-tests/Classes/LightTest/LightTest.h +++ b/tests/cpp-tests/Classes/LightTest/LightTest.h @@ -27,7 +27,6 @@ #include "../testBasic.h" #include "../BaseTest.h" -#include "base/CCLight.h" class LightTest : public BaseTest { diff --git a/tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp b/tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp index ee0e71a8e1..10e39abed4 100644 --- a/tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp +++ b/tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp @@ -29,7 +29,6 @@ #include "3d/CCAttachNode.h" #include "3d/CCRay.h" #include "3d/CCSprite3D.h" -#include "base/CCLight.h" #include "renderer/CCVertexIndexBuffer.h" #include "DrawNode3D.h" From 47629aec64f87ead357f426a6a038047820b9c19 Mon Sep 17 00:00:00 2001 From: Dhilan007 Date: Mon, 20 Oct 2014 16:42:00 +0800 Subject: [PATCH 2/2] Move `CCCamera.cpp/h` `CCLight.cpp/h` into 2d --- build/cocos2d_libs.xcodeproj/project.pbxproj | 51 +++++++++----------- 1 file changed, 24 insertions(+), 27 deletions(-) diff --git a/build/cocos2d_libs.xcodeproj/project.pbxproj b/build/cocos2d_libs.xcodeproj/project.pbxproj index 5c5fae4844..51b3dddc11 100644 --- a/build/cocos2d_libs.xcodeproj/project.pbxproj +++ b/build/cocos2d_libs.xcodeproj/project.pbxproj @@ -1291,14 +1291,14 @@ 3E6176771960F89B00DE83F5 /* CCEventListenerController.h in Headers */ = {isa = PBXBuildFile; fileRef = 3E6176641960F89B00DE83F5 /* CCEventListenerController.h */; }; 3E6176781960F89B00DE83F5 /* CCGameController.h in Headers */ = {isa = PBXBuildFile; fileRef = 3E6176651960F89B00DE83F5 /* CCGameController.h */; }; 3E61781D1966A5A300DE83F5 /* CCController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E61781C1966A5A300DE83F5 /* CCController.cpp */; }; - 3EA1072F19D7F37700CAB794 /* CCLight.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3EA1072D19D7F37700CAB794 /* CCLight.cpp */; }; - 3EA1073019D7F37700CAB794 /* CCLight.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3EA1072D19D7F37700CAB794 /* CCLight.cpp */; }; - 3EA1073119D7F37700CAB794 /* CCLight.h in Headers */ = {isa = PBXBuildFile; fileRef = 3EA1072E19D7F37700CAB794 /* CCLight.h */; }; - 3EA1073219D7F37700CAB794 /* CCLight.h in Headers */ = {isa = PBXBuildFile; fileRef = 3EA1072E19D7F37700CAB794 /* CCLight.h */; }; - 3EA3EDBC1991CDFA00645534 /* CCCamera.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3EA3EDBA1991CDFA00645534 /* CCCamera.cpp */; }; - 3EA3EDBD1991CDFA00645534 /* CCCamera.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3EA3EDBA1991CDFA00645534 /* CCCamera.cpp */; }; - 3EA3EDBE1991CDFA00645534 /* CCCamera.h in Headers */ = {isa = PBXBuildFile; fileRef = 3EA3EDBB1991CDFA00645534 /* CCCamera.h */; }; - 3EA3EDBF1991CDFA00645534 /* CCCamera.h in Headers */ = {isa = PBXBuildFile; fileRef = 3EA3EDBB1991CDFA00645534 /* CCCamera.h */; }; + 3EACC9A019F5014D00EB3C5E /* CCCamera.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3EACC99C19F5014D00EB3C5E /* CCCamera.cpp */; }; + 3EACC9A119F5014D00EB3C5E /* CCCamera.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3EACC99C19F5014D00EB3C5E /* CCCamera.cpp */; }; + 3EACC9A219F5014D00EB3C5E /* CCCamera.h in Headers */ = {isa = PBXBuildFile; fileRef = 3EACC99D19F5014D00EB3C5E /* CCCamera.h */; }; + 3EACC9A319F5014D00EB3C5E /* CCCamera.h in Headers */ = {isa = PBXBuildFile; fileRef = 3EACC99D19F5014D00EB3C5E /* CCCamera.h */; }; + 3EACC9A419F5014D00EB3C5E /* CCLight.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3EACC99E19F5014D00EB3C5E /* CCLight.cpp */; }; + 3EACC9A519F5014D00EB3C5E /* CCLight.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3EACC99E19F5014D00EB3C5E /* CCLight.cpp */; }; + 3EACC9A619F5014D00EB3C5E /* CCLight.h in Headers */ = {isa = PBXBuildFile; fileRef = 3EACC99F19F5014D00EB3C5E /* CCLight.h */; }; + 3EACC9A719F5014D00EB3C5E /* CCLight.h in Headers */ = {isa = PBXBuildFile; fileRef = 3EACC99F19F5014D00EB3C5E /* CCLight.h */; }; 464AD6E5197EBB1400E502D8 /* pvr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 464AD6E3197EBB1400E502D8 /* pvr.cpp */; }; 464AD6E6197EBB1400E502D8 /* pvr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 464AD6E3197EBB1400E502D8 /* pvr.cpp */; }; 464AD6E7197EBB1400E502D8 /* pvr.h in Headers */ = {isa = PBXBuildFile; fileRef = 464AD6E4197EBB1400E502D8 /* pvr.h */; }; @@ -2462,10 +2462,10 @@ 3E61781C1966A5A300DE83F5 /* CCController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCController.cpp; path = ../base/CCController.cpp; sourceTree = ""; }; 3EA0FB69191C841D00B170C8 /* UIVideoPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIVideoPlayer.h; sourceTree = ""; }; 3EA0FB6A191C841D00B170C8 /* UIVideoPlayer-ios.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "UIVideoPlayer-ios.mm"; sourceTree = ""; }; - 3EA1072D19D7F37700CAB794 /* CCLight.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCLight.cpp; path = ../base/CCLight.cpp; sourceTree = ""; }; - 3EA1072E19D7F37700CAB794 /* CCLight.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCLight.h; path = ../base/CCLight.h; sourceTree = ""; }; - 3EA3EDBA1991CDFA00645534 /* CCCamera.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCCamera.cpp; path = ../base/CCCamera.cpp; sourceTree = ""; }; - 3EA3EDBB1991CDFA00645534 /* CCCamera.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCCamera.h; path = ../base/CCCamera.h; sourceTree = ""; }; + 3EACC99C19F5014D00EB3C5E /* CCCamera.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCCamera.cpp; sourceTree = ""; }; + 3EACC99D19F5014D00EB3C5E /* CCCamera.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCCamera.h; sourceTree = ""; }; + 3EACC99E19F5014D00EB3C5E /* CCLight.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCLight.cpp; sourceTree = ""; }; + 3EACC99F19F5014D00EB3C5E /* CCLight.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCLight.h; sourceTree = ""; }; 464AD6E3197EBB1400E502D8 /* pvr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = pvr.cpp; path = ../base/pvr.cpp; sourceTree = ""; }; 464AD6E4197EBB1400E502D8 /* pvr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pvr.h; path = ../base/pvr.h; sourceTree = ""; }; 46A15FCC1807A544005B8026 /* AUTHORS */ = {isa = PBXFileReference; lastKnownFileType = text; name = AUTHORS; path = ../AUTHORS; sourceTree = ""; }; @@ -3222,12 +3222,8 @@ 1A5700A2180BC5E60088DEC7 /* base */ = { isa = PBXGroup; children = ( - 3EA1072D19D7F37700CAB794 /* CCLight.cpp */, - 3EA1072E19D7F37700CAB794 /* CCLight.h */, 299CF1F919A434BC00C378C1 /* ccRandom.cpp */, 299CF1FA19A434BC00C378C1 /* ccRandom.h */, - 3EA3EDBA1991CDFA00645534 /* CCCamera.cpp */, - 3EA3EDBB1991CDFA00645534 /* CCCamera.h */, 464AD6E3197EBB1400E502D8 /* pvr.cpp */, 464AD6E4197EBB1400E502D8 /* pvr.h */, 3E61781C1966A5A300DE83F5 /* CCController.cpp */, @@ -4637,6 +4633,10 @@ 46A169A11807B037005B8026 /* 2d */ = { isa = PBXGroup; children = ( + 3EACC99C19F5014D00EB3C5E /* CCCamera.cpp */, + 3EACC99D19F5014D00EB3C5E /* CCCamera.h */, + 3EACC99E19F5014D00EB3C5E /* CCLight.cpp */, + 3EACC99F19F5014D00EB3C5E /* CCLight.h */, 1A9DCA02180E6955007A3AD4 /* CCGLBufferedNode.cpp */, 1A9DCA03180E6955007A3AD4 /* CCGLBufferedNode.h */, 1A570046180BC59A0088DEC7 /* actions */, @@ -5129,7 +5129,6 @@ 38B8E2E319E671D2002D7CE7 /* UILayoutComponent.h in Headers */, 5034CA39191D591100CE6051 /* ccShader_PositionColorLengthTexture.frag in Headers */, 292DB14B19B4574100A80320 /* UIEditBoxImpl-mac.h in Headers */, - 3EA1073119D7F37700CAB794 /* CCLight.h in Headers */, B29A7E3F19EE1B7700872B35 /* AnimationState.h in Headers */, 50ABBE891925AB6F00A911A9 /* CCMap.h in Headers */, 50ABBE8D1925AB6F00A911A9 /* CCNS.h in Headers */, @@ -5518,7 +5517,6 @@ 15AE189E19AAD33D00C27E9E /* CCNodeLoader.h in Headers */, 50ABBE7B1925AB6F00A911A9 /* CCEventMouse.h in Headers */, 503DD8F91926B0DB00CD74DD /* CCIMEDispatcher.h in Headers */, - 3EA3EDBE1991CDFA00645534 /* CCCamera.h in Headers */, 15AE1B6619AADA9900C27E9E /* UIImageView.h in Headers */, 15AE1BB419AADFEF00C27E9E /* HttpResponse.h in Headers */, 15AE1A8519AAD40300C27E9E /* b2Joint.h in Headers */, @@ -5557,6 +5555,7 @@ 50ABBEC91925AB6F00A911A9 /* firePngData.h in Headers */, 292DB16119B461CA00A80320 /* ExtensionDeprecated.h in Headers */, 503DD8F51926B0DB00CD74DD /* CCIMEDelegate.h in Headers */, + 3EACC9A619F5014D00EB3C5E /* CCLight.h in Headers */, 50ABBD5A1925AB0000A911A9 /* Vec2.h in Headers */, 15AE1BDB19AAE01E00C27E9E /* CCControlSwitch.h in Headers */, B24AA987195A675C007B4522 /* CCFastTMXLayer.h in Headers */, @@ -5630,6 +5629,7 @@ 15AE190219AAD35000C27E9E /* CCComController.h in Headers */, 15AE18DE19AAD35000C27E9E /* TriggerObj.h in Headers */, 15AE183E19AAD2F700C27E9E /* CCSkeleton3D.h in Headers */, + 3EACC9A219F5014D00EB3C5E /* CCCamera.h in Headers */, 50ABBECD1925AB6F00A911A9 /* s3tc.h in Headers */, 15AE1BD119AAE01E00C27E9E /* CCControlHuePicker.h in Headers */, 50ABBE771925AB6F00A911A9 /* CCEventListenerTouch.h in Headers */, @@ -5652,6 +5652,7 @@ 503DD8F01926736A00CD74DD /* CCStdC-ios.h in Headers */, 15AE1A9A19AAD40300C27E9E /* b2Math.h in Headers */, 46A170FF1807CECB005B8026 /* CCPhysicsContact.h in Headers */, + 3EACC9A319F5014D00EB3C5E /* CCCamera.h in Headers */, B29A7E1A19EE1B7700872B35 /* Event.h in Headers */, 15AE1AC719AAD40300C27E9E /* b2GearJoint.h in Headers */, 50ABBDA21925AB4100A911A9 /* CCGroupCommand.h in Headers */, @@ -5689,7 +5690,6 @@ 15B3708719EE414C00ABE682 /* Downloader.h in Headers */, 15AE192619AAD35100C27E9E /* TriggerObj.h in Headers */, 50ABBE2E1925AB6F00A911A9 /* ccCArray.h in Headers */, - 15AE1A0C19AAD3A700C27E9E /* CCSkeletonAnimation.h in Headers */, 15B3707B19EE414C00ABE682 /* AssetsManagerEx.h in Headers */, 15AE1B9119AADA9A00C27E9E /* UIWidget.h in Headers */, 50ABC0041926664800A911A9 /* CCLock-apple.h in Headers */, @@ -5820,7 +5820,6 @@ 50ED2BE119BEAF7900A0AB90 /* UIEditBoxImpl-win32.h in Headers */, 15AE1ACB19AAD40300C27E9E /* b2MouseJoint.h in Headers */, 50ABBD3F1925AB0000A911A9 /* CCGeometry.h in Headers */, - 3EA3EDBF1991CDFA00645534 /* CCCamera.h in Headers */, B29A7DD019EE1B7700872B35 /* RegionAttachment.h in Headers */, 15AE1AD319AAD40300C27E9E /* b2RopeJoint.h in Headers */, 50ABBFFE1926664800A911A9 /* CCFileUtils-apple.h in Headers */, @@ -5872,6 +5871,7 @@ 15AE1BFA19AAE01E00C27E9E /* CCControlSwitch.h in Headers */, 15AE182F19AAD2F700C27E9E /* CCMeshVertexIndexData.h in Headers */, 15AE1BAA19AADFDF00C27E9E /* UIVBox.h in Headers */, + 3EACC9A719F5014D00EB3C5E /* CCLight.h in Headers */, 15AE194E19AAD35100C27E9E /* CCDataReaderHelper.h in Headers */, 3828C0A419EB8ACA002AB57B /* coded_stream_inl.h in Headers */, 15AE1ADB19AAD41000C27E9E /* b2Rope.h in Headers */, @@ -6129,7 +6129,6 @@ 3828C0E219EB8ACA002AB57B /* stringprintf.h in Headers */, 50ABBEDA1925AB6F00A911A9 /* ZipUtils.h in Headers */, 50ABBDC01925AB4100A911A9 /* CCTextureCache.h in Headers */, - 3EA1073219D7F37700CAB794 /* CCLight.h in Headers */, B276EF641988D1D500CD400F /* CCVertexIndexBuffer.h in Headers */, ED9C6A9718599AD8000A5232 /* CCNodeGrid.h in Headers */, 50ABC0201926664800A911A9 /* CCThread.h in Headers */, @@ -6251,7 +6250,6 @@ 50ABBE2B1925AB6F00A911A9 /* ccCArray.cpp in Sources */, B29A7E3B19EE1B7700872B35 /* Animation.c in Sources */, 15AE1BDE19AAE01E00C27E9E /* CCInvocation.cpp in Sources */, - 3EA3EDBC1991CDFA00645534 /* CCCamera.cpp in Sources */, 292DB14F19B4574100A80320 /* UIEditBoxImpl-stub.cpp in Sources */, B29A7E0B19EE1B7700872B35 /* Atlas.c in Sources */, 15AE199419AAD39600C27E9E /* LayoutReader.cpp in Sources */, @@ -6426,6 +6424,7 @@ 1A5701DE180BCB8C0088DEC7 /* CCLayer.cpp in Sources */, 15AE1B5919AADA9900C27E9E /* UIText.cpp in Sources */, 15B3707C19EE414C00ABE682 /* CCEventAssetsManagerEx.cpp in Sources */, + 3EACC9A419F5014D00EB3C5E /* CCLight.cpp in Sources */, 1A5701E2180BCB8C0088DEC7 /* CCScene.cpp in Sources */, 15AE1B9919AADFDF00C27E9E /* UIHBox.cpp in Sources */, 15AE199C19AAD39600C27E9E /* ScrollViewReader.cpp in Sources */, @@ -6435,7 +6434,6 @@ 1A5701E6180BCB8C0088DEC7 /* CCTransition.cpp in Sources */, B24AA985195A675C007B4522 /* CCFastTMXLayer.cpp in Sources */, 15AE1A6A19AAD40300C27E9E /* b2ChainAndCircleContact.cpp in Sources */, - 15AE19BE19AAD3A700C27E9E /* Event.cpp in Sources */, 15B3708819EE414C00ABE682 /* Manifest.cpp in Sources */, 1A5701EA180BCB8C0088DEC7 /* CCTransitionPageTurn.cpp in Sources */, 3828C0D719EB8ACA002AB57B /* once.cc in Sources */, @@ -6458,6 +6456,7 @@ 292DB14D19B4574100A80320 /* UIEditBoxImpl-mac.mm in Sources */, 50ABBDB51925AB4100A911A9 /* CCTexture2D.cpp in Sources */, B29A7DD719EE1B7700872B35 /* SkeletonData.c in Sources */, + 3EACC9A019F5014D00EB3C5E /* CCCamera.cpp in Sources */, 1A570214180BCBF40088DEC7 /* CCRenderTexture.cpp in Sources */, 15AE1BD019AAE01E00C27E9E /* CCControlHuePicker.cpp in Sources */, 15AE18F219AAD35000C27E9E /* CCArmatureDataManager.cpp in Sources */, @@ -6558,7 +6557,6 @@ 1A57034B180BD09B0088DEC7 /* tinyxml2.cpp in Sources */, 1A570354180BD0B00088DEC7 /* ioapi.cpp in Sources */, 15B3707819EE414C00ABE682 /* AssetsManagerEx.cpp in Sources */, - 15AE19E419AAD3A700C27E9E /* SkeletonJson.cpp in Sources */, 1A570358180BD0B00088DEC7 /* unzip.cpp in Sources */, 3828C0CF19EB8ACA002AB57B /* common.cc in Sources */, B29A7DCB19EE1B7700872B35 /* Skeleton.c in Sources */, @@ -6596,7 +6594,6 @@ 15AE199819AAD39600C27E9E /* LoadingBarReader.cpp in Sources */, 503DD8F71926B0DB00CD74DD /* CCIMEDispatcher.cpp in Sources */, 50ABBE751925AB6F00A911A9 /* CCEventListenerTouch.cpp in Sources */, - 3EA1072F19D7F37700CAB794 /* CCLight.cpp in Sources */, 15AE18F019AAD35000C27E9E /* CCArmatureAnimation.cpp in Sources */, 50ABBE511925AB6F00A911A9 /* CCEventDispatcher.cpp in Sources */, 50ABC0051926664800A911A9 /* CCThread-apple.mm in Sources */, @@ -6808,6 +6805,7 @@ 15AE184119AAD2F700C27E9E /* CCSprite3D.cpp in Sources */, 50ABBE5A1925AB6F00A911A9 /* CCEventKeyboard.cpp in Sources */, 15AE193A19AAD35100C27E9E /* CCArmatureDataManager.cpp in Sources */, + 3EACC9A519F5014D00EB3C5E /* CCLight.cpp in Sources */, 15AE1B7A19AADA9A00C27E9E /* UIScrollView.cpp in Sources */, 1A570076180BC5A10088DEC7 /* CCActionGrid3D.cpp in Sources */, 15AE19B219AAD39700C27E9E /* SliderReader.cpp in Sources */, @@ -6956,6 +6954,7 @@ 15AE194919AAD35100C27E9E /* CCComController.cpp in Sources */, 1A57022A180BCC1A0088DEC7 /* CCParticleSystem.cpp in Sources */, 15AE182919AAD2F700C27E9E /* CCMeshSkin.cpp in Sources */, + 3EACC9A119F5014D00EB3C5E /* CCCamera.cpp in Sources */, 15AE1BBD19AADFF000C27E9E /* SocketIO.cpp in Sources */, 15AE1A4319AAD3D500C27E9E /* b2DynamicTree.cpp in Sources */, 15AE1A3A19AAD3D500C27E9E /* b2BroadPhase.cpp in Sources */, @@ -6988,7 +6987,6 @@ 15AE194D19AAD35100C27E9E /* CCDataReaderHelper.cpp in Sources */, 15AE1B8C19AADA9A00C27E9E /* UIScale9Sprite.cpp in Sources */, 15AE19AE19AAD39700C27E9E /* PageViewReader.cpp in Sources */, - 3EA3EDBD1991CDFA00645534 /* CCCamera.cpp in Sources */, 1A570297180BCCAB0088DEC7 /* CCAnimationCache.cpp in Sources */, 50ABBE321925AB6F00A911A9 /* CCConfiguration.cpp in Sources */, 15AE1A9F19AAD40300C27E9E /* b2Timer.cpp in Sources */, @@ -7095,7 +7093,6 @@ 50ABBE201925AB6F00A911A9 /* atitc.cpp in Sources */, 50CB248019D9C5A100687767 /* AudioPlayer.mm in Sources */, 50ABBE9A1925AB6F00A911A9 /* CCRef.cpp in Sources */, - 3EA1073019D7F37700CAB794 /* CCLight.cpp in Sources */, 15AE18BF19AAD33D00C27E9E /* CCLabelTTFLoader.cpp in Sources */, 15AE1B9519AADA9A00C27E9E /* CocosGUI.cpp in Sources */, 15AE180919AAD2F700C27E9E /* CCAABB.cpp in Sources */,