Changeset 10343 in orxonox.OLD for branches

Timestamp:

Jan 24, 2007, 6:12:07 PM (18 years ago)

Author:

gfilip

Message:

blackscreen orientation

Location:

branches/camera/src

Files:

• story_entities/game_world_data.cc (modified) (2 diffs)
• util/state.cc (modified) (2 diffs)
• util/state.h (modified) (3 diffs)
• world_entities/blackscreen.cc (modified) (2 diffs)
• world_entities/cameraman.cc (modified) (13 diffs)
• world_entities/cameraman.h (modified) (2 diffs)
• world_entities/test_entity.h (modified) (1 diff)

branches/camera/src/story_entities/game_world_data.cc

@@ -102 +102 @@
     localCamera->setName ("GameWorld-Camera");
   State::setCamera(localCamera, localCamera->getTarget());
-  cameraman* camMan = new cameraman();
+  CameraMan* camMan = new CameraMan();
   State::setCameraman(camMan);
   LightManager::getInstance();
@@ -334 +334 @@
   LoadParamXML(root, "GameRule", this, GameWorldData, loadGameRule);
 
-  LoadParam(root, "clip-region", State::getCameraman(), cameraman, setClipRegion);
+  LoadParam(root, "clip-region", State::getCameraman(), CameraMan, setClipRegion);
 
 

branches/camera/src/util/state.cc

@@ -33 +33 @@
 CameraTarget* State::cameraTarget = NULL;
 
-cameraman* State::CameraMan = NULL;
+CameraMan* State::cameraManager = NULL;
 
 PNode* State::cameraNode = NULL;
@@ -68 +68 @@
 
 
-void State::setCameraman(cameraman* cm)
+void State::setCameraman(CameraMan* cm)
 
 {
-  State::CameraMan=cm;
+  State::cameraManager=cm;
 }

branches/camera/src/util/state.h

@@ -18 +18 @@
 class ObjectManager;
 class GameRules;
-class cameraman;
+class CameraMan;
 class ScriptManager;
 
@@ -48 +48 @@
   /// CAMERAMANAGER ///
   /////////////////////
-  /** @param cameraman the PNode to the CameraManager,*/
-  static void setCameraman(cameraman*);
-  static inline cameraman* getCameraman() { return State::CameraMan; };
+  /** @param CameraMan the PNode to the cameraManagerager,*/
+  static void setCameraman(CameraMan*);
+  static inline CameraMan* getCameraman() { return State::cameraManager; };
 
 
@@ -126 +126 @@
   static Camera*                camera;             //!< The current Camera.
   static CameraTarget*          cameraTarget;       //!< The Camera Target.
-  static cameraman*             CameraMan;
+  static CameraMan*             cameraManager;
   static PNode*                 cameraNode;         //!< A reference to the camera
   static PNode*                 cameraTargetNode;   //!< A reference to the cameraTarget

branches/camera/src/world_entities/blackscreen.cc

@@ -89 +89 @@
 }
 
