Changeset 10068 in orxonox.OLD for branches/camera/src

Timestamp:

Dec 13, 2006, 3:49:03 PM (18 years ago)

Author:

gfilip

Message:

little update2

Location:

branches/camera/src/world_entities

Files:

• camera.cc (modified) (4 diffs)
• camera.h (modified) (1 diff)

branches/camera/src/world_entities/camera.cc

@@ -20 +20 @@
 #include "vector.h"
 #include <iostream.h>
-
+#include "state.h"
+#include "shell_command.h"
 
 ObjectListDefinition(Camera);
+
 
 /**
@@ -185 +187 @@
 
         //Setting the Camera Eye, lookAt and up Vectors
-  glLookAt(cameraPosition.x, cameraPosition.y, cameraPosition.z,
+  gluLookAt(cameraPosition.x, cameraPosition.y, cameraPosition.z,
             targetPosition.x, targetPosition.y, targetPosition.z,
             this->upVector.x, this->upVector.y, this->upVector.z);
@@ -299 +301 @@
 // CAMERA-TARGET //
 ///////////////////
+//REATE_FACTORY(CameraTarget);
+
 
 ObjectListDefinition(CameraTarget);
+
+SHELL_COMMAND(det, CameraTarget, detach);
+
+
 CameraTarget::CameraTarget()
 {
@@ -310 +318 @@
 
 
-CameraTarget::detach()
-{
-  State::getCameraTargetNode()->setParentSoft(NULL);
-}
-
-
-
-
-
+void CameraTarget::detach()
+{
+  State::getCameraTargetNode()->setParentSoft(Null);
+}
+
+
+
+
+

branches/camera/src/world_entities/camera.h

@@ -92 +92 @@
 private:
   CameraTarget();
+  virtual ~CameraTarget() {}
 
 public:
+  void detach();
 };