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

file rename CCFrameBufferObject->CCFrameBuffer

This commit is contained in:
Huabing.Xu 2015-06-09 15:32:12 +08:00
parent 97b387560b
commit 3e331128c6
9 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
build/cocos2d_libs.xcodeproj/project.pbxproj
View File

@ -1860,10 +1860,10 @@
B230ED7219B417AE00364AA8 /* CCTrianglesCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B230ED6F19B417AE00364AA8 /* CCTrianglesCommand.cpp */; };
B230ED7319B417AE00364AA8 /* CCTrianglesCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = B230ED7019B417AE00364AA8 /* CCTrianglesCommand.h */; };
B230ED7419B417AE00364AA8 /* CCTrianglesCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = B230ED7019B417AE00364AA8 /* CCTrianglesCommand.h */; };
B240C5E91B09DFB000137F50 /* CCFrameBufferObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B240C5E71B09DFB000137F50 /* CCFrameBufferObject.cpp */; };
B240C5EA1B09DFB000137F50 /* CCFrameBufferObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B240C5E71B09DFB000137F50 /* CCFrameBufferObject.cpp */; };
B240C5EB1B09DFB000137F50 /* CCFrameBufferObject.h in Headers */ = {isa = PBXBuildFile; fileRef = B240C5E81B09DFB000137F50 /* CCFrameBufferObject.h */; };
B240C5EC1B09DFB000137F50 /* CCFrameBufferObject.h in Headers */ = {isa = PBXBuildFile; fileRef = B240C5E81B09DFB000137F50 /* CCFrameBufferObject.h */; };
B240C5E91B09DFB000137F50 /* CCFrameBuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B240C5E71B09DFB000137F50 /* CCFrameBuffer.cpp */; };
B240C5EA1B09DFB000137F50 /* CCFrameBuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B240C5E71B09DFB000137F50 /* CCFrameBuffer.cpp */; };
B240C5EB1B09DFB000137F50 /* CCFrameBuffer.h in Headers */ = {isa = PBXBuildFile; fileRef = B240C5E81B09DFB000137F50 /* CCFrameBuffer.h */; };
B240C5EC1B09DFB000137F50 /* CCFrameBuffer.h in Headers */ = {isa = PBXBuildFile; fileRef = B240C5E81B09DFB000137F50 /* CCFrameBuffer.h */; };
B24AA985195A675C007B4522 /* CCFastTMXLayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B24AA981195A675C007B4522 /* CCFastTMXLayer.cpp */; };
B24AA986195A675C007B4522 /* CCFastTMXLayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B24AA981195A675C007B4522 /* CCFastTMXLayer.cpp */; };
B24AA987195A675C007B4522 /* CCFastTMXLayer.h in Headers */ = {isa = PBXBuildFile; fileRef = B24AA982195A675C007B4522 /* CCFastTMXLayer.h */; };
@ -4512,8 +4512,8 @@
B217704C1977ED8B009EE11B /* libsqlite3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsqlite3.dylib; path = usr/lib/libsqlite3.dylib; sourceTree = SDKROOT; };
B230ED6F19B417AE00364AA8 /* CCTrianglesCommand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCTrianglesCommand.cpp; sourceTree = "<group>"; };
B230ED7019B417AE00364AA8 /* CCTrianglesCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCTrianglesCommand.h; sourceTree = "<group>"; };
B240C5E71B09DFB000137F50 /* CCFrameBufferObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCFrameBufferObject.cpp; sourceTree = "<group>"; };
B240C5E81B09DFB000137F50 /* CCFrameBufferObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCFrameBufferObject.h; sourceTree = "<group>"; };
B240C5E71B09DFB000137F50 /* CCFrameBuffer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCFrameBuffer.cpp; sourceTree = "<group>"; };
B240C5E81B09DFB000137F50 /* CCFrameBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCFrameBuffer.h; sourceTree = "<group>"; };
B241A6E21AFB0BE700C5623C /* ccShader_CameraClear.frag */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_CameraClear.frag; sourceTree = "<group>"; };
B241A6E31AFB0BE700C5623C /* ccShader_CameraClear.vert */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_CameraClear.vert; sourceTree = "<group>"; };
B24AA981195A675C007B4522 /* CCFastTMXLayer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCFastTMXLayer.cpp; sourceTree = "<group>"; };
@ -7199,8 +7199,8 @@
500DC89819105D41007B91BF /* renderer */ = {
isa = PBXGroup;
children = (
B240C5E71B09DFB000137F50 /* CCFrameBufferObject.cpp */,
B240C5E81B09DFB000137F50 /* CCFrameBufferObject.h */,
B240C5E71B09DFB000137F50 /* CCFrameBuffer.cpp */,
B240C5E81B09DFB000137F50 /* CCFrameBuffer.h */,
5034CA5D191D591900CE6051 /* shaders */,
B276EF5B1988D1D500CD400F /* CCVertexIndexData.h */,
B276EF5C1988D1D500CD400F /* CCVertexIndexData.cpp */,
@ -9079,7 +9079,7 @@
501216A21AC473AD009A4BEA /* CCMaterial.h in Headers */,
50ABC05D1926664800A911A9 /* CCApplication-mac.h in Headers */,
B6CAB2871AF9AA1A00B9B856 /* btBvhTriangleMeshShape.h in Headers */,
B240C5EB1B09DFB000137F50 /* CCFrameBufferObject.h in Headers */,
B240C5EB1B09DFB000137F50 /* CCFrameBuffer.h in Headers */,
B6CAB51D1AF9AA1A00B9B856 /* btPoolAllocator.h in Headers */,
B6CAB3EB1AF9AA1A00B9B856 /* btDynamicsWorld.h in Headers */,
B6CAB29D1AF9AA1A00B9B856 /* btConeShape.h in Headers */,
@ -9651,7 +9651,7 @@
50ABBE501925AB6F00A911A9 /* CCEventCustom.h in Headers */,
15AE1AD719AAD40300C27E9E /* b2WheelJoint.h in Headers */,
B665E3311AA80A6500DDB1C5 /* CCPUOnCountObserverTranslator.h in Headers */,
B240C5EC1B09DFB000137F50 /* CCFrameBufferObject.h in Headers */,
B240C5EC1B09DFB000137F50 /* CCFrameBuffer.h in Headers */,
B6CAB41C1AF9AA1A00B9B856 /* btDantzigLCP.h in Headers */,
B665E2051AA80A6500DDB1C5 /* CCPUAlignAffectorTranslator.h in Headers */,
1A570070180BC5A10088DEC7 /* CCActionEase.h in Headers */,
@ -10637,7 +10637,7 @@
15AE188C19AAD33D00C27E9E /* CCLabelBMFontLoader.cpp in Sources */,
B6CAAFE21AF9A9E100B9B856 /* CCPhysics3D.cpp in Sources */,
DA8C62A219E52C6400000516 /* ioapi_mem.cpp in Sources */,
B240C5E91B09DFB000137F50 /* CCFrameBufferObject.cpp in Sources */,
B240C5E91B09DFB000137F50 /* CCFrameBuffer.cpp in Sources */,
B68779001A8CA82E00643ABF /* CCParticle3DRender.cpp in Sources */,
1A570069180BC5A10088DEC7 /* CCActionCatmullRom.cpp in Sources */,
B257B44E1989D5E800D9A687 /* CCPrimitive.cpp in Sources */,
@ -11700,7 +11700,7 @@
B665E34F1AA80A6500DDB1C5 /* CCPUOnPositionObserverTranslator.cpp in Sources */,
1A5701EF180BCB8C0088DEC7 /* CCTransitionProgress.cpp in Sources */,
B6D38B8B1AC3AFAC00043997 /* CCSkybox.cpp in Sources */,
B240C5EA1B09DFB000137F50 /* CCFrameBufferObject.cpp in Sources */,
B240C5EA1B09DFB000137F50 /* CCFrameBuffer.cpp in Sources */,
1A5701F8180BCBAD0088DEC7 /* CCMenu.cpp in Sources */,
382384141A259092002C4610 /* NodeReaderProtocol.cpp in Sources */,
50ABBD511925AB0000A911A9 /* Quaternion.cpp in Sources */,

2
cocos/2d/CCCamera.cpp
View File

@ -29,7 +29,7 @@
#include "renderer/CCQuadCommand.h"
#include "renderer/CCGLProgramCache.h"
#include "renderer/ccGLStateCache.h"
#include "renderer/CCFrameBufferObject.h"
#include "renderer/CCFrameBuffer.h"
NS_CC_BEGIN

2
cocos/2d/CCScene.cpp
View File

@ -31,7 +31,7 @@ THE SOFTWARE.
#include "base/CCEventDispatcher.h"
#include "base/CCEventListenerCustom.h"
#include "renderer/CCRenderer.h"
#include "renderer/CCFrameBufferObject.h"
#include "renderer/CCFrameBuffer.h"
#include "deprecated/CCString.h"
#if CC_USE_PHYSICS

2
cocos/base/CCDirector.cpp
View File

@ -48,7 +48,7 @@ THE SOFTWARE.
#include "renderer/ccGLStateCache.h"
#include "renderer/CCRenderer.h"
#include "renderer/CCRenderState.h"
#include "renderer/CCFrameBufferObject.h"
#include "renderer/CCFrameBuffer.h"
#include "2d/CCCamera.h"
#include "base/CCUserDefault.h"
#include "base/ccFPSImages.h"

2
cocos/cocos2d.h
View File

@ -174,7 +174,7 @@ THE SOFTWARE.
#include "renderer/CCTechnique.h"
#include "renderer/CCPass.h"
#include "renderer/CCRenderState.h"
#include "renderer/CCFrameBufferObject.h"
#include "renderer/CCFrameBuffer.h"
#include "renderer/ccGLStateCache.h"
#include "renderer/ccShaders.h"

2
cocos/renderer/CCFrameBufferObject.cpp → cocos/renderer/CCFrameBuffer.cpp
View File

@ -22,7 +22,7 @@
THE SOFTWARE.
****************************************************************************/
#include "renderer/CCFrameBufferObject.h"
#include "renderer/CCFrameBuffer.h"
#include "base/CCDirector.h"
#include "base/CCEventCustom.h"
#include "base/CCEventListenerCustom.h"

0
cocos/renderer/CCFrameBufferObject.h → cocos/renderer/CCFrameBuffer.h
View File

10
tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.cpp
View File

@ -42,7 +42,7 @@ Camera3DTests::Camera3DTests()
ADD_TEST_CASE(CameraCullingDemo);
ADD_TEST_CASE(FogTestDemo);
ADD_TEST_CASE(CameraArcBallDemo);
ADD_TEST_CASE(CameraFrameBufferObjectTest);
ADD_TEST_CASE(CameraFrameBufferTest);
}
//------------------------------------------------------------------
@ -1413,22 +1413,22 @@ void FogTestDemo::onTouchesMoved(const std::vector<Touch*>& touches, cocos2d::Ev
}
}
CameraFrameBufferObjectTest::CameraFrameBufferObjectTest()
CameraFrameBufferTest::CameraFrameBufferTest()
{
}
CameraFrameBufferObjectTest::~CameraFrameBufferObjectTest()
CameraFrameBufferTest::~CameraFrameBufferTest()
{
}
std::string CameraFrameBufferObjectTest::title() const
std::string CameraFrameBufferTest::title() const
{
return "Camera FrameBuffer Object Test";
}
void CameraFrameBufferObjectTest::onEnter()
void CameraFrameBufferTest::onEnter()
{
auto sizeInpixels = Director::getInstance()->getWinSizeInPixels();
auto size = Director::getInstance()->getWinSize();

8
tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.h
View File

@ -255,12 +255,12 @@ protected:
#endif
};
class CameraFrameBufferObjectTest : public CameraBaseTest
class CameraFrameBufferTest : public CameraBaseTest
{
public:
CREATE_FUNC(CameraFrameBufferObjectTest);
CameraFrameBufferObjectTest(void);
virtual ~CameraFrameBufferObjectTest(void);
CREATE_FUNC(CameraFrameBufferTest);
CameraFrameBufferTest(void);
virtual ~CameraFrameBufferTest(void);
// overrides
virtual std::string title() const override;