Changeset 3321

Timestamp:

01/28/10 11:13:07 (7 weeks ago)

Author:

Azaezel

Message:

no likey m_pActor, despite it being defined by the enclosing class...

Files:

• plugins/branches/0185_GEN_PHYSICS_REFACTOR_2/ZBullet/src/PhysicsActor.hpp (modified) (2 diffs)

plugins/branches/0185_GEN_PHYSICS_REFACTOR_2/ZBullet/src/PhysicsActor.hpp

@@ -188 +188 @@
 
     protected:
-        const ZBulletMaterial*                   m_pMaterial;
+        const ZBulletMaterial*                  m_pMaterial;
         Engine::Physics::I_PhysicsActor&        m_actor;
-        Engine::Physics::I_PhysicsActor&                m_otherActor;
+        Engine::Physics::I_PhysicsActor&        m_otherActor;
 
     };  // class CollisionEventData
@@ -263 +263 @@
         }
 
+        //from conversations, the later intended usage of this will be to temporarily set a given restitution just during collisions
         virtual void setContactRestitution(Math::Real _restitution)
         {
-            NewtonMaterialSetContactElasticity(m_pMaterial, _restitution);
+            /*
+            remove after we unbreak intellisense for m_pActor
+            btRigidBody* temp;
+            temp->setRestitution(_restitution);
+            */
+            m_pActor->setRestitution(_restitution);
+        }
+
+        virtual void resetContactRestitution()
+        {
+            //for clearing modifications made to actor restitutions at collision-time
+            //mebbey we should auto-run this after the callbacks fired?
+            m_pActor->setRestitution(getActor().getMaterial()->getRestitution());
         }