Changeset 9

Timestamp:

01/11/09 23:58:41 (3 years ago)

Author:

nktug

Message:

Add more functionality to move the camera

Location:

trunk/src

Files:

• LevelEditor.cc (modified) (13 diffs)
• LevelEditor.hh (modified) (2 diffs)

trunk/src/LevelEditor.cc

@@ -28 +28 @@
 {
         setAttribute(Qt::WA_PaintOnScreen, true);
-
+  
         mRenderWindow = 0;
         mSceneMgr = 0;
+  mCamera = 0;
+  //mCamNode = 0;
         mVp = 0;
         
@@ -37 +39 @@
         mouseMiddleBtn = false;
         
-        mDirection = Ogre::Vector3::ZERO;
+        mTranslateVector = mDirection = Ogre::Vector3::ZERO;
         
         mousePos = QPoint(0, 0);
         mousePressPos = QPoint(0, 0);
+  
         angleX = 0.0; // Added these because the display started spinning
         angleY = 0.0; // when I upgraded to Qt4.2, they were left undefined.
+  mMoveScale = 10.0f; // 
         
   mName = "";
   mFile = "";
   mType = "";
+  
         closestObject = 0;// Trace the curent selected object.
   mTempEnt = 0;
@@ -80 +85 @@
 
 LevelEdWidget::~LevelEdWidget()
-{
-/*
-        if(mRoot != 0){
-                delete mRoot;
-                mRoot = 0;
-        }
-  */
-  /*if(mTempEnt || mTempObject)
-  {
-    mSceneMgr->destroyEntity (mTempEnt);
-    mSceneMgr->destroySceneNode(mTempObject->getName());
-    mAnimState = 0;
-    mTempEnt = 0;
-    mTempObject = 0;
-  }*/
-      
+{  
   // Destroy all object loaded in game
   CObjectManager::getInstance()->cleanAll();
@@ -308 +298 @@
   
         mCamera = mSceneMgr->createCamera("PlayerCam 1");
-
         mCamera->setPosition(Ogre::Vector3(17519,913,16033));
-        mCamera->lookAt(Ogre::Vector3(16073,0,16600));
+        mCamera->lookAt(Ogre::Vector3(16073,0,16600));  
         mCamera->setAutoAspectRatio(true);
         mCamera->setNearClipDistance(1);
-
+  /*
+  mCamNode = mSceneMgr->getRootSceneNode()->createChildSceneNode( "Camera node");
+        mCamNode->setPosition(Ogre::Vector3(17519,913,16033));
+        mCamNode->lookAt(Ogre::Vector3(16073,0,16600), Ogre::Node::TS_LOCAL);*/
+  
+  
         mVp = mRenderWindow->addViewport(mCamera);
         mVp->setBackgroundColour(Ogre::ColourValue(0.93, 0.86, 0.76));
@@ -413 +407 @@
 
 //------------------------------------------------------------------------------------------------ 
-//                            UPDATE
+/////////////////////////////       UPDATE                /////////////////////////////////////
 //------------------------------------------------------------------------------------------------ 
 void LevelEdWidget::update()
@@ -421 +415 @@
                 mRoot->_fireFrameStarted();
                 mRenderWindow->update();
-
-                mCamera->moveRelative(mDirection);
+    
+                mCamera->moveRelative(mTranslateVector);//, Ogre::Node::TS_LOCAL);
                 mCamera->yaw(Ogre::Radian(angleX));
                 mCamera->pitch(Ogre::Radian(angleY));
-                
+       
                 //updateStats();
     // Update all object in Game
@@ -456 +450 @@
         Q_UNUSED(evt);
   
+  //mMoveScale = 2 * evt->timerId();
+  
         this->update();
         //updateAnim();
@@ -477 +473 @@
 void LevelEdWidget::keyPressEvent(QKeyEvent* evt)
 {
-
+  /////// YGRAE 
+  if(evt->key() == Qt::Key_Shift)
+  {
+    keyShiftPressed = true;
+  }
+  
+  if(evt->key() == Qt::Key_Control)
+  {
+    keyCtrlPressed = true;
+  }
+  ///////////
+
+  if(evt->key() == Qt::Key_Up)
+  {
+    mTranslateVector.z -= mMoveScale;
+  }  
+  if(evt->key() == Qt::Key_Down)
+  {
+    mTranslateVector.z += mMoveScale;
+  }
+  if(evt->key() == Qt::Key_Left)
+  {
+    mTranslateVector.x -= mMoveScale;
+  }
+  if(evt->key() == Qt::Key_Right)
+  {
+    mTranslateVector.x += mMoveScale;
+  }  
+  if(evt->key() == Qt::Key_PageUp)
+  {
+    mTranslateVector.y += mMoveScale;
+  }  
+  if(evt->key() == Qt::Key_PageDown)
+  {
+    mTranslateVector.y -= mMoveScale;
+  }    
 }
 
@@ -483 +514 @@
 void LevelEdWidget::keyReleaseEvent(QKeyEvent* evt)
 {
+  if(evt->key() == Qt::Key_Up)
+  {
+    mTranslateVector.z += mMoveScale;
+  }  
+  if(evt->key() == Qt::Key_Down)
+  {
+    mTranslateVector.z -= mMoveScale;
+  }
+  if(evt->key() == Qt::Key_Left)
+  {
+    mTranslateVector.x += mMoveScale;
+  }
+  if(evt->key() == Qt::Key_Right)
+  {
+    mTranslateVector.x -= mMoveScale;
+  }  
+  if(evt->key() == Qt::Key_PageUp)
+  {
+    mTranslateVector.y -= mMoveScale;
+  }  
+  if(evt->key() == Qt::Key_PageDown)
+  {
+    mTranslateVector.y += mMoveScale;
+  } 
+  
+  //// YGRAE
+  if(evt->key() == Qt::Key_Shift)
+  {
+    keyShiftPressed = false;
+  }
+  if(evt->key() == Qt::Key_Control)
+  {
+    keyCtrlPressed = false;
+  }
+  ///////////
+  
   if(evt->key() == Qt::Key_Escape)
   {
@@ -689 +756 @@
   if(mouseLeftPressed && mInsertMode)
   {
-
-  }
-  
-        mouseLeftPressed = false;
-        mouseRightPressed = false;
-        mouseMiddleBtn = false;
+    // TODO : next time insert one object here and handle multiple insertion
+  }
+  
+        //mouseLeftPressed = false;
+        //mouseRightPressed = false;
+        //mouseMiddleBtn = false;
+  
+  ////////////// YGRAE
+  if(evt->button() == Qt::RightButton)
+  {
+      mouseRightPressed = false;
+  }
+  else if(evt->button() == Qt::LeftButton)
+  {
+    mouseLeftPressed = false;
+  }
+  else if(evt->button() == Qt::MidButton)
+  {
+      mouseMiddleBtn = false;
+  }
+  ///////////////
 }
 
@@ -704 +786 @@
 
         }
-  
   
         if(mouseRightPressed)
@@ -729 +810 @@
                 angleY = 0.00;
         }
-        
+  
   if(mEditionMode)
   {
@@ -748 +829 @@
 void LevelEdWidget::wheelEvent(QWheelEvent* evt)
 {
-        mDirection.z = -evt->delta();///2;
-        update();
-        mDirection.z = 0;
-}
+        mTranslateVector.z = -evt->delta();///2;
+        this->update();
+        mTranslateVector.z = 0;
+  
+}

trunk/src/LevelEditor.hh

@@ -89 +89 @@
         Ogre::SceneManager* mSceneMgr;
         Ogre::Camera* mCamera;
+        //Ogre::SceneNode* mCamNode;  
         Ogre::Viewport* mVp;
         Ogre::Root* mRoot;
         
         ///// Deplacement Camera
-        Ogre::Vector3 mDirection;
+        Ogre::Vector3 mDirection, mTranslateVector;
         QPoint mousePressPos;
         QPoint mousePos;
         float angleX, angleY;
-        float moveScale;
+  float mMoveScale;
+  
         ///////////////////////
   std::string mName;
@@ -106 +108 @@
         bool mouseRightPressed;
         bool mouseMiddleBtn;
+  bool keyCtrlPressed;
+  bool keyShiftPressed;
         
   // Action mode