Changeset 7

Timestamp:

01/09/09 01:50:22 (3 years ago)

Author:

nktug

Message:

END OF THE FIRST ALPHA VERSION
+ Save and load function is implemented
+ All object type is used in the editor (PC, NPC, MONSTER and BUILDING)

= > Just plan some small functionality like suppress an object or put logs for example.

Location:

trunk

Files:

• config/objects.txt (modified) (1 diff)
• include/dreamforge/objects/Character.hh (added)
• include/dreamforge/objects/Monster.hh (added)
• include/dreamforge/objects/Object.hh (modified) (1 diff)
• include/dreamforge/objects/Structure.hh (added)
• src/LevelEditor.cc (modified) (13 diffs)
• src/LevelEditor.hh (modified) (2 diffs)
• src/Properties.cc (modified) (1 diff)
• src/SConscript (modified) (1 diff)
• src/Workbench.cc (modified) (11 diffs)
• src/Workbench.hh (modified) (3 diffs)
• src/dreamforge/GameEngine.cc (modified) (1 diff)
• src/dreamforge/GameObjectManager.cc (modified) (3 diffs)
• src/dreamforge/GameSaveFile.cc (modified) (2 diffs)
• src/dreamforge/objects/Character.cc (added)
• src/dreamforge/objects/Monster.cc (added)
• src/dreamforge/objects/Object.cc (modified) (1 diff)
• src/dreamforge/objects/Structure.cc (added)

trunk/config/objects.txt

@@ -5 +5 @@
     Imperial            
         OgreHead        ogrehead.mesh           MSTR    Ogre3D head mesh use for test
-        Ninja           ninja.mesh              PJ      Ogre3D ninja mesh use for test
+        Ninja           ninja.mesh              NPC     Ogre3D ninja mesh use for test
+Flore                   
+    Plantes             
+        Mushroom        Mushroom1_1.mesh        BLD     Ogre3D ninja mesh use for test
+        Weed            Weed1_1.mesh            BLD     test
+        Twig            Twig1_1.mesh            BLD     test
+        Bush            Bush1_1.mesh            BLD     test
+        Fern            Fern1_1.mesh            BLD     test
+        WhiteFlower     WhiteFlower1_1.mesh     BLD     test
+    Arbres              
+        Tropical        Tropical1_1.mesh        BLD     test
+Decors                  
+    Elements            
+        Rock            Rock1_1.mesh            BLD     test

trunk/include/dreamforge/objects/Object.hh

@@ -36 +36 @@
       CGameObject( void );
       virtual ~CGameObject(void);
+      
+      void destroy( void );
 
       // MANIPULATORS

trunk/src/LevelEditor.cc

@@ -10 +10 @@
 #include "LevelEditor.hh"
 #include "dreamforge/GameEngine.hh"
- #include "Properties.hh"
+#include "Properties.hh"
  
 #include "dreamforge/GameObjectManager.hh"
-
+#include "dreamforge/GameSaveFile.hh"
+#include "dreamforge/XmlParser.hh"
 
 #if (OGRE_PLATFORM  == OGRE_PLATFORM_LINUX)
@@ -105 +106 @@
   CEngineSystem::getInstance()->destroy();    
   mRoot = 0;
+}
+
+//------------------------------------------------------------------------------------------------ 
+void LevelEdWidget::saveObjectToFile(std::string& savefile)
+{
+  CSaveFile::getInstance()->setFileName(savefile);
+  CSaveFile::getInstance()->writeBegin();
+  
+  // Write all objects to file
+  CSaveFile::getInstance()->write("<objects>");
+  CObjectManager::getInstance()->saveToFile();
+  CSaveFile::getInstance()->write("</objects>");
+  
+  CSaveFile::getInstance()->writeEnd();
+  CSaveFile::getInstance()->saveFile();
+  CSaveFile::getInstance()->destroy();  
+}
+
+//------------------------------------------------------------------------------------------------ 
+void LevelEdWidget::loadObjectFromFile(std::string& loadfile)
+{
+        // Destroy all object loaded in game
+        CObjectManager::getInstance()->cleanAll();
+  
+        boost::shared_ptr<XmlParser> gameLoader (new XmlParser());
+  gameLoader->loadParser(loadfile); 
 }
 
@@ -252 +279 @@
         headNode->showBoundingBox(false);
  */
-  ObjectPtr tObj = CObjectFactory::getInstance()->createObject("PJ");
+  ObjectPtr tObj = CObjectFactory::getInstance()->createObject("NPC");
   tObj->setObjectName("toto");
   tObj->setObjectMeshFile("ninja.mesh");
