Changeset 4

Timestamp:

01/05/09 00:17:57 (3 years ago)

Author:

nktug

Message:

Add code to manage object in editor from text file
Add code to add object by cliking the name from a QT list
Add other code from FreeQuest?

Location:

trunk

Files:

• config/demo.save (added)
• config/objects.txt (added)
• include (added)
• include/dreamforge (added)
• include/dreamforge/Exceptions.hh (added)
• include/dreamforge/GameEngine.hh (added)
• include/dreamforge/GameGlobalVars.hh (added)
• include/dreamforge/GameObjectManager.hh (added)
• include/dreamforge/GamePrerequisites.hh (added)
• include/dreamforge/GameSaveFile.hh (added)
• include/dreamforge/GameSerializer.hh (added)
• include/dreamforge/XmlParser.hh (added)
• include/dreamforge/objects (added)
• include/dreamforge/objects/AnimeObject.hh (added)
• include/dreamforge/objects/Avatar.hh (added)
• include/dreamforge/objects/Object.hh (added)
• include/dreamforge/objects/ObjectStatistics.hh (added)
• src/LevelEditor.cc (modified) (16 diffs)
• src/LevelEditor.hh (modified) (5 diffs)
• src/Properties.cc (modified) (1 diff)
• src/Properties.hh (modified) (1 diff)
• src/SConscript (modified) (1 diff)
• src/Workbench.cc (modified) (5 diffs)
• src/Workbench.hh (modified) (3 diffs)
• src/dreamforge/GameEngine.cc (modified) (1 diff)
• src/treeitem.cpp (added)
• src/treeitem.h (added)
• src/treemodel.cpp (added)
• src/treemodel.h (added)

trunk/src/LevelEditor.cc

@@ -10 +10 @@
 #include "LevelEditor.hh"
 #include "dreamforge/GameEngine.hh"
+
+#include "dreamforge/GameObjectManager.hh"
+
 
 #if (OGRE_PLATFORM  == OGRE_PLATFORM_LINUX)
@@ -42 +45 @@
         mCurentObject = 0; // Trace the curent selected object.
         closestObject = 0;
+
+
+  mInsertMode = false;
+  mEditionMode = true; // We must always enter on this screen with edition mode
         
         //this->setupResources();
@@ -47 +54 @@
   CEngineSystem::getInstance()->initEngine();
   mRoot = CEngineSystem::getInstance()->getRoot();
+ 
+  // Enable tracking mouse event even if we do not clic any buttons
+  setMouseTracking(true);
 }
 
@@ -57 +67 @@
         }
   */
+        // Destroy all object loaded in game
+        //CObjectManager::getInstance()->cleanAll();
+        //CObjectManager::getInstance()->destroy();
+  // Destroy the factory
+  //CObjectFactory::getInstance()->destroy();
+  
+  // Stop and destroy the Graphic engine
   CEngineSystem::getInstance()->stopEngine();
   CEngineSystem::getInstance()->destroy();    
@@ -63 +80 @@
 
 //******************************Setup Ogre***********************************
