Changeset 6195

Timestamp:

Dec 2, 2009, 2:40:22 PM (14 years ago)

Author:

wirthmi

Message:

More camera easing, new center overlay and pauseControl/resumeControl

Location:

code/branches/presentation2/src/orxonox

Files:

• controllers/Controller.h (modified) (1 diff)
• controllers/HumanController.cc (modified) (2 diffs)
• controllers/HumanController.h (modified) (2 diffs)
• controllers/NewHumanController.cc (modified) (6 diffs)
• controllers/NewHumanController.h (modified) (2 diffs)
• graphics/Camera.cc (modified) (2 diffs)

code/branches/presentation2/src/orxonox/controllers/Controller.h

@@ -40 +40 @@
         friend class PlayerInfo;
         friend class ControllableEntity;
-        
+
         public:
             Controller(BaseObject* creator);

code/branches/presentation2/src/orxonox/controllers/HumanController.cc

@@ -69 +69 @@
         RegisterObject(HumanController);
 
+        controlPaused_ = false;
+
         HumanController::localController_s = this;
     }
@@ -250 +252 @@
             HumanController::localController_s->controllableEntity_->getScene()->getRadar()->releaseFocus();
     }
+
+    void HumanController::pauseControl()
+    {
+        if (HumanController::localController_s)
+            HumanController::localController_s->doPauseControl();
+    }
+
+    void HumanController::resumeControl()
+    {
+        if (HumanController::localController_s)
+            HumanController::localController_s->doResumeControl();
+    }
 }

code/branches/presentation2/src/orxonox/controllers/HumanController.h

@@ -75 +75 @@
             static void killBots(unsigned int amount = 0);
 
+            static void pauseControl();
+            static void resumeControl();
+            virtual void doPauseControl() {};
+            virtual void doResumeControl() {};
+
             static inline HumanController* getLocalControllerSingleton()
                 { return HumanController::localController_s; }
@@ -83 +88 @@
         protected:
             static HumanController* localController_s;
+            bool controlPaused_;
     };
 }

code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc

@@ -57 +57 @@
         : HumanController(creator)
         , crossHairOverlay_(NULL)
+        , centerOverlay_(NULL)
     {
         RegisterObject(NewHumanController);
@@ -72 +73 @@
             crossHairOverlay_->setBackgroundMaterial("Orxonox/Crosshair3");
             crossHairOverlay_->setSize(Vector2(overlaySize_, overlaySize_));
-            crossHairOverlay_->show();
+            crossHairOverlay_->hide();
+
+            centerOverlay_ = new OrxonoxOverlay(this);
+            centerOverlay_->setBackgroundMaterial("Orxonox/CenterOverlay");
+            centerOverlay_->setSize(Vector2(overlaySize_ * 2.5, overlaySize_ * 2.5));
+            centerOverlay_->setPosition(Vector2(0.5 - overlaySize_*2.5/2.0, 0.5 - overlaySize_*2.5/2.0));\
+            centerOverlay_->hide();
         }
 
@@ -81 +88 @@
 
         NewHumanController::localController_s = this;
+
+//HumanController::localController_s->getControllableEntity()->getCamera()->setDrag(true);
     }
 
@@ -99 +108 @@
             {
                 this->updateTarget();
-                this->crossHairOverlay_->setPosition(Vector2(static_cast<float>(this->currentYaw_)/2*-1+.5-overlaySize_/2, static_cast<float>(this->currentPitch_)/2*-1+.5-overlaySize_/2));
-                this->crossHairOverlay_->show();
-            }
-            else
+                if ( !controlPaused_ ) {
+                    this->crossHairOverlay_->setPosition(Vector2(static_cast<float>(this->currentYaw_)/2*-1+.5-overlaySize_/2, static_cast<float>(this->currentPitch_)/2*-1+.5-overlaySize_/2));
+                    this->crossHairOverlay_->show();
+                    this->centerOverlay_->show();
+                }
+            }
+            else {
                 this->crossHairOverlay_->hide();
-            // TODO: update aimPosition of Pawn
+                this->centerOverlay_->hide();
+            }
 
             if ( this->acceleration_ > 0 )
@@ -229 +242 @@
                 }
 
-                itr->movable->getParentSceneNode()->showBoundingBox(true);
+                //itr->movable->getParentSceneNode()->showBoundingBox(true);
                 //std::cout << itr->movable->getParentSceneNode()->_getDerivedPosition() << endl;
                 //return mouseRay.getOrigin() + mouseRay.getDirection() * itr->distance; //or itr->movable->getParentSceneNode()->_getDerivedPosition()
@@ -308 +321 @@
         }
     }
+
+    void NewHumanController::doResumeControl() {
+        this->controlPaused_ = false;
+        this->crossHairOverlay_->show();
+        this->centerOverlay_->show();
+    }
+
+    void NewHumanController::doPauseControl() {
+        this->controlPaused_ = true;
+        this->crossHairOverlay_->hide();
+        this->centerOverlay_->hide();
+    }
 }

code/branches/presentation2/src/orxonox/controllers/NewHumanController.h

@@ -59 +59 @@
 
             virtual void changedControllableEntity();
+            virtual void doPauseControl();
+            virtual void doResumeControl();
 
         protected:
@@ -69 +71 @@
             float                       currentPitch_;
             OrxonoxOverlay*             crossHairOverlay_;
+            OrxonoxOverlay*             centerOverlay_;
             float                       overlaySize_;
             bool                        accelerating_;

code/branches/presentation2/src/orxonox/graphics/Camera.cc

@@ -114 +114 @@
         {
             // this stuff here may need some adjustments
-            float coeff = 15.0f * dt / this->getTimeFactor();
+            float poscoeff = 15.0f * dt / this->getTimeFactor();
+            float anglecoeff = 7.0f * dt / this->getTimeFactor();
             // Only clamp if fps rate is actually falling. Occasional high dts should
             // not be clamped to reducing lagging effects.
-            if (coeff > 1.0f)
+            if (poscoeff > 1.0f)
             {
                 if (this->lastDtLagged_)
-                    coeff = 1.0f;
+                    poscoeff = 1.0f;
+                else
+                    this->lastDtLagged_ = true;
+            }
+            else
+                this->lastDtLagged_ = false;
+
+            if (anglecoeff > 1.0f)
+            {
+                if (this->lastDtLagged_)
+                    anglecoeff = 1.0f;
                 else
                     this->lastDtLagged_ = true;
@@ -128 +139 @@
 
             Vector3 offset = this->getWorldPosition() - this->cameraNode_->_getDerivedPosition();
-            this->cameraNode_->translate(coeff * offset);
+            this->cameraNode_->translate(poscoeff * offset);
 
-            this->cameraNode_->setOrientation(Quaternion::Slerp(coeff, this->cameraNode_->_getDerivedOrientation(), this->getWorldOrientation(), true));
+            this->cameraNode_->setOrientation(Quaternion::Slerp(anglecoeff, this->cameraNode_->_getDerivedOrientation(), this->getWorldOrientation(), true));
         }