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

Merge branch 'v3FrameBufferObject' into v3Viewport

This commit is contained in:
Huabing.Xu 2015-05-29 14:10:49 +08:00
parent 1fb0ba112b b2579a754a
commit 2f32fcabba
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cocos/2d/CCCamera.cpp
View File

@ -475,6 +475,11 @@ void Camera::applyFrameBufferObject()
}
}
void Camera::apply()
{
applyFrameBufferObject();
}
int Camera::getRenderOrder() const
{
int result(0);

12
cocos/2d/CCCamera.h
View File

@ -213,9 +213,17 @@ public:
* Get the default camera of the current running scene.
*/
static Camera* getDefaultCamera();
/**
Before rendering scene with this camera, the background need to be cleared.
*/
void clearBackground(float depth);
/**
Apply the FBO, RenderTargets and viewport.
*/
void apply();
/**
Set FBO, which will attacha several render target for the rendered result.
*/
void setFrameBufferObject(FrameBufferObject* fbo);
void setViewport(const Viewport& vp) { _viewport = vp; }
CC_CONSTRUCTOR_ACCESS:

2
cocos/2d/CCScene.cpp
View File

@ -164,7 +164,7 @@ void Scene::render(Renderer* renderer)
director->pushMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_PROJECTION);
director->loadMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_PROJECTION, Camera::_visitingCamera->getViewProjectionMatrix());
camera->applyFrameBufferObject();
camera->apply();
//clear background with max depth
camera->clearBackground(1.0);
//visit the scene