Delta3D Open Source Engine

Revision: 2631
          http://svn.sourceforge.net/delta3d/?rev=2631&view=rev
Author:   banderegg
Date:     2006-09-08 17:50:32 -0700 (Fri, 08 Sep 2006)

Log Message:
-----------
+changed to using a collision capsule

Modified Paths:
--------------
    trunk/delta3d/src/dtCore/collisionmotionmodel.cpp

Modified: trunk/delta3d/src/dtCore/collisionmotionmodel.cpp
===================================================================
--- trunk/delta3d/src/dtCore/collisionmotionmodel.cpp	2006-09-08 22:02:39 UTC (rev 2630)
+++ trunk/delta3d/src/dtCore/collisionmotionmodel.cpp	2006-09-09 00:50:32 UTC (rev 2631)
@@ -523,7 +523,7 @@
 {
    pId = dCreateGeomTransform(0);
 
-   dGeomTransformSetGeom(pId, dCreateBox(0, pLengths[0], pLengths[1], pLengths[2]));
+   dGeomTransformSetGeom(pId, dCreateCapsule(0, pLengths[1], pLengths[2]));
 
    dSpaceAdd(pSpaceId, pId);
    dGeomSetData(pId, this );
@@ -583,16 +583,19 @@
       {   
          osg::Vec3 result = translation;
 
-         //std::cout << std::endl << std::endl;
+         std::cout << "Start: " << result << std::endl;
+
          for(unsigned i = 0; i < mNumNormals; ++i)
          {
-            //std::cout << "Collision: " << " " << mNormals[i][0] << " " << mNormals[i][1] << " " << mNormals[i][2] << std::endl;
+            std::cout << "Collision: " << " " << mNormals[i][0] << " " << mNormals[i][1] << " " << mNormals[i][2] << std::endl;
 
             float dot = (mNormals[i] * result); 
             if(dot < 0.0f) result -= osg::Vec3(mNormals[i][0] * dot, mNormals[i][1] * dot, mNormals[i][2] * dot);
-            //std::cout << "Result: " << result << std::endl;
+            std::cout << "Result: " << result << std::endl;
          }
 
+         std::cout << std::endl << std::endl;
+
          newXYZ = xyz + result;
 
          if(CollideTorso(newXYZ)) newXYZ = xyz;          
@@ -886,9 +889,9 @@
       osg::Vec3 side1(v1[0], v1[1], v1[2]);
       osg::Vec3 side2(v3[0], v3[1], v3[2]);
 
-      //std::cout << "Vert 1 " << side1 << std::endl;
-      //std::cout << "Vert 2 " << middle << std::endl;
-      //std::cout << "Vert 3 " << side2 << std::endl;
+      std::cout << "Vert 1 " << side1 << std::endl;
+      std::cout << "Vert 2 " << middle << std::endl;
+      std::cout << "Vert 3 " << side2 << std::endl;
 
       side1 -= middle;
       side2 = middle - side2; 
@@ -897,7 +900,7 @@
       cmm->mNormals[i].normalize();
 
 
-      //std::cout << "Normal " << cmm->mNormals[i] << std::endl;
+      std::cout << "Normal " << cmm->mNormals[i] << std::endl;
 
    }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2632
          http://svn.sourceforge.net/delta3d/?rev=2632&view=rev
Author:   banderegg
Date:     2006-09-11 10:15:59 -0700 (Mon, 11 Sep 2006)

Log Message:
-----------


Modified Paths:
--------------
    trunk/delta3d/src/dtCore/collisionmotionmodel.cpp

Modified: trunk/delta3d/src/dtCore/collisionmotionmodel.cpp
===================================================================
--- trunk/delta3d/src/dtCore/collisionmotionmodel.cpp	2006-09-09 00:50:32 UTC (rev 2631)
+++ trunk/delta3d/src/dtCore/collisionmotionmodel.cpp	2006-09-11 17:15:59 UTC (rev 2632)
@@ -583,18 +583,18 @@
       {   
          osg::Vec3 result = translation;
 
-         std::cout << "Start: " << result << std::endl;
+         //std::cout << "Start: " << result << std::endl;
 
          for(unsigned i = 0; i < mNumNormals; ++i)
          {
-            std::cout << "Collision: " << " " << mNormals[i][0] << " " << mNormals[i][1] << " " << mNormals[i][2] << std::endl;
+            //std::cout << "Collision: " << " " << mNormals[i][0] << " " << mNormals[i][1] << " " << mNormals[i][2] << std::endl;
 
             float dot = (mNormals[i] * result); 
             if(dot < 0.0f) result -= osg::Vec3(mNormals[i][0] * dot, mNormals[i][1] * dot, mNormals[i][2] * dot);
-            std::cout << "Result: " << result << std::endl;
+            //std::cout << "Result: " << result << std::endl;
          }
 
-         std::cout << std::endl << std::endl;
+         //std::cout << std::endl << std::endl;
 
          newXYZ = xyz + result;
 
@@ -889,9 +889,9 @@
       osg::Vec3 side1(v1[0], v1[1], v1[2]);
       osg::Vec3 side2(v3[0], v3[1], v3[2]);
 
-      std::cout << "Vert 1 " << side1 << std::endl;
-      std::cout << "Vert 2 " << middle << std::endl;
-      std::cout << "Vert 3 " << side2 << std::endl;
+      //std::cout << "Vert 1 " << side1 << std::endl;
+      //std::cout << "Vert 2 " << middle << std::endl;
+      //std::cout << "Vert 3 " << side2 << std::endl;
 
       side1 -= middle;
       side2 = middle - side2; 
@@ -900,7 +900,7 @@
       cmm->mNormals[i].normalize();
 
 
-      std::cout << "Normal " << cmm->mNormals[i] << std::endl;
+      //std::cout << "Normal " << cmm->mNormals[i] << std::endl;
 
    }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2639
          http://svn.sourceforge.net/delta3d/?rev=2639&view=rev
Author:   banderegg
Date:     2006-09-19 10:45:23 -0700 (Tue, 19 Sep 2006)

Log Message:
-----------
+fixed velocity to not include dt

Modified Paths:
--------------
    trunk/delta3d/src/dtCore/collisionmotionmodel.cpp

Modified: trunk/delta3d/src/dtCore/collisionmotionmodel.cpp
===================================================================
--- trunk/delta3d/src/dtCore/collisionmotionmodel.cpp	2006-09-18 22:08:47 UTC (rev 2638)
+++ trunk/delta3d/src/dtCore/collisionmotionmodel.cpp	2006-09-19 17:45:23 UTC (rev 2639)
@@ -79,7 +79,7 @@
       mFreeFall(false),
       mFreeFallCounter(0), 
       mCurrentMode(FALLING),
-      mSlideThreshold(0.5f),
+      mSlideThreshold(0.65f),
       mSlideSpeed(3.0f),
       mJumpSpeed(5.0f),
       mTerminalVelocity(0.0f, 0.0f, -50.0f),
@@ -105,9 +105,9 @@
       mForwardBackwardListener(0),
       mLookLeftRightListener(0),
       mLookUpDownListener(0),
-      mMaximumWalkSpeed(300.0f),
+      mMaximumWalkSpeed(3.0f),
       mMaximumTurnSpeed(10000.0f),
-      mMaximumSidestepSpeed(300.0f),
+      mMaximumSidestepSpeed(3.0f),
       mHeightAboveTerrain(pHeight),
       mMouse(mouse),
       mKeyboard(keyboard),
@@ -543,8 +543,8 @@
 
       //calculate x/y delta
       osg::Vec3 translation;
-      translation[0] = mSidestepCtrl * mMaximumSidestepSpeed * deltaFrameTime;
-      translation[1] = mForwardBackCtrl * mMaximumWalkSpeed * deltaFrameTime;
+      translation[0] = mSidestepCtrl * mMaximumSidestepSpeed;
+      translation[1] = mForwardBackCtrl * mMaximumWalkSpeed;
 
       //transform our x/y delta by our new heading
       osg::Matrix mat;
@@ -564,8 +564,6 @@
          mJumped = false;
       }
 
