NoEdge/Danbias
NoEdge
/
Danbias
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'Physics' of https://github.com/dean11/Danbias into GameServer

This commit is contained in:
dean11 2014-02-26 14:20:43 +01:00
parent e680da9d54 58df25c392
commit 469312bfe7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Code/Physics/GamePhysics/Implementation/PhysicsAPI_Impl.cpp
View File

@ -234,10 +234,10 @@ ICustomBody* API_Impl::AddTriangleMesh(const std::wstring fileName, ::Oyster::Ma
typedef std::codecvt_utf8<wchar_t> convert_typeX; typedef std::codecvt_utf8<wchar_t> convert_typeX;
std::wstring_convert<convert_typeX, wchar_t> converterX; std::wstring_convert<convert_typeX, wchar_t> converterX;
//std::string bulletPath = converterX.to_bytes(); std::string bulletPath = converterX.to_bytes(fileName);
// Add collision shape // Add collision shape
bulletFile.loadFile("C:\\DV1477\\Git Repository\\Danbias\\Bin\\Content\\Worlds\\cgf\\structure_corporation.bullet"); bulletFile.loadFile(bulletPath.c_str());
btCollisionShape* collisionShape = bulletFile.getCollisionShapeByIndex(0); btCollisionShape* collisionShape = bulletFile.getCollisionShapeByIndex(0);
body->SetCollisionShape(collisionShape); body->SetCollisionShape(collisionShape);