Changeset 6

Timestamp:

01/08/09 00:19:15 (3 years ago)

Author:

nktug

Message:

Now it is possible to add object with animation and move it
Prepare object list to handle Building, monster and NPJ

Location:

trunk

Files:

• config/objects.txt (modified) (1 diff)
• src/LevelEditor.cc (modified) (5 diffs)
• src/LevelEditor.hh (modified) (2 diffs)
• src/dreamforge/objects/Avatar.cc (modified) (6 diffs)

trunk/config/objects.txt

@@ -1 +1 @@
 Batiments               
     Empire              
-        TudorHouse      tudorhouse.mesh         Ogre3D house use for test
+        TudorHouse      tudorhouse.mesh         BLD     Ogre3D house mesh use for test
 Faune                   
     Imperial            
-        OgreHead        ogrehead.mesh           Ogre3D mesh use for test
-        Ninja           ninja.mesh              Ogre3D mesh use for test
+        OgreHead        ogrehead.mesh           MSTR    Ogre3D head mesh use for test
+        Ninja           ninja.mesh              PJ      Ogre3D ninja mesh use for test

trunk/src/LevelEditor.cc

@@ -43 +43 @@
         angleY = 0.0; // when I upgraded to Qt4.2, they were left undefined.
         
-        //mCurentObject = 0; 
+  mName = "";
+  mFile = "";
+  mType = "";
         closestObject = 0;// Trace the curent selected object.
   mTempEnt = 0;
@@ -112 +114 @@
   //QListWidgetItem* item = mObjectList->currentItem();
   QModelIndex item = objProperties->objectView->currentIndex();
-  QModelIndex itemTmp = item.sibling( item.row(), item.column()+1);
+  QModelIndex item1 = item.sibling( item.row(), item.column()+1);
+  QModelIndex item2 = item.sibling( item.row(), item.column()+2);
    
-  if(!itemTmp.data().toString().isEmpty())
+  if(!item1.data().toString().isEmpty())
   {
     QString name = item.data().toString();
-    QString meshfile = itemTmp.data().toString();
+    QString meshfile = item1.data().toString();
+    QString type = item2.data().toString();
     
-    this->createTempObject(name.toStdString() , meshfile.toStdString());
+    this->createTempObject(name.toStdString() , meshfile.toStdString(), type.toStdString());
   }
 
@@ -365 +369 @@
 
 //------------------------------------------------------------------------------------------------ 
-void LevelEdWidget::createTempObject(std::string& name, std::string& file)
-{
+void LevelEdWidget::createTempObject(std::string& name, std::string& file, std::string& type)
+{
+  mName = name;
+  mFile = file;
+  mType = type;
+  
   this->changeInsertionMode(true);
   
@@ -616 +624 @@
     {
       // Next time handle multi insertion object
+      ObjectPtr iObj = CObjectFactory::getInstance()->createObject(mType);
+      iObj->setObjectName(mName);
+      iObj->setObjectMeshFile(mFile);
+      iObj->initNodeObject();
+
+      Ogre::Ray mouseRay = mCamera->getCameraToViewportRay((double)evt->pos().x()/(double)width(), (double)evt->pos().y()/(double)height());
+      Ogre::RaySceneQuery* mRaySceneQuery = mSceneMgr->createRayQuery(Ogre::Ray());;
+      mRaySceneQuery->setRay(mouseRay);
+      //mRaySceneQuery->setSortByDistance(true);
+      Ogre::RaySceneQueryResult &result = mRaySceneQuery->execute();
+      Ogre::RaySceneQueryResult::iterator itr = result.begin();
+
+      if (itr != result.end() && itr->worldFragment)
+      { 
+        iObj->getSceneNode()->setPosition(itr->worldFragment->singleIntersection.x, itr->worldFragment->singleIntersection.y + 5, itr->worldFragment->singleIntersection.z);
+      }    
+      iObj->getSceneNode()->showBoundingBox(false);
+      iObj->init();
+      
+      CObjectManager::getInstance()->addObject(iObj);      
     }
         } // end LeftButton clic
@@ -640 +668 @@
   if(mouseLeftPressed && mInsertMode)
   {
-    
+
   }
   

trunk/src/LevelEditor.hh

@@ -29 +29 @@
         ~LevelEdWidget();
   
-  void createTempObject(std::string& name, std::string& file);
+  void createTempObject(std::string& name, std::string& file, std::string& type);
   void changeInsertionMode(bool val);
   
@@ -95 +95 @@
         //float rotX, rotY;
         ///////////////////////
+  std::string mName;
+  std::string mFile;
+  std::string mType;
         
         bool mouseLeftPressed;

trunk/src/dreamforge/objects/Avatar.cc

@@ -35 +35 @@
         : mIsDead(false)//,CGameObject()
 {
-  
+  mAnimation = 0;
 }
 
@@ -41 +41 @@
 CAvatar::~CAvatar()
 {
-        delete mAnimation;
-        mAnimation = 0;
+  if(mAnimation)
+  {
+    delete mAnimation;
+    mAnimation = 0;
+  }
 }
 
@@ -48 +51 @@
 void CAvatar::init( void )
 { 
-        mAnimation = new AnimatedObject;
-        
-        // getAnimationState("Idle1")
-        mAnimation->setInitAnimState(CGameObject::getEntity()->getAnimationState("Idle1"));
-        mAnimation->setAnimLoop(true);
+  if(mEntity->hasSkeleton())
+  {
+    mAnimation = new AnimatedObject;
+
+    //Temporatry choose an animation in the list
+    Ogre::AnimationStateIterator animIter = mEntity->getAllAnimationStates()->getAnimationStateIterator();
+    
+    // getAnimationState("Idle1")
+    mAnimation->setInitAnimState(mEntity->getAnimationState(animIter.getNext()->getAnimationName()));
+    mAnimation->setAnimLoop(true);
+  }
 
 /*      
@@ -78 +87 @@
 void CAvatar::update(float timeT)
 {
-        mAnimation->update(timeT);
+  if(mAnimation)
+  {
+    mAnimation->update(timeT);
+  }
 }
 
@@ -189 +201 @@
 void CAvatar::move(Ogre::Vector3 tempVector)
 {
-        mAnimation->changeAnimState(CGameObject::getEntity()->getAnimationState("Walk"));
-        mAnimation->setAnimLoop(true);
-        ////StaticObject::translateObject(0,0,-mMoveSpeed);
-        //StaticObject::translateObject(tempVector);
+  if(mAnimation)
+  {
+    mAnimation->changeAnimState(CGameObject::getEntity()->getAnimationState("Walk"));
+    mAnimation->setAnimLoop(true);
+    ////StaticObject::translateObject(0,0,-mMoveSpeed);
+    //StaticObject::translateObject(tempVector);
+  }
 }
 
@@ -198 +213 @@
 void CAvatar::turn(Ogre::Degree &angle)
 {
-        mAnimation->changeAnimState(CGameObject::getEntity()->getAnimationState("Walk"));
-        mAnimation->setAnimLoop(true);
-        ////StaticObject::translateObject(0,0,+mMoveSpeed);
-        //StaticObject::turnObject(angle);
-}
-
-
+  if(mAnimation)
+  {
+    mAnimation->changeAnimState(CGameObject::getEntity()->getAnimationState("Walk"));
+    mAnimation->setAnimLoop(true);
+    ////StaticObject::translateObject(0,0,+mMoveSpeed);
+    //StaticObject::turnObject(angle);
+  }
+}
+
+