@@ -302 +329 @@
         mCamera = mSceneMgr->createCamera("PlayerCam 1");
 
-        mCamera->setPosition(Ogre::Vector3(430,500,430));
+        mCamera->setPosition(Ogre::Vector3(1479,709,1389));
         mCamera->lookAt(Ogre::Vector3(100,0,100));
         mCamera->setAutoAspectRatio(true);
@@ -535 +562 @@
 
 //------------------------------------------------------------------------------------------------ 
+void LevelEdWidget::mouveObjectFromRay(QMouseEvent* evt, Ogre::SceneNode* node)
+{
+  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)
+  { 
+    node->setPosition(itr->worldFragment->singleIntersection.x, itr->worldFragment->singleIntersection.y + 5, itr->worldFragment->singleIntersection.z);
+  }   
+}
+
+//------------------------------------------------------------------------------------------------ 
 void LevelEdWidget::mousePressEvent(QMouseEvent* evt)
 {
@@ -544 +587 @@
       // Create a Ogre ray from the 2D coordinate of the viewport  
       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);
@@ -552 +594 @@
 
       //Ogre::Real closestDistance = 100000;
-
       closestObject = 0;
       bool mSelectedObject = false;
       
       Ogre::RaySceneQueryResult::iterator rayIterator;
-
       // Look if we have reach a Ogre movable object
       for(rayIterator = result.begin(); rayIterator != result.end(); rayIterator++ ) 
@@ -629 +669 @@
       iObj->initNodeObject();
 
-      Ogre::Ray mouseRay = mCamera->getCameraToViewportRay((double)evt->pos().x()/(double)width(), (double)evt->pos().y()/(double)height());
+      /*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);
@@ -639 +679 @@
       { 
         iObj->getSceneNode()->setPosition(itr->worldFragment->singleIntersection.x, itr->worldFragment->singleIntersection.y + 5, itr->worldFragment->singleIntersection.z);
-      }    
+      }*/
+      this->mouveObjectFromRay(evt, iObj->getSceneNode()); 
+    
       iObj->getSceneNode()->showBoundingBox(false);
       iObj->init();
@@ -713 +755 @@
     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::Ray mouseRay = mCamera->getCameraToViewportRay((double)evt->pos().x()/(double)width(), (double)evt->pos().y()/(double)height());
 
       Ogre::RaySceneQuery* mRaySceneQuery = mSceneMgr->createRayQuery(Ogre::Ray());;
@@ -725 +767 @@
       {
           mCurentObject->getSceneNode()->setPosition(itr->worldFragment->singleIntersection.x,itr->worldFragment->singleIntersection.y + 10, itr->worldFragment->singleIntersection.z);
-      }
+      }*/
+      this->mouveObjectFromRay(evt, mCurentObject->getSceneNode()); 
     }
   }
@@ -731 +774 @@
   if(mInsertMode)// && mTempObject)
   {
-    Ogre::Ray mRay = mCamera->getCameraToViewportRay((double)evt->pos().x()/(double)width(), (double)evt->pos().y()/(double)height());
+    /*Ogre::Ray mRay = mCamera->getCameraToViewportRay((double)evt->pos().x()/(double)width(), (double)evt->pos().y()/(double)height());
 
                 Ogre::RaySceneQuery* mRayScQuery = mSceneMgr->createRayQuery(Ogre::Ray());;
@@ -743 +786 @@
                 {
                                 mTempObject->setPosition(it->worldFragment->singleIntersection.x,it->worldFragment->singleIntersection.y + 10, it->worldFragment->singleIntersection.z);
-                }    
+                }*/
+    this->mouveObjectFromRay(evt, mTempObject);
   }
         

trunk/src/LevelEditor.hh

@@ -31 +31 @@
   void createTempObject(std::string& name, std::string& file, std::string& type);
   void changeInsertionMode(bool val);
+  void saveObjectToFile(std::string& savefile);
+  void loadObjectFromFile(std::string& loadfile);  
   
   inline Ogre::Root* getRoot(void) { return mRoot; }
   inline Ogre::RenderWindow* getRenderWindow(void) { return mRenderWindow; }
   inline Ogre::SceneManager* getSceneMgr(void) { return mSceneMgr; } 
+  inline Ogre::Camera* getCam(void) { return mCamera; } 
   
         ObjectPtr                               mCurentObject; // Selected object
@@ -65 +68 @@
         //Ogre::MovableObject* getSelectedNode(float mouseScreenX, float mouseScreenY);
         bool isHoverObjectSelected(void) const;
-
         void createScene();
+  
   void getSelectedObjectInfo(void);
   void resetSelectedObjectInfo(void);
