Changeset 10404 in orxonox.OLD

Timestamp:

Jan 27, 2007, 2:20:24 PM (17 years ago)

Author:

patrick

Message:

correct fading

Location:

trunk/src/world_entities

Files:

• blackscreen.cc (modified) (5 diffs)
• blackscreen.h (modified) (1 diff)
• cameraman.cc (modified) (2 diffs)
• cameraman.h (modified) (2 diffs)
• sound_entity.cc (modified) (1 diff)

trunk/src/world_entities/blackscreen.cc

@@ -23 +23 @@
 #include "material.h"
 #include "state.h"
-#include "camera.h"
-#include "static_model.h"
+// #include "camera.h"
+#include "primitive_model.h"
 
 ObjectListDefinition(BlackScreen);
@@ -74 +74 @@
   this->material->setBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 
-  this->build();
+  PrimitiveModel* model = new PrimitiveModel(PRIM_SPHERE, 6., 10);
+  this->setModel(model);
 
   i=0;
@@ -101 +102 @@
   glEnable(GL_BLEND);   // Turn Blending On
 
-  glMatrixMode(GL_MODELVIEW);
-  glPushMatrix();
-  /* translate */
-  glTranslatef (this->getAbsCoor ().x,
-                this->getAbsCoor ().y,
-                this->getAbsCoor ().z);
-  Vector tmpRot = this->getAbsDir().getSpacialAxis();
-  glRotatef (this->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
+//   glMatrixMode(GL_MODELVIEW);
+//   glPushMatrix();
+//   /* translate */
+//   glTranslatef (this->getAbsCoor ().x,
+//                 this->getAbsCoor ().y,
+//                 this->getAbsCoor ().z);
+//   Vector tmpRot = this->getAbsDir().getSpacialAxis();
+//   glRotatef (this->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
 
   this->material->select();
@@ -139 +140 @@
 
   this->material->setTransparency(i);
-  Camera* cam = State::getCamera();
-  if( cam != NULL)
-    this->setParent(cam);
+//   Camera* cam = State::getCamera();
+//   if( cam != NULL)
+//     this->setParent(cam);
 }
 
@@ -188 +189 @@
     return 0;
 }
-
-
-void BlackScreen::build()
-{
-  StaticModel* model = new StaticModel();
-
-  float size = 10.;
-
-  model->addVertex (-size, -size, size);
-  model->addVertex (size, -size, size);
-  model->addVertex (-size, size, size);
-  model->addVertex (size, size, size);
-  model->addVertex (-size, size, -size);
-  model->addVertex (size, size, -size);
-  model->addVertex (-size, -size, -size);
-  model->addVertex (size, -size, -size);
-
-
-  model->addVertexNormal (0.0, 0.0, 1.0);
-  model->addVertexNormal (0.0, 1.0, 0.0);
-  model->addVertexNormal (0.0, 0.0, -1.0);
-  model->addVertexNormal (0.0, -1.0, 0.0);
-  model->addVertexNormal (1.0, 0.0, 0.0);
-  model->addVertexNormal (-1.0, 0.0, 0.0);
-
-  model->addVertexTexture (0.0, 1.0);
-  model->addVertexTexture (1.0, 1.0);
-  model->addVertexTexture (1.0, 0.0);
-  model->addVertexTexture (0.0, 0.0);
-
-  model->addFace (4, VERTEX_TEXCOORD_NORMAL, 6,0,4, 0,1,4, 2,2,4, 4,3,4); // back
-  model->addFace (4, VERTEX_TEXCOORD_NORMAL, 1,0,5, 7,1,5, 5,2,5, 3,3,5); // front
-  model->addFace (4, VERTEX_TEXCOORD_NORMAL, 6,0,1, 7,1,1, 1,2,1, 0,3,1); // bottom
-  model->addFace (4, VERTEX_TEXCOORD_NORMAL, 2,0,3, 3,1,3, 5,2,3, 4,3,3); // top
-  model->addFace (4, VERTEX_TEXCOORD_NORMAL, 4,2,2, 5,3,2, 7,0,2, 6,1,2); // left
-  model->addFace (4, VERTEX_TEXCOORD_NORMAL, 0,0,0, 1,1,0, 3,2,0, 2,3,0); // right
-
-  model->finalize();
-
-  this->setModel(model);
-}

trunk/src/world_entities/blackscreen.h

@@ -36 +36 @@
     virtual void draw() const;
 
-  private:
-    void build();
 
 };

trunk/src/world_entities/cameraman.cc

@@ -22 +22 @@
 #include "script_class.h"
 #include "loading/load_param_xml.h"
+#include "blackscreen.h"
+#include "p_node.h"
+#include "camera.h"
 
 ObjectListDefinition(CameraMan);
+
+SHELL_COMMAND(camerainfo, CameraMan, cameraInfo);
 
 
@@ -207 +212 @@
 
 
+void CameraMan::cameraInfo()
+{
+  bool sameCam = (this->currentCam == State::getCamera());
+
+
+  PRINT(0)("==== CameraMan::cameraInfo ===\n");
+  PRINT(0)("=  Camera Name: %s\n", this->currentCam->getName().c_str());
+  PRINT(0)("=  Tests:\n");
+  PRINT(0)("==  State::Cam == this::Cam  %i\n", sameCam);
+  PRINT(0)("==  Parenting Informations:\n");
+  this->currentCam->debugNode(10);
+  PRINT(0)("==============================\n");
+}
+
+
+float CameraMan::getCurrCameraCoorX()
+{ return this->currentCam->getAbsCoorX(); }
+
+float CameraMan::getCurrCameraCoorY()
+{ return this->currentCam->getAbsCoorY(); }
+
+float CameraMan::getCurrCameraCoorZ()
+{ return this->currentCam->getAbsCoorZ(); }
+
+
+
 //how to get a class fkt pointer
 

trunk/src/world_entities/cameraman.h

@@ -2 +2 @@
 #define _CAMERAMAN_H
 
-#include "p_node.h"
-#include "camera.h"
+
 #include <vector>
 #include "base_object.h"
-#include "blackscreen.h"
+
+class BlackScreen;
+class Camera;
+class PNode;
 
 class CameraMan : public BaseObject {
@@ -37 +39 @@
     void togglFade();
 
+    void cameraInfo();
+
     /// LOADING
     virtual void loadParams(const TiXmlElement* root);
 
     /// POLLING
-    float getCurrCameraCoorX(){ return this->currentCam->getAbsCoorX(); }
-    float getCurrCameraCoorY(){ return this->currentCam->getAbsCoorY(); }
-    float getCurrCameraCoorZ(){ return this->currentCam->getAbsCoorZ(); }
+    float getCurrCameraCoorX();
+    float getCurrCameraCoorY();
+    float getCurrCameraCoorZ();
     bool cameraIsInVector(Camera* camera);
 

trunk/src/world_entities/sound_entity.cc

@@ -22 +22 @@
 
 #include "sound/resource_sound_buffer.h"
+