Changeset 8

Timestamp:

01/11/09 01:00:01 (3 years ago)

Author:

nktug

Message:

Change load xml file name
Fixed some bug like reset the pointer gameloader

Location:

trunk

Files:

• include/dreamforge/GameLoadFile.hh (added)
• include/dreamforge/GameObjectManager.hh (modified) (1 diff)
• include/dreamforge/XmlParser.hh (deleted)
• src/LevelEditor.cc (modified) (14 diffs)
• src/LevelEditor.hh (modified) (2 diffs)
• src/Properties.cc (modified) (2 diffs)
• src/SConscript (modified) (1 diff)
• src/dreamforge/GameLoadFile.cc (added)
• src/dreamforge/GameObjectManager.cc (modified) (2 diffs)
• src/dreamforge/GameSaveFile.cc (modified) (1 diff)
• src/dreamforge/XmlParser.cc (deleted)

trunk/include/dreamforge/GameObjectManager.hh

@@ -54 +54 @@
                         // MANIPULATORS
                         void addObject(ObjectPtr obj);
-                        void deleteObject();
+      void deleteObject(ObjectPtr obj);
+      
                         void cleanAll(void);
                         void updateObject( float timeT );

trunk/src/LevelEditor.cc

@@ -14 +14 @@
 #include "dreamforge/GameObjectManager.hh"
 #include "dreamforge/GameSaveFile.hh"
-#include "dreamforge/XmlParser.hh"
+#include "dreamforge/GameLoadFile.hh"
 
 #if (OGRE_PLATFORM  == OGRE_PLATFORM_LINUX)
@@ -130 +130 @@
         CObjectManager::getInstance()->cleanAll();
   
-        boost::shared_ptr<XmlParser> gameLoader (new XmlParser());
+        boost::shared_ptr<CGameLoadFile> gameLoader (new CGameLoadFile());
   gameLoader->loadParser(loadfile); 
+  gameLoader.reset();
 }
 
@@ -247 +248 @@
         {
                         node->setPosition(node->getPosition().x, 
-                                        i->worldFragment->singleIntersection.y + 5, 
+                                        i->worldFragment->singleIntersection.y, 
                                         node->getPosition().z);
         }
@@ -270 +271 @@
         // Above the camera, facing down
         plane.normal = -Ogre::Vector3::UNIT_Y;
-/*
-        Ogre::Entity *ent = mSceneMgr->createEntity("head", "ogrehead.mesh");
-        // Add entity to the root scene node
-        Ogre::SceneNode* headNode = mSceneMgr->getRootSceneNode()->createChildSceneNode();
-        headNode->attachObject(ent);
-        headNode->yaw(Ogre::Degree(-180));
-        headNode->setPosition(500,600,600);
-        headNode->showBoundingBox(false);
- */
-  ObjectPtr tObj = CObjectFactory::getInstance()->createObject("NPC");
-  tObj->setObjectName("toto");
-  tObj->setObjectMeshFile("ninja.mesh");
-  tObj->initNodeObject();
-  tObj->getSceneNode()->yaw(Ogre::Degree(-180));
-  tObj->getSceneNode()->setPosition(500,600,600);
-  tObj->getSceneNode()->showBoundingBox(false);
-  tObj->init();
-  
-        clamToTerrain(tObj->getSceneNode());  
-  
-  CObjectManager::getInstance()->addObject(tObj);
         
 }
@@ -329 +309 @@
         mCamera = mSceneMgr->createCamera("PlayerCam 1");
 
-        mCamera->setPosition(Ogre::Vector3(1479,709,1389));
-        mCamera->lookAt(Ogre::Vector3(100,0,100));
+        mCamera->setPosition(Ogre::Vector3(17519,913,16033));
+        mCamera->lookAt(Ogre::Vector3(16073,0,16600));
         mCamera->setAutoAspectRatio(true);
         mCamera->setNearClipDistance(1);
@@ -432 +412 @@
 }
 
-
+//------------------------------------------------------------------------------------------------ 
+//                            UPDATE
 //------------------------------------------------------------------------------------------------ 
 void LevelEdWidget::update()
@@ -517 +498 @@
     }
   }
+  
+  if(evt->key() == Qt::Key_Delete)
+  {
+    if(mEditionMode && mCurentObject.use_count())
+    {
+      CObjectManager::getInstance()->deleteObject(mCurentObject);
+      mCurentObject.reset();
+    }
+  }
 }
 
@@ -537 +527 @@
   objProperties->nodeYVal->setValue ( mCurentObject->getSceneNode()->getPosition().y );
   objProperties->nodeZVal->setValue ( mCurentObject->getSceneNode()->getPosition().z );
-  
+  /*
   objProperties->snodeXVal->setValue ( mCurentObject->getSceneNode()->getScale().x );
   objProperties->snodeYVal->setValue ( mCurentObject->getSceneNode()->getScale().y );
   objProperties->snodeZVal->setValue ( mCurentObject->getSceneNode()->getScale().z );
-
+*/
 }
 
@@ -562 +552 @@
 
 //------------------------------------------------------------------------------------------------ 
-void LevelEdWidget::mouveObjectFromRay(QMouseEvent* evt, Ogre::SceneNode* node)
+void LevelEdWidget::moveObjectFromRay(QMouseEvent* evt, Ogre::SceneNode* node)
 {
   Ogre::Ray mouseRay = mCamera->getCameraToViewportRay((double)evt->pos().x()/(double)width(), (double)evt->pos().y()/(double)height());
@@ -573 +563 @@
   if (itr != result.end() && itr->worldFragment)
   { 
-    node->setPosition(itr->worldFragment->singleIntersection.x, itr->worldFragment->singleIntersection.y + 5, itr->worldFragment->singleIntersection.z);
+    node->setPosition(itr->worldFragment->singleIntersection.x, itr->worldFragment->singleIntersection.y, itr->worldFragment->singleIntersection.z);
   }   
 }
