Changeset 7857 for code/trunk/src/orxonox

Timestamp:

Feb 11, 2011, 5:17:39 PM (14 years ago)

Author:

landauf

Message:

• fixed a crash if mouse look was switched on and off for a ControllableEntity without CameraPosition
• disabled mouse look for Spectator
• disable mouse look if camera switches to a position which doesn't allow mouse look

Location:

code/trunk/src/orxonox/worldentities

Files:

• ControllableEntity.cc (modified) (2 diffs)
• pawns/Spectator.h (modified) (1 diff)

code/trunk/src/orxonox/worldentities/ControllableEntity.cc

@@ -204 +204 @@
                 this->currentCameraPosition_ = 0;
             }
+            
+            // disable mouse look if the new camera position doesn't allow it
+            if (this->currentCameraPosition_ && !this->currentCameraPosition_->getAllowMouseLook() && this->bMouseLook_)
+                this->mouseLook();
         }
     }
@@ -209 +213 @@
     void ControllableEntity::mouseLook()
     {
-        this->bMouseLook_ = !this->bMouseLook_;
-
-        if (!this->bMouseLook_)
-            this->cameraPositionRootNode_->setOrientation(Quaternion::IDENTITY);
-        if (this->getCamera())
-        {
-            if (!this->bMouseLook_&& this->currentCameraPosition_->getDrag())
-                this->getCamera()->setDrag(true);
-            else
-                this->getCamera()->setDrag(false);
+        // enable mouse look only if allowed - disabling it works always
+        if (this->currentCameraPosition_ && (this->currentCameraPosition_->getAllowMouseLook() || this->bMouseLook_))
+        {
+            this->bMouseLook_ = !this->bMouseLook_;
+
+            if (!this->bMouseLook_)
+                this->cameraPositionRootNode_->setOrientation(Quaternion::IDENTITY);
+            if (this->getCamera())
+            {
+                if (!this->bMouseLook_ && this->currentCameraPosition_->getDrag())
+                    this->getCamera()->setDrag(true);
+                else
+                    this->getCamera()->setDrag(false);
+            }
         }
     }

code/trunk/src/orxonox/worldentities/pawns/Spectator.h

@@ -56 +56 @@
             virtual void fired(unsigned int firemode);
             virtual void greet();
+            virtual void mouseLook() {}
 
         protected: