Changeset 44

Timestamp:

01/02/10 20:38:11 (2 years ago)

Author:

nktug

Message:

Cross-plateforme compiling in Linux and Windows.

Location:

trunk

Files:

• SConstruct (modified) (2 diffs)
• include/freequest/GameBasicPhysicCallback.hh (modified) (2 diffs)
• include/freequest/objects/Avatar.hh (modified) (1 diff)
• include/freequest/objects/StaticObject.hh (modified) (3 diffs)
• src/GameAvatarManager.cc (modified) (1 diff)
• src/GameBasicPhysicCallback.cc (modified) (2 diffs)
• src/GamePhysicManager.cc (modified) (3 diffs)
• src/GamePlayerCallback.cc (modified) (2 diffs)
• src/MainGameState.cc (modified) (3 diffs)
• src/SConscript (modified) (3 diffs)
• src/objects/Avatar.cc (modified) (9 diffs)
• src/objects/StaticObject.cc (modified) (6 diffs)

trunk/SConstruct

@@ -186 +186 @@
 #
 # Do not display deprecated messsage
-env.Append(CXXFLAGS = ['-Wno-deprecated'])
+if sys.platform == 'linux2':
+  env.Append(CXXFLAGS = ['-Wno-deprecated'])
+  
 #------------------------------------
 # Platform
@@ -326 +328 @@
 # TODO : Checking OgreNewt cause several "undefined reference to" Newton.
 #for lib in ['Newton', lib_ogrenewt]:
-lib ='Newton'
+lib = 'Newton'
 if not conf.CheckLib(lib, language="C++"):
         print "Not found Newton library : %s..."%lib

trunk/include/freequest/GameBasicPhysicCallback.hh

@@ -22 +22 @@
 #include <OgreNewt.h>
  
-//#include "freequest/GamePrerequisites.hh"
+#include "freequest/objects/Object.hh"
 
 namespace freequest
@@ -34 +34 @@
     private:
     };
- 
 }
 #endif   

trunk/include/freequest/objects/Avatar.hh

@@ -31 +31 @@
         {
     public:
-       Ogre::Vector3 pos;
+       Ogre::Vector3 mPos;
     
       // CREATORS

trunk/include/freequest/objects/StaticObject.hh

@@ -47 +47 @@
     void setMass(Ogre::Real mass);
     void setMaterialID(const OgreNewt::MaterialID* matID);
+    void addForce( const Ogre::Vector3& force );
     
     // ACCESSORS
@@ -55 +56 @@
     OgreNewt::Body* getBody( void ) const;
     
-    static void applyForceAndTorqueCallback( OgreNewt::Body* body );
+    void applyForceAndTorqueCallback( void );
     
     void update( void );
@@ -67 +68 @@
     PhyscicType mGeomType;
     Ogre::Vector3 mGravity;
-  
+    //The force to apply at the body
+    Ogre::Vector3 mForce;
         };
 

trunk/src/GameAvatarManager.cc

@@ -81 +81 @@
   LOG_INFO( Logger::getLogger("freequest.game"), " ==== creating object Avatar ====");
   
-  CPhysicManager::getInstance()->createPhysicBody(GEOM_ELLIPS, mPlayerAvatar);
+  CPhysicManager::getInstance()->createPhysicBody(GEOM_ELLIPS, mPlayerAvatar, 0.0001);
   mPlayerAvatar->getPhysicObject()->setMaterialID(CPhysicManager::getInstance()->getMaterialIDByName("player"));
   

trunk/src/GameBasicPhysicCallback.cc

@@ -22 +22 @@
 #include "freequest/log/Logger.hh"
 #include "freequest/GameBasicPhysicCallback.hh"
-#include "freequest/objects/Object.hh"
+
 
 using namespace freequest;
 using namespace freequest::log;
+
 
 //------------------------------------------------------------------------------------------------
@@ -74 +75 @@
 /*  
   obj0.reset(static_cast<CGameObject*>(m_body1->getUserData()));
-  // *obj = *((CGameObject*)m_body0->getUserData());
+  //*obj = *((CGameObject*)m_body0->getUserData());
   obj1.reset((CGameObject*)m_body0->getUserData());
 */

trunk/src/GamePhysicManager.cc

@@ -16 +16 @@
  */
 
