Changeset 6195 for code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc

Timestamp:

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

Author:

wirthmi

Message:

More camera easing, new center overlay and pauseControl/resumeControl

File:

• code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc (modified) (6 diffs)

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();
+    }
 }