Merge pull request #8106 from super626/v3

add OBBs to OBB collision test by default, Fix 0.1 version static model load bug and remove unused resource
This commit is contained in:
minggo 2014-09-19 16:16:33 +08:00
commit 653986a3a2
4 changed files with 5 additions and 1 deletions

View File

@ -165,7 +165,9 @@ std::string BundleReader::readString()
}
std::string str;
if (length > 0)
ssize_t validLength = _length - _position;
if (length > 0 && length <= validLength)
{
str.resize(length);
if (read(&str[0], 1, length) != length)
@ -173,6 +175,7 @@ std::string BundleReader::readString()
return std::string();
}
}
return str;
}

View File

@ -1232,6 +1232,7 @@ Sprite3DWithOBBPerfromanceTest::Sprite3DWithOBBPerfromanceTest()
_labelCubeCount->setPosition(Vec2(s.width/2, s.height-90));
addChild(_labelCubeCount);
_hasCollider = false;
addOBBCallback(nullptr);
scheduleUpdate();
}
std::string Sprite3DWithOBBPerfromanceTest::title() const

Binary file not shown.

Before

Width:  |  Height:  |  Size: 238 KiB