-
-void LevelEdWidget::setupResources()
-{
-        mRoot = new Ogre::Root();
-
-        Ogre::ConfigFile cf;
-        cf.load("resources.cfg");
-
-        Ogre::ConfigFile::SectionIterator seci = cf.getSectionIterator();
-        Ogre::String secName, typeName, archName;
-        while(seci.hasMoreElements())
-        {
-                secName = seci.peekNextKey();
-                Ogre::ConfigFile::SettingsMultiMap* settings = seci.getNext();
-                Ogre::ConfigFile::SettingsMultiMap::iterator i;
-                for(i=settings->begin(); i!=settings->end(); ++i){
-                        typeName = i->first;
-                        archName = i->second;
-                        Ogre::ResourceGroupManager::getSingleton().addResourceLocation(archName, typeName, secName);
-                }
-        }
-
-        //mRoot->restoreConfig();
-
-        QSettings settings;
-        QString system;
-        QString renderSysName;
-        QMap<QString, QVariant> options;
-        Ogre::RenderSystemList *list = Ogre::Root::getSingleton().getAvailableRenderers();
-
-        if(settings.contains("General/RenderSystem"))
-        {
-                renderSysName = settings.value("General/RenderSystem").toString();
-        }
-        else
-        {
-        renderSysName = "OpenGL Rendering Subsystem";
-        }
-
-        for(Ogre::RenderSystemList::iterator it = list->begin(); it != list->end(); it++)
-        {
-                if( renderSysName == QString( (*it)->getName().c_str() ) )
-                {
-                        mRoot->setRenderSystem(*it);
-                        break;
-                }
-
-                system = QString( (*it)->getName().c_str() );
-        system.replace(" ", "");
-
-        options.clear();
-        options = settings.value(QString("%1/RenderOptions").arg(renderSysName), options).toMap();
-
-        // Prevent DirectX from crashing
-        if(options.contains("Full Screen"))
-            options["Full Screen"] = "No";
-
-        QMapIterator<QString, QVariant> i(options);
-        while(i.hasNext())
-        {
-            i.next();
-            (*it)->setConfigOption( Ogre::String(i.key().toLatin1().data()),  Ogre::String(i.value().toString().toLatin1().data()) );
-        }
-    }
-
-        mRoot->initialise(false);
-}
 
 //------------------------------------------------------------------------------------------------ 
@@ -167 +117 @@
         // 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
-        //mSceneMgr->getRootSceneNode()->createChildSceneNode()->attachObject(ent);
         Ogre::SceneNode* headNode = mSceneMgr->getRootSceneNode()->createChildSceneNode();
         headNode->attachObject(ent);
@@ -176 +125 @@
         headNode->setPosition(500,600,600);
         headNode->showBoundingBox(false);
-        
-        clamToTerrain(headNode);
+ */
+  ObjectPtr tObj = CObjectFactory::getInstance()->createObject("PJ");
+  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);
         
 }
@@ -226 +186 @@
         Ogre::ResourceGroupManager::getSingleton().initialiseAllResourceGroups();
 
-        createScene();
+        this->createScene();
         //createFog();
         //createLight();
@@ -250 +210 @@
     startTimer(5);
 };
+
+//************************************************************************
+void LevelEdWidget::changeInsertionMode(bool val)
+{
+  if(val)
+  {
+    mInsertMode = true;
+    mEditionMode = false;
+    if(mCurentObject)
+    {
+      mCurentObject->showBoundingBox(false);
+      mCurentObject = 0;
+    }
+  }
+  else
+  {
+    mInsertMode = false;
+    mEditionMode = true;
+    
+    if(mTempObject.use_count())
+    {
+      mSceneMgr->destroyEntity (mTempObject->getEntity());
+      mSceneMgr->destroySceneNode(mTempObject->getSceneNode()->getName());
+      mTempObject.reset();
+    }
+  }
+}
+
+//------------------------------------------------------------------------------------------------ 
+void LevelEdWidget::createTempObject(std::string& name, std::string& file)
+{
+  this->changeInsertionMode(true);
+  
+  mTempObject = CObjectFactory::getInstance()->createObject("PJ");
+  mTempObject->setObjectName(name);
+  mTempObject->setObjectMeshFile(file);
+  mTempObject->initNodeObject();
+  mTempObject->getSceneNode()->setPosition(100,100,100);
+  //mTempObject->getSceneNode()->showBoundingBox(false);
+  mTempObject->init();
+}
+
 
 //------------------------------------------------------------------------------------------------ 
@@ -264 +266 @@
                 
                 //updateStats();
+    // Update all object in Game
+    if(mTempObject.use_count())
+    {
+      mTempObject->update(mRenderWindow->getBestFPS()/100000);
+    }
+    
+    CObjectManager::getInstance()->updateObject( mRenderWindow->getBestFPS()/100000 );
                 mRoot->_fireFrameEnded();
         }
@@ -313 +322 @@
 void LevelEdWidget::keyReleaseEvent(QKeyEvent* evt)
 {
-
+  if(evt->key() == Qt::Key_Escape)
+  {
+    if(mInsertMode)
+    {
+      this->changeInsertionMode(false);
+    }
+    
+    if(mEditionMode && mCurentObject)
+    {
+      mCurentObject->showBoundingBox(false);
+      mCurentObject = 0;
+    }
+  }
 }
 
@@ -331 +352 @@
         if(evt->button() == Qt::LeftButton)
         {
-                mouseLeftPressed = true;
-                
-        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::Real closestDistance = 100000;
-
-        closestObject = 0;
-        bool mSelectedObject = false;
-        
-        Ogre::RaySceneQueryResult::iterator rayIterator;
-
-        for(rayIterator = result.begin(); rayIterator != result.end(); rayIterator++ ) 
-        {
-                if (rayIterator->movable !=NULL && rayIterator->movable->getMovableType() == "Entity")
-                {
-                        closestObject = rayIterator->movable;
-                        std::cout << "** found **" << std::endl;
-                }
-        }
-
-        mRaySceneQuery->clearResults();
-        
-        
-        if(closestObject) 
-        {
-                if(mCurentObject)
-                {
-                        mSelectedObject = isHoverObjectSelected();
-                        
-                        if (!mSelectedObject)
-                        {
-                                mCurentObject->showBoundingBox(false);
-                                mCurentObject = closestObject->getParentSceneNode();
-                                mCurentObject->showBoundingBox(true);
-                                std::cout << "** objet trouve diff objet courant **" << std::endl;
-                        }
-                        else{
-                                std::cout << "** objet deja selectionne **" << std::endl;
-                        }
-                }
-                else{
-                        mCurentObject = closestObject->getParentSceneNode();
-                        mCurentObject->showBoundingBox(true);
-                        std::cout << "** objet trouve mais objet courant inexistant **" << std::endl;
-                }
-        }               
-        else
-        {
-                std::cout << "** pas objet trouve **" << std::endl;
-                if(mCurentObject)
-                {
-                        mCurentObject->showBoundingBox(false);
-                        mCurentObject = 0;
-                        std::cout << "** deselection object courant **" << std::endl;
-                }       
-        }
-        }
-        
-  // Handle right clic button
+    if(mEditionMode) // Edition mode only select, move, change object settings
+    {
+      mouseLeftPressed = true;
+      // 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);
+      
+      mRaySceneQuery->setSortByDistance(true);
+      Ogre::RaySceneQueryResult &result = mRaySceneQuery->execute();
+
+      //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++ ) 
+      {
+        if (rayIterator->movable !=NULL && rayIterator->movable->getMovableType() == "Entity")
+        {
+          // get this movable object
+          closestObject = rayIterator->movable;
+          std::cout << "** found **" << std::endl;
+        }
+      }
+
+      // Clear the ray result
+      mRaySceneQuery->clearResults();
+      
+      // If we have found something from the ray
+      if(closestObject) 
+      {
+        if(mCurentObject) // check if we do not have an object already selected
+        {
+          // if we are over it
+          mSelectedObject = isHoverObjectSelected();
+          
+          if (!mSelectedObject) // if it is not the case, it is an other object
+          {
+            mCurentObject->showBoundingBox(false);
+            mCurentObject = closestObject->getParentSceneNode();
+            mCurentObject->showBoundingBox(true);
+            std::cout << "** objet trouve diff objet courant **" << std::endl;
+          }
+          else // if it is true, it is already selected so do nothing
+          {
+            std::cout << "** objet deja selectionne **" << std::endl;
+          }
+        }
+        else // We have no object selected, marked this one
+        {
+          mCurentObject = closestObject->getParentSceneNode();
+          mCurentObject->showBoundingBox(true);
+          std::cout << "** objet trouve mais objet courant inexistant **" << std::endl;
+        }
+      }         
+      else // We found nothing from our ray tracing, it means that we have clicked over the terrain
+      {
+        std::cout << "** pas objet trouve **" << std::endl;
+        if(mCurentObject) // if an other object is selected so disable it
+        {
+          mCurentObject->showBoundingBox(false);
+          mCurentObject = 0;
+          std::cout << "** deselection object courant **" << std::endl;
+        }       
+      }
+    } // end Edition Mode
+      
+    if(mInsertMode) // Insert new object in the map
+    {
+      // Next time handle multi insertion object
+    }
+        } // end LeftButton clic
+        
+  // Handle right clic button to move the camera
         if(evt->button() == Qt::RightButton)
         {
@@ -402 +437 @@
         }
         