+ 
 #ifdef HAVE_CONFIG_HH
 # include "config.h"
@@ -217 +218 @@
 {
   //LOG_INFO( Logger::getLogger("freequest.game"), "*** NEWTON PHYSIC CALLBACK");
-  ObjectPtr objet;
+  /*ObjectPtr objet;
   objet.reset((CGameObject*)body->getUserData());
   if (objet.use_count())
   {
-    //LOG_INFO( Logger::getLogger("freequest.game"), "*** NEWTON PHYSIC CALLBACK APPLY FORCE");
-    //objet->getPhysicObject()->applyForceAndTorqueCallback();
-  }
+    LOG_INFO( Logger::getLogger("freequest.game"), "*** NEWTON PHYSIC CALLBACK APPLY FORCE for " << objet->getObjectName());
+    objet->getPhysicObject()->applyForceAndTorqueCallback();
+  }*/
+  ((CGameObject*)body->getUserData())->getPhysicObject()->applyForceAndTorqueCallback();
 }
     
@@ -320 +322 @@
   obj->getPhysicObject()->createBody(mWorld, geomType, obj, col, mass, inertia);
   //obj->getPhysicObject()->setMaterialID(this->getMaterialIDByName("default"));
-  //obj->getPhysicObject()->getBody()->setCustomForceAndTorqueCallback(applyForceAndTorqueCallback);
+  //obj->getPhysicObject()->getBody()->removeForceAndTorqueCallback();
+  //obj->getPhysicObject()->getBody()->removeAutoactiveCallback();
+  obj->getPhysicObject()->getBody()->setCustomForceAndTorqueCallback(applyForceAndTorqueCallback);
  
   delete col; 

trunk/src/GamePlayerCallback.cc

@@ -16 +16 @@
  */
 
+ 
 #ifdef HAVE_CONFIG_HH
 # include "config.h"
@@ -39 +40 @@
   getContactPositionAndNormal(point, normal);
   
-  LOG_INFO( Logger::getLogger("freequest.game"), "====== PHYSIC CONTACT << USERPROCESS >> " << point.x << " - " << point.y << " - " << point.z <<  " =====");
+  //LOG_INFO( Logger::getLogger("freequest.game"), "====== PHYSIC CONTACT << USERPROCESS >> " << point.x << " - " << point.y << " - " << point.z <<  " =====");
+/*  
+  CGameObject* mObjet = 0;
+  
+  if (((CGameObject*)m_body0->getUserData())->getObjectType() == "PC")
+  {
+    mObjet = ((CGameObject*)m_body0->getUserData());
+  }
+  
+  if (((CGameObject*)m_body1->getUserData())->getObjectType() == "PC")
+  {
+    mObjet = ((CGameObject*)m_body1->getUserData());
+  }
+  
+  
+  // determine if this contact is with the floor.
+  // Meaning the contact normal has an angle to UNIT_Y of 20 or less.
+  Ogre::Degree angle = Ogre::Math::ACos(normal.dotProduct(Ogre::Vector3::UNIT_Y));
+
+  Ogre::Vector3 charPos;
+  Ogre::Quaternion charOri;
+  mObjet->getPhysicObject()->getBody()->getPositionOrientation(charPos, charOri);
+  bool isFloorCollision(false);
+
+  Ogre::AxisAlignedBox CharAab = mObjet->getPhysicObject()->getBody()->getCollision()->getAABB();
+  Ogre::Real charHeight = CharAab.getMaximum().y - CharAab.getMinimum().y;
+  Ogre::Real stepHeight = point.y - charPos.y;
+
+  if( stepHeight < charHeight/2 )
+  {
+    isFloorCollision = true;
+  }
+
+  if( stepHeight < 0.4 )
+  {
+      if(stepHeight > 0.01f)
+      {
+          //rotateTangentDirections(charOri + Ogre::Vector3::UNIT_Y);
+          setContactTangentAcceleration(5,0);
+          setContactFrictionState(1,0);
+          setContactFrictionState(1,1);
+      }
+      else
+      {
+          setContactFrictionState(1,0);
+          setContactFrictionState(1,1);
+      }
+  }
+  else
+  {
+      Ogre::Vector3 vel;
+      vel = mObjet->getPhysicObject()->getVelocity();
+      if( vel.y >= 0 )
+      {
+          setContactFrictionState(1,0);
+          setContactFrictionState(1,1);    
+      }
+      else
+      {
+          setContactFrictionState(0,0);
+          setContactFrictionState(0,1);
+      }
+  }  
+ 
+  setContactSoftness(0.8f);
+  setContactElasticity(0.0f);
+  */
   return 1;
 }

trunk/src/MainGameState.cc

@@ -236 +236 @@
   floornode->showBoundingBox(true);
   */
-  
+/*  
   // CYLINDER test
   ObjectPtr cylindObj = CObjectFactory::getInstance()->createObject("BLD");
@@ -248 +248 @@
   CObjectManager::getInstance()->addObject(cylindObj);
   LOG_INFO( Logger::getLogger("freequest.game"), " ==== creating object CYLINDER ====");
-
+  
+    // Create the physic body by the physicManager
+  CPhysicManager::getInstance()->createPhysicBody(GEOM_CYLINDER, cylindObj, 200.0);
+  cylindObj->getPhysicObject()->setMaterialID(CPhysicManager::getInstance()->getMaterialIDByName("default"));
+*/ 
   // CUBE test
   ObjectPtr cubObj = CObjectFactory::getInstance()->createObject("BLD");
@@ -262 +266 @@
   
   // Create the physic body by the physicManager
-  CPhysicManager::getInstance()->createPhysicBody(GEOM_CYLINDER, cylindObj, 200.0);
   CPhysicManager::getInstance()->createPhysicBody(GEOM_BOX, cubObj, 200.0);
-  cylindObj->getPhysicObject()->setMaterialID(CPhysicManager::getInstance()->getMaterialIDByName("default"));
   cubObj->getPhysicObject()->setMaterialID(CPhysicManager::getInstance()->getMaterialIDByName("default"));
-  
+
         LOG_INFO( Logger::getLogger("freequest.game"), "MAINGameState end enter()");
   

trunk/src/SConscript

@@ -39 +39 @@
         'objects/AnimeObject.cc',
         'objects/Object.cc',
+  'GameVideoManager.cc',
   'GameAvatarManager.cc',
   'GameResource.cc',
@@ -69 +70 @@
         'GameEngine.cc',
         'freequest.cc'
-]
-#  'GameVideoManager.cc',  
+]  
 
 #
@@ -85 +85 @@
 #
 if sys.platform == 'win32':
-  bin_game_env.AppendUnique(LIBS=["libDFLog", "freequest_main", "Plugin_TheoraVideoSystem"])
+  bin_game_env.AppendUnique(LIBS=["libDFLog", "freequest_main", "OgreNewt_Main", "Plugin_TheoraVideoSystem"])
 else:
   bin_game_env.AppendUnique(LIBS=["libDFLog", "freequest_main", "OgreNewt"])

trunk/src/objects/Avatar.cc

@@ -30 +30 @@
 using namespace freequest;
 
-
 //------------------------------------------------------------------------------------------------
 CAvatar::CAvatar( void )
@@ -38 +37 @@
   setObjectType("PC");
   
-  pos = Ogre::Vector3::ZERO;
+  mPos = Ogre::Vector3::ZERO;
 }
 
@@ -75 +74 @@
   }
 
-  mObjectNode->translate( pos, Ogre::Node::TS_LOCAL );
+  mObjectNode->translate( mPos, Ogre::Node::TS_LOCAL );
   
   mPhysicObj->update();
@@ -86 +85 @@
         mAnimation->setAnimLoop(true);
 
-  pos.z -= mStats->getMoveSpeed();  
+  mPos.z -= mStats->getMoveSpeed(); 
+  mPhysicObj->addForce(mPos);
 }
 
@@ -95 +95 @@
         mAnimation->setAnimLoop(true);
 
-  pos.z += mStats->getMoveSpeed();
+  mPos.z += mStats->getMoveSpeed();
+  mPhysicObj->addForce(mPos);
 }
 
@@ -104 +105 @@
         mAnimation->setAnimLoop(true);
 
-  pos.x = -mStats->getMoveSpeed();
+  mPos.x = -mStats->getMoveSpeed();
+  mPhysicObj->addForce(mPos);
 }
 
@@ -113 +115 @@
         mAnimation->setAnimLoop(true);
 
-  pos.x = mStats->getMoveSpeed();
+  mPos.x = mStats->getMoveSpeed();
+  mPhysicObj->addForce(mPos);
 }
 
@@ -129 +132 @@
   this->setQuickAnimationChange("wait");
   mAnimation->setAnimLoop(false);
-  pos = Ogre::Vector3::ZERO;
+  mPos = Ogre::Vector3::ZERO;
+  mPhysicObj->addForce(mPos);
 }
 
@@ -137 +141 @@
   this->setQuickAnimationChange("arme_shield_attack");
   mAnimation->setAnimLoop(false);
-  pos = Ogre::Vector3::ZERO;
+  mPos = Ogre::Vector3::ZERO;
 }
 

trunk/src/objects/StaticObject.cc

@@ -20 +20 @@
 #endif
 
-
 // Includes
 #include "freequest/log/Logger.hh"
@@ -36 +35 @@
   mGeomType = GEOM_NONE;
   mGravity = Ogre::Vector3::ZERO;
+  mForce = Ogre::Vector3::ZERO;
   LOG_INFO( Logger::getLogger("freequest.game"), " xxxx constructor ~CStaticObject xxxx" );
 }
@@ -48 +48 @@
 
 //------------------------------------------------------------------------------------------------
-void CStaticObject::applyForceAndTorqueCallback( OgreNewt::Body* body )
-{
-  Ogre::Real mass;
+void CStaticObject::applyForceAndTorqueCallback( void )
+{
+  /*Ogre::Real mass;
   Ogre::Vector3 inertia;
-  body->getMassMatrix(mass, inertia);
+  mBody->getMassMatrix(mass, inertia);*/
   Ogre::Vector3 force(0,-10,0);
-  force *= mass;
-  //LOG_INFO( Logger::getLogger("freequest.game"), " AAAAAAAAAAAADDDDDDDDDDDDD FFFOOOOORRRRCCCCEEE " << force.x << "--" << force.y << "--" << force.z << " MASS " << mass );
-  body->addForce(force);
+  force *= mMass;
+  force += mForce;
+  mBody->addForce( force );
+  LOG_INFO( Logger::getLogger("freequest.game"), " AAAAAAAAAAAADDDDDDDDDDDDD FFFOOOOORRRRCCCCEEE " << mForce.x << "--" << mForce.y << "--" << mForce.z << " for " << ((CGameObject*)mBody->getUserData())->getObjectName());
+  mForce = Ogre::Vector3::ZERO;
 }
     
@@ -68 +70 @@
   mBody = new OgreNewt::Body( world, col, geomType);
   mBody->attachToNode( actor->getSceneNode() );
-  mBody->setMassMatrix( mass, inertia );
+  mBody->setMassMatrix( mMass, inertia );
   mBody->setStandardForceCallback();
   mBody->setUserData(mActor.get());
   
-  mBody->setCustomForceAndTorqueCallback(applyForceAndTorqueCallback);
+  //mBody->setCustomForceAndTorqueCallback(applyForceAndTorqueCallback);
   //mBody->setCustomForceAndTorqueCallback<CPhysicManager>(&freequest::CPhysicManager::doForceCallback, CPhysicManager::getInstance().get());
   //mBody->setCustomForceAndTorqueCallback(&freequest::CPhysicManager::doForceCallback);
@@ -160 +162 @@
 }
 
+void CStaticObject::addForce(const Ogre::Vector3& force)
+{
+    mBody->unFreeze();
+    mForce += force;
+}
+
+//------------------------------------------------------------------------------------------------
 //------------------------------------------------------------------------------------------------
 void CStaticObject::update( void )
@@ -165 +174 @@
   if (mBody && mActor.use_count())
   {
-    mBody->setPositionOrientation(
-    mActor->getSceneNode()->_getDerivedPosition(),
-    mActor->getSceneNode()->_getDerivedOrientation());
-    //mActor->update(0);
+    mBody->setPositionOrientation( mActor->getSceneNode()->_getDerivedPosition(), mActor->getSceneNode()->_getDerivedOrientation());
     //LOG_INFO( Logger::getLogger("freequest.game"), "*** PHYSIC UPDATE ****");
   }