-      
-
       switch(mCurrentMode)
       {
           case FALLING:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2641
          http://svn.sourceforge.net/delta3d/?rev=2641&view=rev
Author:   banderegg
Date:     2006-09-19 14:44:58 -0700 (Tue, 19 Sep 2006)

Log Message:
-----------
+removed debugging info

Modified Paths:
--------------
    trunk/delta3d/src/dtCore/collisionmotionmodel.cpp

Modified: trunk/delta3d/src/dtCore/collisionmotionmodel.cpp
===================================================================
--- trunk/delta3d/src/dtCore/collisionmotionmodel.cpp	2006-09-19 21:42:02 UTC (rev 2640)
+++ trunk/delta3d/src/dtCore/collisionmotionmodel.cpp	2006-09-19 21:44:58 UTC (rev 2641)
@@ -518,10 +518,8 @@
       IsEnabled() && 
       data->message == "preframe")
    {
+      const double deltaFrameTime = static_cast<const double*>(data->userData)[1];
 
-      static float lastDT = 0.0f;
-      const double deltaFrameTime = 1.0 / 200.0;//static_cast<const double*>(data->userData)[1];
-
       Transform transform;
       GetTarget()->GetTransform(transform);
 
@@ -640,8 +638,6 @@
 
       if(mMouse->GetButtonState(Mouse::LeftButton)) 
          mMouse->SetPosition(0.0f,0.0f);//keeps cursor at center of screen
-
-      lastDT = deltaFrameTime;
    }
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2724
          http://svn.sourceforge.net/delta3d/?rev=2724&view=rev