+
+
+
 void BlackScreen::draw() const
 {
@@ -100 +103 @@
 
   glBegin(GL_QUADS);
-  glVertex3f(State::getCameraNode()->getAbsCoorX()+3,State::getCameraNode()->getAbsCoorY() -100.0f,
-             State::getCameraNode()->getAbsCoorZ()-100.0f);
-  glVertex3f(State::getCameraNode()->getAbsCoorX()+3, State::getCameraNode()->getAbsCoorY()-100.0f,
-             State::getCameraNode()->getAbsCoorZ()+100.0f);
-  glVertex3f(State::getCameraNode()->getAbsCoorX()+3, State::getCameraNode()->getAbsCoorY() +100.0f,
-             State::getCameraNode()->getAbsCoorZ()+100.0f);
-  glVertex3f(State::getCameraNode()->getAbsCoorX()+3, State::getCameraNode()->getAbsCoorY()+100.0f,
-             State::getCameraNode()->getAbsCoorZ()-100.0f);
+  glVertex3f(0.,-100.0f,-100.0f);
+  glVertex3f(0., -100.0f,100.0f);
+  glVertex3f(0., 100.0f,100.0f);
+  glVertex3f(0., 100.0f,-100.0f);
 
   glEnd();

branches/camera/src/world_entities/cameraman.cc

@@ -18 +18 @@
 #include "game_world_data.h"
 #include "state.h"
-#include "iostream.h"
 #include "sound_engine.h"
 #include <string>
 
-ObjectListDefinition(cameraman);
+ObjectListDefinition(CameraMan);
 
 
-cameraman::cameraman()
+CameraMan::CameraMan()
 {
-  this->registerObject(this, cameraman::_objectList);
+  this->registerObject(this, CameraMan::_objectList);
 
   this->nearClip = 1.0;
@@ -39 +38 @@
 
 
-void cameraman::createCam()
+void CameraMan::createCam()
 {
  // Camera* newCamera=new Camera();
@@ -48 +47 @@
 }
 
-void cameraman::setCam(int cameraNo)
+void CameraMan::setCam(int cameraNo)
 {
   if (cameraNo<cameras.size())
@@ -55 +54 @@
   State::setCamera(currentCam, currentCam->getTarget());
   OrxSound::SoundEngine::getInstance()->setListener(currentCam);
-
+  this->fadeToBlack->setParent(this->currentCam);
+  this->fadeToBlack->setRelCoor(3., 0., 0.);
   }
 
@@ -61 +61 @@
 
 
-void cameraman::testCam()
+void CameraMan::testCam()
 {
 cameras[1]->lookAt(currentCam->getTarget());
@@ -68 +68 @@
 
 
-void cameraman::moveCurrCam(int x, int y, int z)
+void CameraMan::moveCurrCam(int x, int y, int z)
 {
 currentCam->target->trans(x,y,z);
@@ -74 +74 @@
 
 
-void cameraman::moveCam(int x, int y, int z, int camNo)
+void CameraMan::moveCam(int x, int y, int z, int camNo)
 {
 cameras[camNo]->target->trans(x,y,z);
@@ -80 +80 @@
 
 
-void cameraman::changeTarget(int camNo, std::string className, std::string objectName)
+void CameraMan::changeTarget(int camNo, std::string className, std::string objectName)
 {
   BaseObject* object = ObjectListBase::getBaseObject(className, objectName);
@@ -88 +88 @@
 
 
-void cameraman::changeCurrTarget(std::string className, std::string objectName)
+void CameraMan::changeCurrTarget(std::string className, std::string objectName)
 {
   BaseObject* object = ObjectListBase::getBaseObject(className, objectName);
@@ -95 +95 @@
 }
 
-void cameraman::atachCurrTarget(PNode* target)
+void CameraMan::atachCurrTarget(PNode* target)
 {
   currentCam->target->atach(target);
 }
 
-void cameraman::jumpCam(int x, int y, int z, int camNo)
+void CameraMan::jumpCam(int x, int y, int z, int camNo)
 {
   cameras[camNo]->target->jump(x, y, z);
@@ -107 +107 @@
 
 
-void cameraman::setClipRegion(float nearCli, float farCli)
+void CameraMan::setClipRegion(float nearCli, float farCli)
 {
   this->nearClip=nearCli;
@@ -117 +117 @@
 
 
-void cameraman::jumpCurrCam(int x, int y, int z)
+void CameraMan::jumpCurrCam(int x, int y, int z)
 {
   currentCam->target->jump(x, y, z);
@@ -125 +125 @@
 
 
-void cameraman::togglFade()
+void CameraMan::togglFade()
 {
   if( this->fadeToBlack)

branches/camera/src/world_entities/cameraman.h

@@ -8 +8 @@
 #include "blackscreen.h"
 
-class cameraman : public BaseObject {
-  ObjectListDeclaration(cameraman);
+class CameraMan : public BaseObject {
+  ObjectListDeclaration(CameraMan);
 
   private:
@@ -19 +19 @@
   public:
     std::vector<Camera*> cameras;
-    cameraman();
+    CameraMan();
     void setCam(int CameraNo);
     void createCam();

branches/camera/src/world_entities/test_entity.h

@@ -14 +14 @@
   private:
 
-  cameraman* CM;
+  CameraMan* CM;
 
   public: