diff --git a/build/cocos2d_libs.xcodeproj/project.pbxproj b/build/cocos2d_libs.xcodeproj/project.pbxproj index 90af72ae38..6f97b84ffa 100644 --- a/build/cocos2d_libs.xcodeproj/project.pbxproj +++ b/build/cocos2d_libs.xcodeproj/project.pbxproj @@ -2059,6 +2059,10 @@ B60C5BD519AC68B10056FBDE /* CCBillBoard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B60C5BD219AC68B10056FBDE /* CCBillBoard.cpp */; }; B60C5BD619AC68B10056FBDE /* CCBillBoard.h in Headers */ = {isa = PBXBuildFile; fileRef = B60C5BD319AC68B10056FBDE /* CCBillBoard.h */; }; B60C5BD719AC68B10056FBDE /* CCBillBoard.h in Headers */ = {isa = PBXBuildFile; fileRef = B60C5BD319AC68B10056FBDE /* CCBillBoard.h */; }; + B62305641B8ABA6600F0745D /* CCTextureCube.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B62305621B8ABA6600F0745D /* CCTextureCube.cpp */; }; + B62305651B8ABA6600F0745D /* CCTextureCube.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B62305621B8ABA6600F0745D /* CCTextureCube.cpp */; }; + B62305661B8ABA6600F0745D /* CCTextureCube.h in Headers */ = {isa = PBXBuildFile; fileRef = B62305631B8ABA6600F0745D /* CCTextureCube.h */; }; + B62305671B8ABA6600F0745D /* CCTextureCube.h in Headers */ = {isa = PBXBuildFile; fileRef = B62305631B8ABA6600F0745D /* CCTextureCube.h */; }; B63990CC1A490AFE00B07923 /* CCAsyncTaskPool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B63990CA1A490AFE00B07923 /* CCAsyncTaskPool.cpp */; }; B63990CD1A490AFE00B07923 /* CCAsyncTaskPool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B63990CA1A490AFE00B07923 /* CCAsyncTaskPool.cpp */; }; B63990CE1A490AFE00B07923 /* CCAsyncTaskPool.h in Headers */ = {isa = PBXBuildFile; fileRef = B63990CB1A490AFE00B07923 /* CCAsyncTaskPool.h */; }; @@ -3517,10 +3521,6 @@ B6D38B8B1AC3AFAC00043997 /* CCSkybox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6D38B861AC3AFAC00043997 /* CCSkybox.cpp */; }; B6D38B8C1AC3AFAC00043997 /* CCSkybox.h in Headers */ = {isa = PBXBuildFile; fileRef = B6D38B871AC3AFAC00043997 /* CCSkybox.h */; }; B6D38B8D1AC3AFAC00043997 /* CCSkybox.h in Headers */ = {isa = PBXBuildFile; fileRef = B6D38B871AC3AFAC00043997 /* CCSkybox.h */; }; - B6D38B8E1AC3AFAC00043997 /* CCTextureCube.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6D38B881AC3AFAC00043997 /* CCTextureCube.cpp */; }; - B6D38B8F1AC3AFAC00043997 /* CCTextureCube.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6D38B881AC3AFAC00043997 /* CCTextureCube.cpp */; }; - B6D38B901AC3AFAC00043997 /* CCTextureCube.h in Headers */ = {isa = PBXBuildFile; fileRef = B6D38B891AC3AFAC00043997 /* CCTextureCube.h */; }; - B6D38B911AC3AFAC00043997 /* CCTextureCube.h in Headers */ = {isa = PBXBuildFile; fileRef = B6D38B891AC3AFAC00043997 /* CCTextureCube.h */; }; B6DD2FA71B04825B00E47F5F /* DebugDraw.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6DD2F7A1B04825B00E47F5F /* DebugDraw.cpp */; }; B6DD2FA81B04825B00E47F5F /* DebugDraw.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6DD2F7A1B04825B00E47F5F /* DebugDraw.cpp */; }; B6DD2FA91B04825B00E47F5F /* DebugDraw.h in Headers */ = {isa = PBXBuildFile; fileRef = B6DD2F7B1B04825B00E47F5F /* DebugDraw.h */; }; @@ -4771,6 +4771,8 @@ B603F1B21AC8F1FD00A9579C /* ccShader_3D_Terrain.vert */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_3D_Terrain.vert; sourceTree = ""; }; B60C5BD219AC68B10056FBDE /* CCBillBoard.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCBillBoard.cpp; sourceTree = ""; }; B60C5BD319AC68B10056FBDE /* CCBillBoard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCBillBoard.h; sourceTree = ""; }; + B62305621B8ABA6600F0745D /* CCTextureCube.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCTextureCube.cpp; sourceTree = ""; }; + B62305631B8ABA6600F0745D /* CCTextureCube.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCTextureCube.h; sourceTree = ""; }; B63990CA1A490AFE00B07923 /* CCAsyncTaskPool.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCAsyncTaskPool.cpp; path = ../base/CCAsyncTaskPool.cpp; sourceTree = ""; }; B63990CB1A490AFE00B07923 /* CCAsyncTaskPool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCAsyncTaskPool.h; path = ../base/CCAsyncTaskPool.h; sourceTree = ""; }; B665E0CC1AA80A6500DDB1C5 /* CCPUAffector.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCPUAffector.cpp; path = Particle3D/PU/CCPUAffector.cpp; sourceTree = ""; }; @@ -5503,8 +5505,6 @@ B6CAB1E01AF9AA1A00B9B856 /* MiniCLTaskScheduler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MiniCLTaskScheduler.h; sourceTree = ""; }; B6D38B861AC3AFAC00043997 /* CCSkybox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCSkybox.cpp; sourceTree = ""; }; B6D38B871AC3AFAC00043997 /* CCSkybox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCSkybox.h; sourceTree = ""; }; - B6D38B881AC3AFAC00043997 /* CCTextureCube.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCTextureCube.cpp; sourceTree = ""; }; - B6D38B891AC3AFAC00043997 /* CCTextureCube.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCTextureCube.h; sourceTree = ""; }; B6D38B941AC3B45600043997 /* ccShader_3D_Particle.frag */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_3D_Particle.frag; sourceTree = ""; }; B6D38B951AC3B45600043997 /* ccShader_3D_Particle.vert */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_3D_Particle.vert; sourceTree = ""; }; B6D38B961AC3B45600043997 /* ccShader_3D_Skybox.frag */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_3D_Skybox.frag; sourceTree = ""; }; @@ -7430,6 +7430,8 @@ 500DC89819105D41007B91BF /* renderer */ = { isa = PBXGroup; children = ( + B62305621B8ABA6600F0745D /* CCTextureCube.cpp */, + B62305631B8ABA6600F0745D /* CCTextureCube.h */, B240C5E71B09DFB000137F50 /* CCFrameBuffer.cpp */, B240C5E81B09DFB000137F50 /* CCFrameBuffer.h */, 5034CA5D191D591900CE6051 /* shaders */, @@ -7873,8 +7875,6 @@ B603F1A71AC8EA0900A9579C /* CCTerrain.h */, B6D38B861AC3AFAC00043997 /* CCSkybox.cpp */, B6D38B871AC3AFAC00043997 /* CCSkybox.h */, - B6D38B881AC3AFAC00043997 /* CCTextureCube.cpp */, - B6D38B891AC3AFAC00043997 /* CCTextureCube.h */, 5E9F61221A3FFE3D0038DE01 /* CCFrustum.cpp */, 5E9F61231A3FFE3D0038DE01 /* CCFrustum.h */, 5E9F61241A3FFE3D0038DE01 /* CCPlane.cpp */, @@ -9443,6 +9443,7 @@ B665E43C1AA80A6600DDB1C5 /* CCPUVortexAffectorTranslator.h in Headers */, 15AE191C19AAD35000C27E9E /* CCTransformHelp.h in Headers */, 5034CA2F191D591100CE6051 /* ccShader_PositionTexture.vert in Headers */, + B62305661B8ABA6600F0745D /* CCTextureCube.h in Headers */, B665E4241AA80A6600DDB1C5 /* CCPUTranslateManager.h in Headers */, 15AE1C1219AAE2C600C27E9E /* CCPhysicsDebugNode.h in Headers */, B665E3381AA80A6500DDB1C5 /* CCPUOnEmissionObserverTranslator.h in Headers */, @@ -9675,7 +9676,6 @@ B6CAB2B51AF9AA1A00B9B856 /* btConvexShape.h in Headers */, B60C5BD619AC68B10056FBDE /* CCBillBoard.h in Headers */, 15AE1BA419AADFDF00C27E9E /* UILayoutManager.h in Headers */, - B6D38B901AC3AFAC00043997 /* CCTextureCube.h in Headers */, 1A01C69418F57BE800EFE3A6 /* CCFloat.h in Headers */, 1A57034D180BD09B0088DEC7 /* tinyxml2.h in Headers */, B6CAB4C31AF9AA1A00B9B856 /* Box.h in Headers */, @@ -10295,6 +10295,7 @@ 1A5701A4180BCB590088DEC7 /* CCFontAtlas.h in Headers */, B6CAB4C41AF9AA1A00B9B856 /* Box.h in Headers */, 15AE1C0219AAE01E00C27E9E /* CCScrollView.h in Headers */, + B62305671B8ABA6600F0745D /* CCTextureCube.h in Headers */, 1A5701A8180BCB590088DEC7 /* CCFontAtlasCache.h in Headers */, B665E3E51AA80A6600DDB1C5 /* CCPUSineForceAffector.h in Headers */, 182C5CE81A9D725400C30D34 /* UserCameraReader.h in Headers */, @@ -10487,7 +10488,6 @@ 15AE1AC919AAD40300C27E9E /* b2Joint.h in Headers */, 382383EF1A258FA7002C4610 /* flatbuffers.h in Headers */, B677B0CC1B18492D006762CB /* CCNavMesh.h in Headers */, - B6D38B911AC3AFAC00043997 /* CCTextureCube.h in Headers */, B665E2811AA80A6500DDB1C5 /* CCPUDoScaleEventHandlerTranslator.h in Headers */, 15AE196819AAD35100C27E9E /* CCUtilMath.h in Headers */, B29A7E2019EE1B7700872B35 /* BoneData.h in Headers */, @@ -11099,7 +11099,6 @@ B665E24E1AA80A6500DDB1C5 /* CCPUColorAffectorTranslator.cpp in Sources */, B6CAB1E71AF9AA1A00B9B856 /* btAxisSweep3.cpp in Sources */, B6CAB2D91AF9AA1A00B9B856 /* btPolyhedralConvexShape.cpp in Sources */, - B6D38B8E1AC3AFAC00043997 /* CCTextureCube.cpp in Sources */, 15AE1B9B19AADFDF00C27E9E /* UIRelativeBox.cpp in Sources */, B665E3E21AA80A6600DDB1C5 /* CCPUSineForceAffector.cpp in Sources */, 50ABBD501925AB0000A911A9 /* Quaternion.cpp in Sources */, @@ -11174,6 +11173,7 @@ 1A57006D180BC5A10088DEC7 /* CCActionEase.cpp in Sources */, 15AE1A5019AAD40300C27E9E /* b2BlockAllocator.cpp in Sources */, B665E20E1AA80A6500DDB1C5 /* CCPUBaseForceAffector.cpp in Sources */, + B62305641B8ABA6600F0745D /* CCTextureCube.cpp in Sources */, B6CAB25D1AF9AA1A00B9B856 /* btInternalEdgeUtility.cpp in Sources */, 15AE1A8219AAD40300C27E9E /* b2GearJoint.cpp in Sources */, 1A570071180BC5A10088DEC7 /* CCActionGrid.cpp in Sources */, @@ -12027,6 +12027,7 @@ 15AE1A3C19AAD3D500C27E9E /* b2CollideCircle.cpp in Sources */, 501216951AC47393009A4BEA /* CCPass.cpp in Sources */, 50ABBE6E1925AB6F00A911A9 /* CCEventListenerKeyboard.cpp in Sources */, + B62305651B8ABA6600F0745D /* CCTextureCube.cpp in Sources */, B665E2CB1AA80A6500DDB1C5 /* CCPUGravityAffectorTranslator.cpp in Sources */, 15AE18D719AAD33D00C27E9E /* CCScrollViewLoader.cpp in Sources */, 50CB247C19D9C5A100687767 /* AudioEngine-inl.mm in Sources */, @@ -12228,7 +12229,6 @@ B6CAB2A41AF9AA1A00B9B856 /* btConvexHullShape.cpp in Sources */, 15AE1AA519AAD40300C27E9E /* b2Fixture.cpp in Sources */, B29A7DE219EE1B7700872B35 /* MeshAttachment.c in Sources */, - B6D38B8F1AC3AFAC00043997 /* CCTextureCube.cpp in Sources */, B6CAB2C01AF9AA1A00B9B856 /* btEmptyShape.cpp in Sources */, 15AE1BAD19AADFDF00C27E9E /* UILayoutParameter.cpp in Sources */, 3823843E1A259140002C4610 /* SingleNodeReader.cpp in Sources */, diff --git a/cocos/2d/CCCameraBackgroundBrush.cpp b/cocos/2d/CCCameraBackgroundBrush.cpp index d64cfdc7e9..302186c4ef 100644 --- a/cocos/2d/CCCameraBackgroundBrush.cpp +++ b/cocos/2d/CCCameraBackgroundBrush.cpp @@ -33,7 +33,7 @@ #include "renderer/CCGLProgramState.h" #include "renderer/CCRenderer.h" #include "renderer/CCRenderState.h" -#include "3d/CCTextureCube.h" +#include "renderer/CCTextureCube.h" #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) #include "base/CCEventCustom.h" diff --git a/cocos/2d/libcocos2d.vcxproj b/cocos/2d/libcocos2d.vcxproj index 4d33cd8871..f62d0aeb5a 100644 --- a/cocos/2d/libcocos2d.vcxproj +++ b/cocos/2d/libcocos2d.vcxproj @@ -395,7 +395,6 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\chipmunk\prebuilt\win32\release-lib\*.* - @@ -627,6 +626,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\chipmunk\prebuilt\win32\release-lib\*.* + @@ -962,7 +962,6 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\chipmunk\prebuilt\win32\release-lib\*.* - @@ -1243,6 +1242,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 071543d2e7..eb2707d8f7 100644 --- a/cocos/2d/libcocos2d.vcxproj.filters +++ b/cocos/2d/libcocos2d.vcxproj.filters @@ -1362,9 +1362,6 @@ 3d - - 3d - extension\Particle3D\ParticleUniverse @@ -1934,6 +1931,9 @@ 2d + + renderer + @@ -3184,9 +3184,6 @@ 3d - - 3d - platform @@ -3771,6 +3768,9 @@ 2d + + renderer + diff --git a/cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems b/cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems index fe832bac5a..0933df8075 100644 --- a/cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems +++ b/cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems @@ -230,7 +230,6 @@ - @@ -532,6 +531,7 @@ + @@ -856,7 +856,6 @@ - NotUsing @@ -1126,6 +1125,7 @@ + diff --git a/cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters b/cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters index b8cd7da27b..f9759f3410 100644 --- a/cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters +++ b/cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters @@ -1728,9 +1728,6 @@ 3d - - 3d - 3d @@ -1870,6 +1867,9 @@ 2d + + renderer + @@ -3431,9 +3431,6 @@ 3d - - 3d - 3d @@ -3570,6 +3567,9 @@ 2d + + renderer + diff --git a/cocos/3d/Android.mk b/cocos/3d/Android.mk index 771a23da37..f08edf18c0 100644 --- a/cocos/3d/Android.mk +++ b/cocos/3d/Android.mk @@ -23,8 +23,7 @@ CCObjLoader.cpp \ CCSkeleton3D.cpp \ CCSprite3D.cpp \ CCTerrain.cpp \ -CCSkybox.cpp \ -CCTextureCube.cpp +CCSkybox.cpp LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/.. diff --git a/cocos/3d/CCSkybox.cpp b/cocos/3d/CCSkybox.cpp index 36d9bd4890..06e1b7c061 100644 --- a/cocos/3d/CCSkybox.cpp +++ b/cocos/3d/CCSkybox.cpp @@ -31,9 +31,8 @@ #include "renderer/CCGLProgramState.h" #include "renderer/CCRenderer.h" #include "renderer/CCRenderState.h" +#include "renderer/CCTextureCube.h" #include "3d/CCSkybox.h" -#include "3d/CCTextureCube.h" - #include "2d/CCCamera.h" NS_CC_BEGIN diff --git a/cocos/3d/CMakeLists.txt b/cocos/3d/CMakeLists.txt index 6d7df05657..b306935b3e 100644 --- a/cocos/3d/CMakeLists.txt +++ b/cocos/3d/CMakeLists.txt @@ -25,6 +25,5 @@ set(COCOS_3D_SRC 3d/CCSprite3D.cpp 3d/CCSprite3DMaterial.cpp 3d/CCTerrain.cpp - 3d/CCTextureCube.cpp ) diff --git a/cocos/Android.mk b/cocos/Android.mk index 9343224bba..d2049c1e68 100644 --- a/cocos/Android.mk +++ b/cocos/Android.mk @@ -181,6 +181,7 @@ renderer/CCTechnique.cpp \ renderer/CCTexture2D.cpp \ renderer/CCTextureAtlas.cpp \ renderer/CCTextureCache.cpp \ +renderer/CCTextureCube.cpp \ renderer/CCTrianglesCommand.cpp \ renderer/CCVertexAttribBinding.cpp \ renderer/CCVertexIndexBuffer.cpp \ diff --git a/cocos/cocos2d.h b/cocos/cocos2d.h index 7ad0b66ae9..fb205c046b 100644 --- a/cocos/cocos2d.h +++ b/cocos/cocos2d.h @@ -163,6 +163,7 @@ THE SOFTWARE. #include "renderer/CCRenderer.h" #include "renderer/CCTechnique.h" #include "renderer/CCTexture2D.h" +#include "renderer/CCTextureCube.h" #include "renderer/CCTextureCache.h" #include "renderer/CCTrianglesCommand.h" #include "renderer/CCVertexAttribBinding.h" @@ -298,7 +299,7 @@ THE SOFTWARE. #include "3d/CCSprite3D.h" #include "3d/CCSprite3DMaterial.h" #include "3d/CCTerrain.h" -#include "3d/CCTextureCube.h" + // Deprecated include #include "deprecated/CCArray.h" diff --git a/cocos/3d/CCTextureCube.cpp b/cocos/renderer/CCTextureCube.cpp similarity index 99% rename from cocos/3d/CCTextureCube.cpp rename to cocos/renderer/CCTextureCube.cpp index a867e38266..17fd54bd64 100644 --- a/cocos/3d/CCTextureCube.cpp +++ b/cocos/renderer/CCTextureCube.cpp @@ -22,7 +22,7 @@ THE SOFTWARE. ****************************************************************************/ -#include "3d/CCTextureCube.h" +#include "renderer/CCTextureCube.h" #include "platform/CCImage.h" #include "platform/CCFileUtils.h" diff --git a/cocos/3d/CCTextureCube.h b/cocos/renderer/CCTextureCube.h similarity index 100% rename from cocos/3d/CCTextureCube.h rename to cocos/renderer/CCTextureCube.h diff --git a/cocos/renderer/CMakeLists.txt b/cocos/renderer/CMakeLists.txt index bdfd0995d7..2f8eabe581 100644 --- a/cocos/renderer/CMakeLists.txt +++ b/cocos/renderer/CMakeLists.txt @@ -20,6 +20,7 @@ set(COCOS_RENDERER_SRC renderer/CCTexture2D.cpp renderer/CCTextureAtlas.cpp renderer/CCTextureCache.cpp + renderer/CCTextureCube.cpp renderer/CCTrianglesCommand.cpp renderer/CCVertexAttribBinding.cpp renderer/CCVertexIndexBuffer.cpp