Author:   fretlessmayhem
Date:     2006-11-06 10:07:17 -0800 (Mon, 06 Nov 2006)

Log Message:
-----------
Slowed down the camera movement in the FPS mimic of the collision motion model to make it less jittery. 

Modified Paths:
--------------
    trunk/delta3d/src/dtCore/collisionmotionmodel.cpp

Modified: trunk/delta3d/src/dtCore/collisionmotionmodel.cpp
===================================================================
--- trunk/delta3d/src/dtCore/collisionmotionmodel.cpp	2006-11-06 17:17:15 UTC (rev 2723)
+++ trunk/delta3d/src/dtCore/collisionmotionmodel.cpp	2006-11-06 18:07:17 UTC (rev 2724)
@@ -451,9 +451,9 @@
       else
       {
          //calculate our new heading
-         newH -= mLookLeftRightCtrl * mMaximumTurnSpeed * deltaFrameTime;
+         newH -= mLookLeftRightCtrl * mMaximumTurnSpeed * (deltaFrameTime / 3);
          //calculate our new pitch
-         newP += mLookUpDownCtrl * mMaximumTurnSpeed * deltaFrameTime;
+         newP += mLookUpDownCtrl * mMaximumTurnSpeed * (deltaFrameTime / 3);
          dtUtil::Clamp(newP, -89.9f, 89.9f); //stay away from 90.0 as it causes funky gimbal lock
          mLookUpDownAxis->SetState(0.0f);//necessary to stop camera drifting down
       }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2807
          http://svn.sourceforge.net/delta3d/?rev=2807&view=rev
Author:   fretlessmayhem
Date:     2006-11-20 14:08:32 -0800 (Mon, 20 Nov 2006)

Log Message:
-----------
Fixed a mistake I made where turning on mouse button control of the motion model didn't work. 

Modified Paths:
--------------
    trunk/delta3d/src/dtCore/collisionmotionmodel.cpp

Modified: trunk/delta3d/src/dtCore/collisionmotionmodel.cpp
===================================================================
--- trunk/delta3d/src/dtCore/collisionmotionmodel.cpp	2006-11-20 15:40:15 UTC (rev 2806)
+++ trunk/delta3d/src/dtCore/collisionmotionmodel.cpp	2006-11-20 22:08:32 UTC (rev 2807)
@@ -440,14 +440,17 @@
       newH = hpr[0];
       newP = hpr[1];
 
-      if(mUseMouseButtons && mMouse->GetButtonState(Mouse::LeftButton)) 
+      if(mUseMouseButtons)
       {
-         //calculate our new heading
-         newH -= mLookLeftRightCtrl * mMaximumTurnSpeed * deltaFrameTime;
-         //calculate our new pitch
-         newP += mLookUpDownCtrl * mMaximumTurnSpeed * deltaFrameTime;
-         dtUtil::Clamp(newP, -89.9f, 89.9f); //stay away from 90.0 as it causes funky gimbal lock
-         mLookUpDownAxis->SetState(0.0f);//necessary to stop camera drifting down
+         if(mMouse->GetButtonState(Mouse::LeftButton)) 
+         {
+            //calculate our new heading
+            newH -= mLookLeftRightCtrl * mMaximumTurnSpeed * deltaFrameTime;
+            //calculate our new pitch
+            newP += mLookUpDownCtrl * mMaximumTurnSpeed * deltaFrameTime;
+            dtUtil::Clamp(newP, -89.9f, 89.9f); //stay away from 90.0 as it causes funky gimbal lock
+            mLookUpDownAxis->SetState(0.0f);//necessary to stop camera drifting down
+         }
       }
       else
       {
@@ -477,13 +480,19 @@
       newXYZ = mCollider.Update(xyz, translation, deltaFrameTime, mCanJump ? mKeyboard->GetKeyState(Producer::Key_space) : false);
 
       transform.SetTranslation(newXYZ);
-      if(mUseMouseButtons && mMouse->GetButtonState(Mouse::LeftButton)) 
-         transform.SetRotation(newH, newP, 0.0f);
+      if(mUseMouseButtons)
+      {
+         if(mMouse->GetButtonState(Mouse::LeftButton)) 
+            transform.SetRotation(newH, newP, 0.0f);
+      }
       else
+      {
          transform.SetRotation(newH, newP, 0.0f);
+      }   
+      
       GetTarget()->SetTransform(transform); 
 
-      if(mUseMouseButtons && mMouse->GetButtonState(Mouse::LeftButton)) 
+      if(mMouse->GetButtonState(Mouse::LeftButton)) 
          mMouse->SetPosition(0.0f,0.0f);//keeps cursor at center of screen
       else
          mMouse->SetPosition(0.0f,0.0f);//keeps cursor at center of screen


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2909
          http://svn.sourceforge.net/delta3d/?rev=2909&view=rev
Author:   fretlessmayhem
Date:     2006-12-06 07:43:08 -0800 (Wed, 06 Dec 2006)

Log Message:
-----------
Removed the empty initialization of a RefPtr since they are already initialized to NULL. 

Modified Paths:
--------------
    trunk/delta3d/src/dtCore/collisionmotionmodel.cpp

Modified: trunk/delta3d/src/dtCore/collisionmotionmodel.cpp
===================================================================
--- trunk/delta3d/src/dtCore/collisionmotionmodel.cpp	2006-12-06 15:21:07 UTC (rev 2908)
+++ trunk/delta3d/src/dtCore/collisionmotionmodel.cpp	2006-12-06 15:43:08 UTC (rev 2909)
@@ -63,7 +63,6 @@
 */
 CollisionMotionModel::CollisionMotionModel(float pHeight, float pRadius, float k, float theta, dtCore::Scene* pScene, Keyboard* keyboard, Mouse* mouse)
       : MotionModel("CollisionMotionModel")
-      , mDefaultInputDevice()
       , mLeftRightMouseMovement(NULL)
       , mUpDownMouseMovement(NULL)
       , mArrowKeysUpDownMapping(NULL)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3407
          http://svn.sourceforge.net/delta3d/?rev=3407&view=rev
Author:   banderegg
Date:     2007-05-23 08:28:06 -0700 (Wed, 23 May 2007)

Log Message:
-----------
+fixed a bug where the mouse was being locked into place unnecessarily 

Modified Paths:
--------------
    trunk/delta3d/src/dtCore/collisionmotionmodel.cpp

Modified: trunk/delta3d/src/dtCore/collisionmotionmodel.cpp
===================================================================
--- trunk/delta3d/src/dtCore/collisionmotionmodel.cpp	2007-05-23 15:26:51 UTC (rev 3406)
+++ trunk/delta3d/src/dtCore/collisionmotionmodel.cpp	2007-05-23 15:28:06 UTC (rev 3407)
@@ -495,10 +495,11 @@
       
       GetTarget()->SetTransform(transform); 
 
-      if(mMouse->GetButtonState(Mouse::LeftButton)) 
+      //if are requiring mouse buttons and the left mouse button is pressed OR we aren't requiring mouse buttons
+      if((mUseMouseButtons && mMouse->GetButtonState(Mouse::LeftButton)) || !mUseMouseButtons) 
+      {
          mMouse->SetPosition(0.0f,0.0f);//keeps cursor at center of screen
-      else
-         mMouse->SetPosition(0.0f,0.0f);//keeps cursor at center of screen
+      }
    }
 }
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3535
          http://svn.sourceforge.net/delta3d/?rev=3535&view=rev
Author:   banderegg
Date:     2007-06-28 11:11:03 -0700 (Thu, 28 Jun 2007)

Log Message:
-----------
+added fix to clamp the frame time unless we get any unusually large frame hiccups which will cause the motionmodel to fall through the terrain

Modified Paths:
--------------
    trunk/delta3d/src/dtCore/collisionmotionmodel.cpp

Modified: trunk/delta3d/src/dtCore/collisionmotionmodel.cpp
===================================================================
--- trunk/delta3d/src/dtCore/collisionmotionmodel.cpp	2007-06-28 18:05:13 UTC (rev 3534)
+++ trunk/delta3d/src/dtCore/collisionmotionmodel.cpp	2007-06-28 18:11:03 UTC (rev 3535)
@@ -427,8 +427,14 @@
       IsEnabled() && 
       data->message == "preframe")
    {
-      const double deltaFrameTime = static_cast<const double*>(data->userData)[1];
+      double deltaFrameTime = static_cast<double*>(data->userData)[1];
 
+      //clamp the frame time in case we get a frame hiccup
+      if(deltaFrameTime > 0.1f)
+      {
+         deltaFrameTime = 0.1f;
+      }
+
       Transform transform;
       GetTarget()->GetTransform(transform);
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.