Changeset 2565 for code/branches/presentation/src

Timestamp:

Jan 4, 2009, 4:32:33 PM (16 years ago)

Author:

rgrieder

Message:

Added XML parameter "collisionResponse" in WE for Oli

Location:

code/branches/presentation/src/orxonox/objects/worldentities

Files:

• WorldEntity.cc (modified) (6 diffs)
• WorldEntity.h (modified) (3 diffs)

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

@@ -91 +91 @@
         this->friction_       = 0.5;
         this->bCollisionCallbackActive_ = false;
+        this->bCollisionResponseActive_ = true;
 
         this->registerVariables();
@@ -139 +140 @@
 
         // Physics
-        XMLPortParam(WorldEntity, "collisionType",  setCollisionTypeStr, getCollisionTypeStr, xmlelement, mode);
-        XMLPortParam(WorldEntity, "mass",           setMass,             getMass,             xmlelement, mode);
-        XMLPortParam(WorldEntity, "restitution",    setRestitution,      getRestitution,      xmlelement, mode);
-        XMLPortParam(WorldEntity, "angularFactor",  setAngularFactor,    getAngularFactor,    xmlelement, mode);
-        XMLPortParam(WorldEntity, "linearDamping",  setLinearDamping,    getLinearDamping,    xmlelement, mode);
-        XMLPortParam(WorldEntity, "angularDamping", setAngularDamping,   getAngularDamping,   xmlelement, mode);
-        XMLPortParam(WorldEntity, "friction",       setFriction,         getFriction,         xmlelement, mode);
+        XMLPortParam(WorldEntity, "collisionType",     setCollisionTypeStr,  getCollisionTypeStr,  xmlelement, mode);
+        XMLPortParam(WorldEntity, "collisionResponse", setCollisionResponse, hasCollisionResponse, xmlelement, mode);
+        XMLPortParam(WorldEntity, "mass",              setMass,              getMass,              xmlelement, mode);
+        XMLPortParam(WorldEntity, "restitution",       setRestitution,       getRestitution,       xmlelement, mode);
+        XMLPortParam(WorldEntity, "angularFactor",     setAngularFactor,     getAngularFactor,     xmlelement, mode);
+        XMLPortParam(WorldEntity, "linearDamping",     setLinearDamping,     getLinearDamping,     xmlelement, mode);
+        XMLPortParam(WorldEntity, "angularDamping",    setAngularDamping,    getAngularDamping,    xmlelement, mode);
+        XMLPortParam(WorldEntity, "friction",          setFriction,          getFriction,          xmlelement, mode);
 
         // Other attached WorldEntities
@@ -171 +173 @@
         registerVariable(this->bCollisionCallbackActive_,
                                                 variableDirection::toclient, new NetworkCallback<WorldEntity>(this, &WorldEntity::collisionCallbackActivityChanged));
+        registerVariable(this->bCollisionResponseActive_,
+                                                variableDirection::toclient, new NetworkCallback<WorldEntity>(this, &WorldEntity::collisionResponseActivityChanged));
         registerVariable((int&)this->collisionTypeSynchronised_,
                                                 variableDirection::toclient, new NetworkCallback<WorldEntity>(this, &WorldEntity::collisionTypeChanged));
@@ -253 +257 @@
     }
 
-    //! Function is called to set the right flags in Bullet (if there is physics at all)
+    //! Function sets whether Bullet should issue a callback on collisions
     void WorldEntity::collisionCallbackActivityChanged()
     {
         if (this->hasPhysics())
         {
-            if (bCollisionCallbackActive_)
+            if (this->bCollisionCallbackActive_)
                 this->physicalBody_->setCollisionFlags(this->physicalBody_->getCollisionFlags() |
                     btCollisionObject::CF_CUSTOM_MATERIAL_CALLBACK);
@@ -264 +268 @@
                 this->physicalBody_->setCollisionFlags(this->physicalBody_->getCollisionFlags() &
                     ~btCollisionObject::CF_CUSTOM_MATERIAL_CALLBACK);
+        }
+    }
+
+    //! Function sets whether Bullet should react itself to a collision
+    void WorldEntity::collisionResponseActivityChanged()
+    {
+        if (this->hasPhysics())
+        {
+            if (this->bCollisionResponseActive_)
+                this->physicalBody_->setCollisionFlags(this->physicalBody_->getCollisionFlags() &
+                    ~btCollisionObject::CF_NO_CONTACT_RESPONSE);
+            else
+                this->physicalBody_->setCollisionFlags(this->physicalBody_->getCollisionFlags() |
+                    btCollisionObject::CF_NO_CONTACT_RESPONSE);
         }
     }
@@ -759 +777 @@
         internalSetPhysicsProps();
         collisionCallbackActivityChanged();
+        collisionResponseActivityChanged();
         if (bReactivatePhysics)
             activatePhysics();

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

@@ -343 +343 @@
             inline void disableCollisionCallback()
                 { this->bCollisionCallbackActive_ = false; this->collisionCallbackActivityChanged(); }
-            //! Tells whether there could be a collision response via collidesAgainst(.)
+            //! Tells whether there could be a collision callback via collidesAgainst(.)
             inline bool isCollisionCallbackActive() const
                 { return this->bCollisionCallbackActive_; }
+
+            //! Enables or disables collision response (default is of course on)
+            inline void setCollisionResponse(bool value)
+                { this->bCollisionResponseActive_ = value; this->collisionResponseActivityChanged(); }
+            //! Tells whether there could be a collision response
+            inline bool hasCollisionResponse()
+                { return this->bCollisionResponseActive_; }
 
         protected:
@@ -373 +380 @@
             void physicsActivityChanged();
             void collisionCallbackActivityChanged();
+            void collisionResponseActivityChanged();
             //! Network callback workaround to call a function when the value changes.
             inline void massChanged()
@@ -408 +416 @@
             btScalar                     childrenMass_;                  //!< Sum of all the children's masses
             bool                         bCollisionCallbackActive_;      //!< @see enableCollisionCallback
+            bool                         bCollisionResponseActive_;      //!< Tells whether the object should respond to collisions
     };