@@ -669 +659 @@
       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);
-      }*/
-      this->mouveObjectFromRay(evt, iObj->getSceneNode()); 
+      this->moveObjectFromRay(evt, iObj->getSceneNode()); 
     
       iObj->getSceneNode()->showBoundingBox(false);
@@ -755 +734 @@
     if (mouseLeftPressed && mCurentObject.use_count()) // If we have left click and we have an object selected
     {   
-      /*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)
-      {
-          mCurentObject->getSceneNode()->setPosition(itr->worldFragment->singleIntersection.x,itr->worldFragment->singleIntersection.y + 10, itr->worldFragment->singleIntersection.z);
-      }*/
-      this->mouveObjectFromRay(evt, mCurentObject->getSceneNode()); 
+      this->moveObjectFromRay(evt, mCurentObject->getSceneNode()); 
     }
   }
@@ -774 +740 @@
   if(mInsertMode)// && mTempObject)
   {
-    /*Ogre::Ray mRay = mCamera->getCameraToViewportRay((double)evt->pos().x()/(double)width(), (double)evt->pos().y()/(double)height());
-
-                Ogre::RaySceneQuery* mRayScQuery = mSceneMgr->createRayQuery(Ogre::Ray());;
-                mRayScQuery->setRay(mRay);
-                
-                //mRaySceneQuery->setSortByDistance(true);
-                Ogre::RaySceneQueryResult &reslt = mRayScQuery->execute();
-                Ogre::RaySceneQueryResult::iterator it = reslt.begin();
-
-                if (it != reslt.end() && it->worldFragment)
-                {
-                                mTempObject->setPosition(it->worldFragment->singleIntersection.x,it->worldFragment->singleIntersection.y + 10, it->worldFragment->singleIntersection.z);
-                }*/
-    this->mouveObjectFromRay(evt, mTempObject);
+    this->moveObjectFromRay(evt, mTempObject);
   }
         
@@ -795 +748 @@
 void LevelEdWidget::wheelEvent(QWheelEvent* evt)
 {
-        mDirection.z = -evt->delta()/2;
+        mDirection.z = -evt->delta();///2;
         update();
         mDirection.z = 0;

trunk/src/LevelEditor.hh

@@ -72 +72 @@
   void getSelectedObjectInfo(void);
   void resetSelectedObjectInfo(void);
-        void mouveObjectFromRay(QMouseEvent* evt, Ogre::SceneNode* node);
+        void moveObjectFromRay(QMouseEvent* evt, Ogre::SceneNode* node);
   
         void keyPressEvent(QKeyEvent* evt);
@@ -97 +97 @@
         QPoint mousePos;
         float angleX, angleY;
-        //float rotX, rotY;
+        float moveScale;
         ///////////////////////
   std::string mName;

trunk/src/Properties.cc

@@ -113 +113 @@
   snodeZVal = new QDoubleSpinBox;
 
-  snodeXVal->setSingleStep ( 0.1 );
+  snodeXVal->setSingleStep ( 10.0 );
   snodeXVal->setMaximum  ( 99999.99 );
-  snodeYVal->setSingleStep ( 0.1 );
+  snodeYVal->setSingleStep ( 10.0 );
   snodeYVal->setMaximum  ( 99999.99 );
-  snodeZVal->setSingleStep ( 0.1 );
+  snodeZVal->setSingleStep ( 10.0 );
   snodeZVal->setMaximum  ( 99999.99 );  
   
@@ -141 +141 @@
   rnodeZVal = new QDoubleSpinBox;
 
-  rnodeXVal->setSingleStep ( 10.0 );
+  rnodeXVal->setSingleStep ( 20.0 );
   rnodeXVal->setMaximum  ( 360.0 );
   rnodeXVal->setMinimum  ( -360.0 );  
-  rnodeYVal->setSingleStep ( 10.0 );
+  rnodeYVal->setSingleStep ( 20.0 );
   rnodeYVal->setMaximum  ( 360.0 );
   rnodeYVal->setMinimum  ( -360.0 );  
-  rnodeZVal->setSingleStep ( 10.0 );
+  rnodeZVal->setSingleStep ( 20.0 );
   rnodeZVal->setMaximum  ( 360.0 );  
   rnodeZVal->setMinimum  ( -360.0 ); 

trunk/src/SConscript

@@ -15 +15 @@
         'dreamforge/objects/Object.cc',
   'dreamforge/GameSaveFile.cc',
-  'dreamforge/XmlParser.cc',      
+  'dreamforge/GameLoadFile.cc',   
   'dreamforge/GameObjectManager.cc',
   'dreamforge/GameEngine.cc',

trunk/src/dreamforge/GameObjectManager.cc

@@ -68 +68 @@
 
 //------------------------------------------------------------------------------------------------
+void CObjectManager::deleteObject(ObjectPtr obj)
+{
+  mObjectMap::const_iterator it = mObjectList.find(obj->getSceneNode()->getName());
+        if(mObjectList.end() != it)
+        {
+                obj->destroy();
+    mObjectList.erase(it);
+        }       
+}
+
+//------------------------------------------------------------------------------------------------
 void CObjectManager::cleanAll(void)
 {
@@ -131 +142 @@
     }
         }
-        
+  // Log here the object not found
+        return obj;     
 }
 

trunk/src/dreamforge/GameSaveFile.cc

@@ -71 +71 @@
 void CSaveFile::writeEnd( void )
 {
-  mContentText << "<scene>" << std::endl; 
+  mContentText << "</scene>" << std::endl; 
 }