-  // Handle mid clic button
+  // Handle mid clic button to zoom the camera
         if(evt->button() == Qt::MidButton)
         {
@@ -413 +448 @@
 {
         Q_UNUSED(evt);
+  
+  if(mouseLeftPressed && mInsertMode)
+  {
+    
+  }
+  
         mouseLeftPressed = false;
         mouseRightPressed = false;
@@ -425 +466 @@
 
         }
+  
+  
         if(mouseRightPressed)
         {
@@ -449 +492 @@
         }
         
-        if (mouseLeftPressed)
-        {       
-                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);
+  if(mEditionMode)
+  {
+    if (mouseLeftPressed && mCurentObject) // 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)
+      {
+          mCurentObject->setPosition(itr->worldFragment->singleIntersection.x,itr->worldFragment->singleIntersection.y + 10, itr->worldFragment->singleIntersection.z);
+      }
+    }
+  }
+  
+  if(mInsertMode)// && mTempObject.use_count())
+  {
+    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 &result = mRaySceneQuery->execute();
-                Ogre::RaySceneQueryResult::iterator itr = result.begin();
-
-                if (itr != result.end() && itr->worldFragment && mCurentObject)
+                Ogre::RaySceneQueryResult &reslt = mRayScQuery->execute();
+                Ogre::RaySceneQueryResult::iterator it = reslt.begin();
+
+                if (it != reslt.end() && it->worldFragment)
                 {
-                                mCurentObject->setPosition(itr->worldFragment->singleIntersection.x,itr->worldFragment->singleIntersection.y + 10, itr->worldFragment->singleIntersection.z);
-                }
-        
-        }
+                                mTempObject->getSceneNode()->setPosition(it->worldFragment->singleIntersection.x,it->worldFragment->singleIntersection.y + 10, it->worldFragment->singleIntersection.z);
+                }    
+  }
         
 }

trunk/src/LevelEditor.hh

@@ -10 +10 @@
 #endif
 
- // use for object global variables
- #define GLOBAL  
+#include "dreamforge/objects/Object.hh" 
 
+ 
 namespace dreamforge 
 {
@@ -28 +28 @@
         ~LevelEdWidget();
   
+  void createTempObject(std::string& name, std::string& file);
+  void changeInsertionMode(bool val);
+  
   inline Ogre::Root* getRoot(void) { return mRoot; }
   inline Ogre::RenderWindow* getRenderWindow(void) { return mRenderWindow; }
@@ -34 +37 @@
 protected:
   void setupView();
-
         void update();
-        void setupResources();
         
         void clamToTerrain(Ogre::SceneNode* node);
@@ -64 +65 @@
         ///// Deplacement Camera
         Ogre::Vector3 mDirection;
-        //Ogre::Real mRotate;
-        //Ogre::Real mMove;
-        //bool isMoving;
         QPoint mousePressPos;
         QPoint mousePos;
@@ -76 +74 @@
         bool mouseRightPressed;
         bool mouseMiddleBtn;
-        //bool isLoopOn;
-        //bool isAnimEnabled;
-        Ogre::SceneNode*                        mCurentObject;
-        Ogre::MovableObject*    closestObject;
+
+        Ogre::SceneNode*                        mCurentObject; // Selected object
+        Ogre::MovableObject*    closestObject; // Object use in the ray cast
+  ObjectPtr                             mTempObject;   // Object use to fallow the mouse cursor for insertion
         
-        //////// Rotation handler
-        //Ogre::SceneNode* mSceneNode;
-        //Ogre::SceneNode* mNode[3];
-        //Ogre::Entity* mEnt[3];
+  // Action mode
+  bool mInsertMode;
+  bool mEditionMode;
         
 };

