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

fix FastTiledMap auto-culling bug.

This commit is contained in:
fusijie 2015-07-30 15:07:03 +08:00
parent f91a58c8ff
commit 17c7848e62
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
cocos/2d/CCFastTMXLayer.cpp
View File

@ -37,6 +37,7 @@ THE SOFTWARE.
#include "2d/CCFastTMXLayer.h"
#include "2d/CCFastTMXTiledMap.h"
#include "2d/CCSprite.h"
#include "2d/CCCamera.h"
#include "renderer/CCTextureCache.h"
#include "renderer/CCGLProgramCache.h"
#include "renderer/ccGLStateCache.h"
@ -138,11 +139,21 @@ TMXLayer::~TMXLayer()
void TMXLayer::draw(Renderer *renderer, const Mat4& transform, uint32_t flags)
{
updateTotalQuads();
bool isViewProjectionUpdated = true;
auto visitingCamera = Camera::getVisitingCamera();
auto defaultCamera = Camera::getDefaultCamera();
if (visitingCamera == defaultCamera) {
isViewProjectionUpdated = visitingCamera->isViewProjectionUpdated();
}
if( flags != 0 || _dirty || _quadsDirty )
if( flags != 0 || _dirty || _quadsDirty || isViewProjectionUpdated)
{
Size s = Director::getInstance()->getWinSize();
auto rect = Rect(0, 0, s.width, s.height);
Size s = Director::getInstance()->getVisibleSize();
auto rect = Rect(Camera::getVisitingCamera()->getPositionX() - s.width * 0.5,
Camera::getVisitingCamera()->getPositionY() - s.height * 0.5,
s.width,
s.height);
Mat4 inv = transform;
inv.inverse();

4
tests/cpp-tests/Classes/NewRendererTest/NewRendererTest.cpp
View File

@ -480,7 +480,9 @@ void CaptureScreenTest::afterCaptured(bool succeed, const std::string& outputFil
BugAutoCulling::BugAutoCulling()
{
Size s = Director::getInstance()->getWinSize();
for (int i=0; i<100; i++) {
auto fastmap = cocos2d::experimental::TMXTiledMap::create("TileMaps/orthogonal-test2.tmx");
this->addChild(fastmap);
for (int i = 0; i < 30; i++) {
auto sprite = Sprite::create("Images/grossini.png");
sprite->setPosition(s.width/2 + s.width/10 * i, s.height/2);
this->addChild(sprite);