faerbit/Saxum
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases 2 Wiki Activity

small changes to trimesh scaling

Browse Source
This commit is contained in:
Jasper 2015-01-19 15:33:44 +01:00
parent 9b52b9badc
commit cb6fdf19a7
2 changed files with 1 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Levels/ObjectSetups/Level1.xml
View File

@ -13779,40 +13779,7 @@
<yRot>0.0</yRot>
<zRot>0.0</zRot>
<manualPos>false</manualPos>
<<<<<<< HEAD
<xPos>81.500000</xPos>
=======
<xPos>212.500000</xPos>
<yOffset>3.0</yOffset>
<zPos>-222.500000</zPos>
<idGreen>1</idGreen>
<idBlue>67</idBlue>
<typeID>40</typeID>
<trigger>
<name>-</name>
<xPosition>0</xPosition>
<yPosition>0</yPosition>
<zPosition>0</zPosition>
<targetIdGreen>-</targetIdGreen>
<targetIdBlue>-</targetIdBlue>
<distance>1.0</distance>
<isBiggerThan>false</isBiggerThan>
<objectNum>0</objectNum>
<luaScript>-</luaScript>
<toChangeIdGreen>0</toChangeIdGreen>
<toChangeIdBlue>0</toChangeIdBlue>
<toChangeObjNum>0</toChangeObjNum>
</trigger>
</composition>
<composition>
<scale>1.0</scale>
<xRot>0.0</xRot>
<yRot>0.0</yRot>
<zRot>0.0</zRot>
<manualPos>false</manualPos>
<xPos>210.500000</xPos>
>>>>>>> 12ee9a4ac5b8c3350e8afc3b6b251992020790e2
<yOffset>0.0</yOffset>
<zPos>-244.500000</zPos>
<idGreen>1</idGreen>

2
physics.cc
View File

@ -212,7 +212,7 @@ void Physics::addTriangleMeshBody(Entity entity, std::string path, float mass, f
}
btBvhTriangleMeshShape* shape = new btBvhTriangleMeshShape(triMesh,true);
shape->setLocalScaling(btVector3(0.5f,0.5f,0.5f));
shape->setLocalScaling(btVector3(1.5,1.5,1.5));
btDefaultMotionState* motion = new btDefaultMotionState(btTransform(btQuaternion(0,0,0,1),btVector3(entity.getPosition().x,entity.getPosition().y,entity.getPosition().z)));
btVector3 inertia(0,0,0);