trunk/src/Properties.cc

@@ -9 +9 @@
 using namespace dreamforge;
 
+
+//------------------------------------------------------------------------------------------------ 
+SelectedObjProp::SelectedObjProp(QWidget* parent) : QWidget(parent)
+{
+  /*QGroupBox* groupCombo = new QGroupBox("Sélection");
+  
+  QLabel* objCat = new QLabel(tr("Objet Catégorie :"));
+  QComboBox* objCatCombo = new QComboBox;
+  objCatCombo->addItem(tr("Faune"));
+  objCatCombo->addItem(tr("Flore"));
+
+  QLabel* objType = new QLabel(tr("Objet Type :"));
+  QComboBox* objTypeCombo = new QComboBox;
+  objTypeCombo->addItem(tr("Batiments"));
+  objTypeCombo->addItem(tr("Monstres"));
+  objTypeCombo->addItem(tr("NPJ"));
+  
+  QGridLayout* gridObjLayout = new QGridLayout;
+  gridObjLayout->addWidget(objCat, 0, 0);
+  gridObjLayout->addWidget(objCatCombo, 0, 1);
+  gridObjLayout->addWidget(objType, 1, 0);
+  gridObjLayout->addWidget(objTypeCombo, 1, 1);
+  
+  groupCombo->setLayout(gridObjLayout);
+
+  //********************************************
+  mObjectList = new QListWidget;
+  new QListWidgetItem(tr("Chien"), mObjectList);
+  new QListWidgetItem(tr("Loup"), mObjectList);
+  new QListWidgetItem(tr("Loup sauvage"), mObjectList);
+  new QListWidgetItem(tr("Ogre"), mObjectList);
+  new QListWidgetItem(tr("Tigre"), mObjectList);
+
+  connect(mObjectList, SIGNAL(itemClicked ( QListWidgetItem * )), this, SLOT(chooseObject()));*/
+    
+
+  QStringList headers;
+  headers << tr("Nom") << tr("Fichier") << tr("Description");
+
+  QFile file("../../config/objects.txt");
+  file.open(QIODevice::ReadOnly);
+  model = new TreeModel(headers, file.readAll());
+  file.close();
+
+  objectView = new QTreeView;
+  objectView->setObjectName(QString::fromUtf8("view"));
+  objectView->setAlternatingRowColors(true);
+  objectView->setSelectionBehavior(QAbstractItemView::SelectItems);
+  objectView->setHorizontalScrollMode(QAbstractItemView::ScrollPerPixel);
+  objectView->setAnimated(false);
+  objectView->setAllColumnsShowFocus(true);
+  
+  objectView->setModel(model);
+  /*for (int column = 0; column < model->columnCount(); ++column)
+  {
+    objectView->resizeColumnToContents(column);
+  }*/
+    
+  objectView->hideColumn (1);
+  objectView->hideColumn (2);                                                        
+  
+  //********************************************
+  QGroupBox* groupProp = new QGroupBox("Propriétés de l'objet");
+  
+  QLabel* sObjSelec = new QLabel(tr("Nom :"));
+  QLineEdit* sObjInput = new QLineEdit;
+  
+  // Object Postion
+  QGroupBox* groupNodePos = new QGroupBox("Node Position");
+  QLabel* nodeXText = new QLabel(tr("X :"));
+  QSpinBox* nodeXVal = new QSpinBox;
+  QLabel* nodeYText = new QLabel(tr("Y :"));
+  QSpinBox* nodeYVal = new QSpinBox;  
+  QLabel* nodeZText = new QLabel(tr("Z :"));
+  QSpinBox* nodeZVal = new QSpinBox;
+  
+  // Grille
+  QGridLayout* gridNodePosLayout = new QGridLayout;
+  gridNodePosLayout->addWidget(nodeXText, 0, 0);
+  gridNodePosLayout->addWidget(nodeXVal, 0, 1);
+  gridNodePosLayout->addWidget(nodeYText, 1, 0);
+  gridNodePosLayout->addWidget(nodeYVal, 1, 1);
+  gridNodePosLayout->addWidget(nodeZText, 2, 0);
+  gridNodePosLayout->addWidget(nodeZVal, 2, 1);
+  
+  groupNodePos->setLayout(gridNodePosLayout);
+  
+  // Object Scale
+  QGroupBox* groupNodeScal = new QGroupBox("Node Scale");
+  QLabel* snodeXText = new QLabel(tr("X :"));
+  QSpinBox* snodeXVal = new QSpinBox;
+  QLabel* snodeYText = new QLabel(tr("Y :"));
+  QSpinBox* snodeYVal = new QSpinBox;  
+  QLabel* snodeZText = new QLabel(tr("Z :"));
+  QSpinBox* snodeZVal = new QSpinBox;
+  
+  // Grille
+  QGridLayout* gridNodeScalLayout = new QGridLayout;
+  gridNodeScalLayout->addWidget(snodeXText, 0, 0);
+  gridNodeScalLayout->addWidget(snodeXVal, 0, 1);
+  gridNodeScalLayout->addWidget(snodeYText, 1, 0);
+  gridNodeScalLayout->addWidget(snodeYVal, 1, 1);
+  gridNodeScalLayout->addWidget(snodeZText, 2, 0);
+  gridNodeScalLayout->addWidget(snodeZVal, 2, 1);
+  
+  groupNodeScal->setLayout(gridNodeScalLayout);
+  
+  // Grille
+  QGridLayout* gridsObjLayout = new QGridLayout;
+  gridsObjLayout->addWidget(sObjSelec, 0, 0);
+  gridsObjLayout->addWidget(sObjInput, 0, 1);
+  gridsObjLayout->addWidget(groupNodePos, 1, 0);
+  gridsObjLayout->addWidget(groupNodeScal, 1, 1);
+  
+  groupProp->setLayout(gridsObjLayout);
+  
+  //********************************************
+  QVBoxLayout* regroupLayout = new QVBoxLayout;
+  //regroupLayout->addWidget(groupCombo);
+  //regroupLayout->addWidget(mObjectList);
+  regroupLayout->addWidget(objectView);
+  regroupLayout->addWidget(groupProp);
+  
+  setLayout(regroupLayout);
+}
+
+//------------------------------------------------------------------------------------------------ 
+SelectedObjProp::~SelectedObjProp()
+{
+
+}
+
+//------------------------------------------------------------------------------------------------ 
+void SelectedObjProp::mousePressEvent(QMouseEvent* evt)
+{
+}
+
+//------------------------------------------------------------------------------------------------ 
+void SelectedObjProp::mouseReleaseEvent(QMouseEvent* evt)
+{
+}
+
+//------------------------------------------------------------------------------------------------ 
+//
 //------------------------------------------------------------------------------------------------ 
 EnvProperties::EnvProperties(QWidget* parent) : QWidget(parent)

