krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

update resource naming in getObjectAABB()

Browse source
This commit is contained in:
greye 2012-07-25 23:28:42 +04:00
parent cd04911f3c
commit 9f813aa26c
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libs/openengine/bullet/physic.cpp
View file

@ -12,8 +12,6 @@
#include <boost/lexical_cast.hpp> #include <boost/lexical_cast.hpp>
#include <stdio.h>
#define BIT(x) (1<<(x)) #define BIT(x) (1<<(x))
namespace OEngine { namespace OEngine {
@ -576,14 +574,13 @@ namespace Physic
char uniqueID[8]; char uniqueID[8];
sprintf( uniqueID, "%07.3f", scale ); sprintf( uniqueID, "%07.3f", scale );
std::string sid = uniqueID; std::string sid = uniqueID;
std::string outputstring = mesh + uniqueID + "\"|"; std::string outputstring = mesh + uniqueID;
mShapeLoader->load(outputstring, "General"); mShapeLoader->load(outputstring, "General");
BulletShapeManager::getSingletonPtr()->load(outputstring, "General"); BulletShapeManager::getSingletonPtr()->load(outputstring, "General");
BulletShapePtr shape = BulletShapePtr shape =
BulletShapeManager::getSingleton().getByName(outputstring, "General"); BulletShapeManager::getSingleton().getByName(outputstring, "General");
btTransform trans; btTransform trans;
btVector3 btmin, btmax; btVector3 btmin, btmax;