Changeset 2303 for code/branches/physics/visual_studio

Timestamp:

Dec 1, 2008, 11:09:43 PM (16 years ago)

Author:

rgrieder

Message:

• Added support for attaching physical WorldEntities to each other. Currently you can only add static objects to kinematic/dynamic/static other objects. Future plans involve attaching kinematic objects to static/kinematic ones. All other combinations don't make sense at all.
• Added CollisionShape, SphereCollisionShape and CompoundCollisionShape

Usage for collision shapes (example):

<LinearEntity collisionType="kinematic">

<attached>

<Model position="0,0,0" scale=10 mesh="ast1.mesh" />
<StaticEntity position="0,10,0" collisionType="static"> # Everything else than "static" fails!

<collisionShapes>

<SphereCollisionShape radius=40 position="10,10,-10"/>
<CompoundCollisionShape position="4,4,4"> # You can also make compound shapes directly

<SphereCollisionShape radius=10/>

</CompoundCollisionShape>

</collisionShapes>

</StaticEntity>

</attached>

</LinearEntity>

File:

• code/branches/physics/visual_studio/vc8/orxonox.vcproj (modified) (3 diffs)

code/branches/physics/visual_studio/vc8/orxonox.vcproj

@@ -348 +348 @@
                                                 </File>
                                         </Filter>
+                                        <Filter
+                                                Name="collisionShapes"
+                                                >
+                                                <File
+                                                        RelativePath="..\..\src\orxonox\objects\worldentities\collisionShapes\CollisionShape.cc"
+                                                        >
+                                                </File>
+                                                <File
+                                                        RelativePath="..\..\src\orxonox\objects\worldentities\collisionShapes\CompoundCollisionShape.cc"
+                                                        >
+                                                </File>
+                                                <File
+                                                        RelativePath="..\..\src\orxonox\objects\worldentities\collisionShapes\SphereCollisionShape.cc"
+                                                        >
+                                                </File>
+                                        </Filter>
                                 </Filter>
                                 <Filter
@@ -1252 +1268 @@
                                                 </File>
                                         </Filter>
+                                        <Filter
+                                                Name="collisionShapes"
+                                                >
+                                                <File
+                                                        RelativePath="..\..\src\orxonox\objects\worldentities\collisionShapes\CollisionShape.h"
+                                                        >
+                                                </File>
+                                                <File
+                                                        RelativePath="..\..\src\orxonox\objects\worldentities\collisionShapes\CompoundCollisionShape.h"
+                                                        >
+                                                </File>
+                                                <File
+                                                        RelativePath="..\..\src\orxonox\objects\worldentities\collisionShapes\SphereCollisionShape.h"
+                                                        >
+                                                </File>
+                                        </Filter>
                                 </Filter>
                                 <Filter
@@ -1419 +1451 @@
                                 <File
                                         RelativePath="..\..\src\orxonox\tools\BillboardSet.h"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\..\src\orxonox\tools\BulletConversions.h"
                                         >
                                 </File>