Changeset 2578 for code/branches

Timestamp:

Jan 7, 2009, 6:09:08 PM (16 years ago)

Author:

rgrieder

Message:

Removed an obsolete check and added a source file (Fusion) to the msvc project.

Location:

code/branches/presentation

Files:

• src/orxonox/objects/worldentities/WorldEntity.cc (modified) (2 diffs)
• src/orxonox/objects/worldentities/WorldEntity.h (modified) (1 diff)
• visual_studio/vc8/orxonox.vcproj (modified) (2 diffs)

code/branches/presentation/src/orxonox/objects/worldentities/WorldEntity.cc

@@ -767 +767 @@
             return;
         }
-
-        // Only sets this->collisionType_
-        // However the assertion is to ensure that the internal bullet setting is right
-        updateCollisionType();
-        assert(this->collisionType_ == type);
+        this->collisionType_ = type;
+        this->collisionTypeSynchronised_ = type;
 
         // update mass and inertia tensor
@@ -817 +814 @@
                 return "";
         }
-    }
-
-    void WorldEntity::updateCollisionType()
-    {
-        if (!this->physicalBody_)
-            this->collisionType_ = None;
-        else if (this->physicalBody_->isKinematicObject())
-            this->collisionType_ = Kinematic;
-        else if (this->physicalBody_->isStaticObject())
-            this->collisionType_ = Static;
-        else
-            this->collisionType_ = Dynamic;
-        this->collisionTypeSynchronised_ = this->collisionType_;
     }
 

code/branches/presentation/src/orxonox/objects/worldentities/WorldEntity.h

@@ -369 +369 @@
 
         private:
-            void updateCollisionType();
             void recalculateMassProps();
             void internalSetPhysicsProps();

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

@@ -457 +457 @@
                                                 >
                                                 <File
+                                                        RelativePath="..\..\src\orxonox\objects\weaponSystem\weapons\Fusion.cc"
+                                                        >
+                                                </File>
+                                                <File
                                                         RelativePath="..\..\src\orxonox\objects\weaponSystem\weapons\LaserGun.cc"
                                                         >
@@ -1241 +1245 @@
                                                 >
                                                 <File
+                                                        RelativePath="..\..\src\orxonox\objects\weaponSystem\weapons\Fusion.h"
+                                                        >
+                                                </File>
+                                                <File
                                                         RelativePath="..\..\src\orxonox\objects\weaponSystem\weapons\LaserGun.h"
                                                         >