trunk/src/Properties.hh

@@ -6 +6 @@
 
 #include <QtGui/QtGui>
+#include "treemodel.h"
 
 namespace dreamforge 
 {
+
+class SelectedObjProp : public QWidget
+{
+  Q_OBJECT
+ 
+  public:
+    SelectedObjProp(QWidget *parent = 0);
+    ~SelectedObjProp();
+  
+  protected:
+    void mousePressEvent(QMouseEvent* evt);
+    void mouseReleaseEvent(QMouseEvent* evt);
+ 
+  public:
+    QTreeView* objectView;
+    TreeModel *model;
+//    QListWidget *mObjectList;
+//    QString mCurSelect;
+};
 
 class EnvProperties : public QWidget

trunk/src/SConscript

@@ -15 +15 @@
   'dreamforge/GameObjectManager.cc',
   'dreamforge/GameEngine.cc',
+  'treemodel.cpp',
+  'treeitem.cpp',
   'Properties.cc',
   'LevelEditor.cc',

trunk/src/Workbench.cc

@@ -3 +3 @@
 #include "config.h"
 #endif
+
+// use for object global variables
+#define GLOBAL  
 
 
@@ -10 +13 @@
 
 #include "Workbench.hh"
+
 
 using namespace dreamforge;
@@ -26 +30 @@
   
   // Create a tree widget
-  envProperties = new EnvProperties;
-  //envProperties->show();
+  objProperties = new SelectedObjProp;
   
   // Create a widget we can drag around the workbench
   QDockWidget *dock = new QDockWidget(tr("Propriétés"), this);
   dock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
-  dock->setWidget(envProperties);
+  dock->setWidget(objProperties);
 
   addDockWidget(Qt::RightDockWidgetArea, dock);
+  
+  // Connect action
+  connect(objProperties->objectView, SIGNAL(clicked( const QModelIndex & )),this, SLOT(chooseObject()));   
   
   // Try to register the icon resources : Fix me does not work
@@ -56 +62 @@
 
 //------------------------------------------------------------------------------------------------ 
+// ACTIONS
+//------------------------------------------------------------------------------------------------ 
+void Workbench::chooseObject()
+{
+  //QListWidgetItem* item = mObjectList->currentItem();
+  QModelIndex item = objProperties->objectView->currentIndex();
+  QModelIndex itemTmp = item.sibling( item.row(), item.column()+1);
+   
+  if(!itemTmp.data().toString().isEmpty())
+  {
+    QString name = item.data().toString();
+    QString meshfile = itemTmp.data().toString();
+    
+    mLevelEd->createTempObject(name.toStdString() , meshfile.toStdString());
+  }
+
+}
+
+//------------------------------------------------------------------------------------------------ 
 void Workbench::closeEvent(QCloseEvent *event)
 {
@@ -61 +86 @@
   event->accept();
 }
-
-
 
 //------------------------------------------------------------------------------------------------ 

trunk/src/Workbench.hh

@@ -4 +4 @@
  #include <QtGui/QMainWindow>
  #include <QtGui/QtGui>
+ 
  
  #include "LevelEditor.hh"
@@ -31 +32 @@
  private slots:
     void about();
+    void chooseObject();
 
  private:
@@ -57 +59 @@
     LevelEdWidget *mLevelEd;
 
-    EnvProperties* envProperties;
+    SelectedObjProp* objProperties;
  };
 

trunk/src/dreamforge/GameEngine.cc

@@ -123 +123 @@
                 Ogre::ResourceGroupManager::getSingleton().addResourceLocation("../../data", "FileSystem", "General");
                 Ogre::ResourceGroupManager::getSingleton().addResourceLocation("../../data/fonts", "FileSystem", "General");
-                //Ogre::ResourceGroupManager::getSingleton().addResourceLocation("../../data/gui", "FileSystem", "General");
                 Ogre::ResourceGroupManager::getSingleton().addResourceLocation("../../data/models", "FileSystem", "General");
+                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/terrain", "FileSystem", "General");
                 Ogre::ResourceGroupManager::getSingleton().addResourceLocation("../../data/world", "FileSystem", "General");