Checking for visibility every frame and using camera position in chec…

…kVisibility
elnormous · Jun 18, 2015 · 8f2e35c · 8f2e35c
1 parent 7b569ba
commit 8f2e35c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/cocos/2d/CCLabel.cpp b/cocos/2d/CCLabel.cpp
@@ -898,7 +898,7 @@ void Label::draw(Renderer *renderer, const Mat4 &transform, uint32_t flags)
     // Don't do calculate the culling if the transform was not updated
     bool transformUpdated = flags & FLAGS_TRANSFORM_DIRTY;
 #if CC_USE_CULLING
-    _insideBounds = transformUpdated ? renderer->checkVisibility(transform, _contentSize) : _insideBounds;
+    _insideBounds = renderer->checkVisibility(transform, _contentSize);
 
     if(_insideBounds)
 #endif

diff --git a/cocos/2d/CCSprite.cpp b/cocos/2d/CCSprite.cpp
@@ -589,7 +589,7 @@ void Sprite::draw(Renderer *renderer, const Mat4 &transform, uint32_t flags)
 {
 #if CC_USE_CULLING
     // Don't do calculate the culling if the transform was not updated
-    _insideBounds = (flags & FLAGS_TRANSFORM_DIRTY) ? renderer->checkVisibility(transform, _contentSize) : _insideBounds;
+    _insideBounds = renderer->checkVisibility(transform, _contentSize);
 
     if(_insideBounds)
 #endif

diff --git a/cocos/renderer/CCRenderer.cpp b/cocos/renderer/CCRenderer.cpp
@@ -983,8 +983,8 @@ bool Renderer::checkVisibility(const Mat4 &transform, const Size &size)
     transform.transformVector(v4local, &v4world);
 
     // center of screen is (0,0)
-    v4world.x -= screen_half.width;
-    v4world.y -= screen_half.height;
+    v4world.x -= scene->_defaultCamera->getPosition().x;
+    v4world.y -= scene->_defaultCamera->getPosition().y;
 
     // convert content size to world coordinates
     float wshw = std::max(fabsf(hSizeX * transform.m[0] + hSizeY * transform.m[4]), fabsf(hSizeX * transform.m[0] - hSizeY * transform.m[4]));