-        
+        void mouveObjectFromRay(QMouseEvent* evt, Ogre::SceneNode* node);
+  
         void keyPressEvent(QKeyEvent* evt);
         void keyReleaseEvent(QKeyEvent* evt);

trunk/src/Properties.cc

@@ -114 +114 @@
 
   snodeXVal->setSingleStep ( 0.1 );
-  snodeXVal->setMaximum  ( 9999.90 );
+  snodeXVal->setMaximum  ( 99999.99 );
   snodeYVal->setSingleStep ( 0.1 );
-  snodeYVal->setMaximum  ( 10.0 );
+  snodeYVal->setMaximum  ( 99999.99 );
   snodeZVal->setSingleStep ( 0.1 );
-  snodeZVal->setMaximum  ( 10.0 );  
+  snodeZVal->setMaximum  ( 99999.99 );  
   
   

trunk/src/SConscript

@@ -7 +7 @@
 
 bin_files = [
+        'dreamforge/objects/Structure.cc',
+        'dreamforge/objects/Character.cc',
+        'dreamforge/objects/Monster.cc',
         'dreamforge/objects/Avatar.cc',
         'dreamforge/objects/ObjectStatistics.cc',

trunk/src/Workbench.cc

@@ -18 +18 @@
 
 //------------------------------------------------------------------------------------------------ 
-Workbench::Workbench()
-{
+Workbench::Workbench( void )
+{
+  // Set default file name
+  mExportFile = "export.save";
+  
   // Create the level editeur widget
   mLevelEd = new LevelEdWidget;
@@ -67 +70 @@
 
 //------------------------------------------------------------------------------------------------ 
-void Workbench::about()
+void Workbench::about( void )
 {
   QMessageBox::about(this, tr("About Application"),
@@ -76 +79 @@
 
 //------------------------------------------------------------------------------------------------ 
-void Workbench::createActions()
-{
-   newAct = new QAction(QIcon(":/icons/new.png"), tr("&New"), this);
+void Workbench::exportScene( void )
+{
+  QString fileName = QFileDialog::getSaveFileName(this);
+  if (false == fileName.isEmpty())
+  {
+    QFile file(fileName);
+    if (false == file.open(QFile::WriteOnly | QFile::Text)) 
+    {
+       QMessageBox::warning(this, tr("Application"),
+                            tr("Cannot write file %1:\n%2.")
+                            .arg(fileName)
+                            .arg(file.errorString()));
+       return;
+    }
+    
+    mExportFile = fileName;
+  }
+
+  QApplication::setOverrideCursor(Qt::WaitCursor);
+  mLevelEd->saveObjectToFile(mExportFile.toStdString());
+  QApplication::restoreOverrideCursor();
+
+  statusBar()->showMessage(tr("Export file saved"), 2000);
+}
+
+//------------------------------------------------------------------------------------------------ 
+void Workbench::importScene( void )
+{
+  QString fileName = QFileDialog::getOpenFileName(this);
+  if (false == fileName.isEmpty())
+  {
+    QFile file(fileName);
+    if (!file.open(QFile::ReadOnly | QFile::Text)) 
+    {
+       QMessageBox::warning(this, tr("Application"),
+                            tr("Cannot read file %1:\n%2.")
+                            .arg(fileName)
+                            .arg(file.errorString()));
+       return;
+    }
+
+    QApplication::setOverrideCursor(Qt::WaitCursor);
+    mLevelEd->loadObjectFromFile(fileName.toStdString());
+    QApplication::restoreOverrideCursor();
+
+    statusBar()->showMessage(tr("File loaded"), 2000);
+  }
+  
+
+
+}
+
+//------------------------------------------------------------------------------------------------ 
+void Workbench::createActions( void )
+{
+   newAct = new QAction(QIcon("../../data/icons/copy.png"), tr("&New"), this);
    newAct->setShortcut(tr("Ctrl+N"));
    newAct->setStatusTip(tr("Create a new file"));
 
-   openAct = new QAction(QIcon(":/icons/open.png"), tr("&Open..."), this);
+   openAct = new QAction(QIcon("../../data/icons/open.png"), tr("&Open..."), this);
    openAct->setShortcut(tr("Ctrl+O"));
    openAct->setStatusTip(tr("Open an existing file"));;
 
-   saveAct = new QAction(QIcon(":/icons/save.png"), tr("&Save"), this);
+   saveAct = new QAction(QIcon("../../data/icons/save.png"), tr("&Save"), this);
    saveAct->setShortcut(tr("Ctrl+S"));
    saveAct->setStatusTip(tr("Save the document to disk"));
@@ -92 +148 @@
    saveAsAct = new QAction(tr("Save &As..."), this);
    saveAsAct->setStatusTip(tr("Save the document under a new name"));
-
+   
+   exportAct = new QAction(QIcon("../../data/icons/new.png"), tr("&Export scene..."), this);
+   exportAct->setStatusTip(tr("Export the scen objects in XML document"));
+   connect(exportAct, SIGNAL(triggered()), this, SLOT(exportScene()));
+
+   importAct = new QAction(QIcon("../../data/icons/cut.png"), tr("&Import scene..."), this);
+   importAct->setStatusTip(tr("Import the scene objects from XML document"));  
+   connect(importAct, SIGNAL(triggered()), this, SLOT(importScene()));
+   
    exitAct = new QAction(tr("E&xit"), this);
    exitAct->setShortcut(tr("Ctrl+Q"));
@@ -109 +173 @@
 
 //------------------------------------------------------------------------------------------------ 
-void Workbench::createMenus()
+void Workbench::createMenus( void )
 {
    fileMenu = menuBar()->addMenu(tr("&File"));
@@ -116 +180 @@
    fileMenu->addAction(saveAct);
    fileMenu->addAction(saveAsAct);
+   fileMenu->addAction(exportAct);
+   fileMenu->addAction(importAct);   
    fileMenu->addSeparator();
    fileMenu->addAction(exitAct);
@@ -127 +193 @@
 
 //------------------------------------------------------------------------------------------------ 
-void Workbench::createToolBars()
+void Workbench::createToolBars( void )
 {
    fileToolBar = addToolBar(tr("File"));
@@ -133 +199 @@
    fileToolBar->addAction(openAct);
    fileToolBar->addAction(saveAct);
-}
-
-//------------------------------------------------------------------------------------------------ 
-void Workbench::createStatusBar()
+   fileToolBar->addAction(exportAct);
+   fileToolBar->addAction(importAct);
+}
+
+//------------------------------------------------------------------------------------------------ 
+void Workbench::createStatusBar( void )
 {
    statusBar()->showMessage(tr("Ready"));
@@ -142 +210 @@
 
 //------------------------------------------------------------------------------------------------ 
-void Workbench::readSettings()
+void Workbench::readSettings( void )
 {
    QSettings settings("Trolltech", "Application Example");
@@ -152 +220 @@
 
 //------------------------------------------------------------------------------------------------ 
-void Workbench::writeSettings()
+void Workbench::writeSettings( void )
 {
    QSettings settings("Trolltech", "Application Example");
@@ -169 +237 @@
 {
         Q_UNUSED(evt);
+
+  statusBar()->clearMessage();
+ 
+  QString fullMsg;
+  fullMsg += "FPS : ";
+
+  QString nbFPS;
+  nbFPS.setNum(mLevelEd->getRenderWindow()->getStatistics().lastFPS);
+  fullMsg += nbFPS;
+
+  fullMsg += "     ";
+  fullMsg += "Triangles : ";
+
+  QString nbTriangles;
+  nbTriangles.setNum(mLevelEd->getRenderWindow()->getStatistics().triangleCount);
+  fullMsg += nbTriangles;
+
+  //POSITION
+  fullMsg += "     ";
+  fullMsg += "Position : ";
+
+  QString camX;
+  camX.setNum(mLevelEd->getCam()->getPosition().x);
+  fullMsg += camX;
+  fullMsg += ", ";
+
+  QString camY;
+  camY.setNum(mLevelEd->getCam()->getPosition().y);
+  fullMsg += camY;
+  fullMsg += ", ";
+
+  QString camZ;
+  camZ.setNum(mLevelEd->getCam()->getPosition().z);
+  fullMsg += camZ;
+
+  //DIRECTION
+  fullMsg += "     ";
+  fullMsg += "Direction : ";
+
+  QString dirX;
+  dirX.setNum(mLevelEd->getCam()->getDirection().x);
+  fullMsg += dirX;
+  fullMsg += ", ";
+
+  QString dirY;
+  dirY.setNum(mLevelEd->getCam()->getDirection().y);
+  fullMsg += dirY;
+  fullMsg += ", ";
+
+  QString dirZ;
+  dirZ.setNum(mLevelEd->getCam()->getDirection().z);
+  fullMsg += dirZ;
+
+  statusBar()->showMessage(fullMsg);//Update stats
     
 }

trunk/src/Workbench.hh

@@ -25 +25 @@
 
  public:
-    Workbench();
+    Workbench( void );
 
  protected:
@@ -33 +33 @@
  private slots:
     void about(void);
-
-
+    void exportScene(void);
+    void importScene(void);
+    
  private:
-    void createActions();
-    void createMenus();
-    void createToolBars();
-    void createStatusBar();
-    void readSettings();
-    void writeSettings();
+    void createActions( void );
+    void createMenus( void );
+    void createToolBars( void );
+    void createStatusBar( void );
+    void readSettings( void );
+    void writeSettings( void );
                         
     void resizeEvent(QResizeEvent* evt);
@@ -53 +54 @@
     QAction *saveAct;
     QAction *saveAsAct;
+    QAction *exportAct;
+    QAction *importAct;    
     QAction *exitAct;
     QAction *aboutAct;
     QAction *aboutQtAct;
+    
+    QString mExportFile;
 
     QTabWidget *tabWidget;

trunk/src/dreamforge/GameEngine.cc

@@ -126 +126 @@
                 Ogre::ResourceGroupManager::getSingleton().addResourceLocation("../../data/models/mesh", "FileSystem", "General");
                 Ogre::ResourceGroupManager::getSingleton().addResourceLocation("../../data/models/textures", "FileSystem", "General");
-                Ogre::ResourceGroupManager::getSingleton().addResourceLocation("../../data/models/animation", "FileSystem", "General");    
+                Ogre::ResourceGroupManager::getSingleton().addResourceLocation("../../data/models/animation", "FileSystem", "General");
+                Ogre::ResourceGroupManager::getSingleton().addResourceLocation("../../data/models/scripts", "FileSystem", "General");    
                 Ogre::ResourceGroupManager::getSingleton().addResourceLocation("../../data/terrain", "FileSystem", "General");
+                Ogre::ResourceGroupManager::getSingleton().addResourceLocation("../../data/terrain/ET", "FileSystem", "General");    
                 Ogre::ResourceGroupManager::getSingleton().addResourceLocation("../../data/world", "FileSystem", "General");
                 Ogre::ResourceGroupManager::getSingleton().addResourceLocation("../../data/OgreCore.zip", "Zip", "Bootstrap");

trunk/src/dreamforge/GameObjectManager.cc

@@ -23 +23 @@
 #include "dreamforge/GameObjectManager.hh"
 #include "dreamforge/objects/Avatar.hh"
-
-
+#include "dreamforge/objects/Character.hh"
+#include "dreamforge/objects/Monster.hh"
+#include "dreamforge/objects/Structure.hh"
+ 
+ 
+ 
 using namespace dreamforge;
 
@@ -67 +71 @@
 {
         // Clear all objects within the map
-        /*mObjectMap::const_iterator iter;
+        mObjectMap::const_iterator iter;
         for(iter = mObjectList.begin(); iter != mObjectList.end(); ++iter)
         {
-                delete iter->second;
-        }*/
+    ObjectPtr obj;
+                obj = iter->second;
+    obj->destroy();   
+    obj.reset();
+        }
         // delete the map
         mObjectList.clear();
@@ -153 +160 @@
 ObjectPtr CObjectFactory::createObject(const std::string &type)
 {
-        //++mObjectUID;
         
-  if(type == "PJ")
+  if(type == "PC")
   {
-    ObjectPtr obj (new CAvatar());
-    return obj;
+    return ObjectPtr(new CAvatar());
   }
-/*  else if(type == "NPJ")boost::dynamic_pointer_cast<CAvatar>
+  else if(type == "NPC")
   {
-    return ObjectPtr(new Character);
+    return ObjectPtr(new CCharacter);
   }    
   else if(type == "MSTR")
   {
-    return ObjectPtr(new Monster);
+    return ObjectPtr(new CMonster);
   } 
   else if(type == "BLD")
   {
-    return ObjectPtr(new Building);
-  }*/
+    return ObjectPtr(new CStructure);
+  }
   else
   {

trunk/src/dreamforge/GameSaveFile.cc

@@ -64 +64 @@
 void CSaveFile::writeBegin( void )
 {
-  mContentText << "<!-- Save file created in dreamforge Game version -->" << std::endl;
   mContentText << "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>" << std::endl;
   mContentText << "<scene>" << std::endl;
@@ -73 +72 @@
 {
   mContentText << "<scene>" << std::endl; 
-  mContentText << "<!-- End -->";
 }
 

trunk/src/dreamforge/objects/Object.cc

@@ -46 +46 @@
   mParentNode = 0;
   mObjectNode = 0;
+}
+
+//------------------------------------------------------------------------------------------------
+void CGameObject::destroy( void )
+{
+  CEngineSystem::getInstance()->getSceneMgr()->destroyEntity (mEntity);
+  CEngineSystem::getInstance()->getSceneMgr()->destroySceneNode(mObjectNode->getName());
 }