Changeset 10403 in orxonox.OLD

Timestamp:

Jan 27, 2007, 12:21:10 AM (17 years ago)

Author:

patrick

Message:

fading now works

Location:

trunk/src

Files:

• story_entities/menu/game_menu.cc (modified) (1 diff)
• world_entities/blackscreen.cc (modified) (5 diffs)
• world_entities/blackscreen.h (modified) (1 diff)
• world_entities/camera.cc (modified) (2 diffs)
• world_entities/cameraman.cc (modified) (5 diffs)
• world_entities/cameraman.h (modified) (2 diffs)
• world_entities/sound_entity.cc (modified) (3 diffs)
• world_entities/sound_entity.h (modified) (1 diff)

trunk/src/story_entities/menu/game_menu.cc

@@ -151 +151 @@
     this->mainMenuBox = new OrxGui::GLGuiBox();
     {
-      OrxGui::GLGuiButton* startButton = new OrxGui::GLGuiPushButton("Play");
+      OrxGui::GLGuiButton* startButton = new OrxGui::GLGuiPushButton("Start");
       startButton->released.connect(this, &GameMenu::showCampaigns);
       this->mainMenuBox->pack(startButton);
       startButton->select();
 
-      OrxGui::GLGuiButton* networkButton = new OrxGui::GLGuiPushButton("MultiPlayer");
-      networkButton->released.connect(this, &GameMenu::showMultiPlayer);
-      this->mainMenuBox->pack(networkButton);
-
-      OrxGui::GLGuiButton* optionsButton = new OrxGui::GLGuiPushButton("Options");
-      optionsButton->released.connect(this, &GameMenu::showOptionsMenu);
-      this->mainMenuBox->pack(optionsButton);
+//       OrxGui::GLGuiButton* networkButton = new OrxGui::GLGuiPushButton("MultiPlayer");
+//       networkButton->released.connect(this, &GameMenu::showMultiPlayer);
+//       this->mainMenuBox->pack(networkButton);
+
+//       OrxGui::GLGuiButton* optionsButton = new OrxGui::GLGuiPushButton("Options");
+//       optionsButton->released.connect(this, &GameMenu::showOptionsMenu);
+//       this->mainMenuBox->pack(optionsButton);
 
 

trunk/src/world_entities/blackscreen.cc

@@ -23 +23 @@
 #include "material.h"
 #include "state.h"
+#include "camera.h"
+#include "static_model.h"
 
 ObjectListDefinition(BlackScreen);
@@ -71 +73 @@
   this->material->setDiffuse(0,0,0);
   this->material->setBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+
+  this->build();
 
   i=0;
@@ -106 +110 @@
   glRotatef (this->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
 
-this->material->setTransparency(i);
-this->material->select();
-
-  glBegin(GL_QUADS);
-  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();
+  this->material->select();
+
+
+  WorldEntity::draw(this->getModel( ));
+
+//   glBegin(GL_QUADS);
+
+//   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();
 
   glPopMatrix();
@@ -130 +137 @@
 else
   fadeIn();
+
+  this->material->setTransparency(i);
+  Camera* cam = State::getCamera();
+  if( cam != NULL)
+    this->setParent(cam);
 }
 
@@ -176 +188 @@
     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/camera.cc

@@ -258 +258 @@
   Vector cameraPosition = this->getAbsCoor();
   Vector targetPosition = this->target->getAbsCoor();
+
 
         //Setting the Camera Eye, lookAt and up Vectors
@@ -497 +498 @@
   if (fabs(translateTo.len()  - (target->getAbsCoor()).len()) >= 11 )
  {
-   printf("translate\n");
    Vector tmpVec= iterate(dt,  &translateTo,  &(masta->getAbsCoor()));
    target->shiftCoor(speed*tmpVec.x, speed*tmpVec.y, speed*tmpVec.z);

trunk/src/world_entities/cameraman.cc

@@ -29 +29 @@
                         addMethod("changeCurrTarget", Executor2<CameraMan, lua_State*,const std::string&,const std::string&>(&CameraMan::changeCurrTarget))
                         ->addMethod("changeTarget", Executor3<CameraMan, lua_State*, const std::string&, const std::string&,const std::string&>(&CameraMan::changeTarget))
-                        ->addMethod("setCam", Executor1<CameraMan, lua_State*, const std::string&>(&CameraMan::setCam)) 
+                        ->addMethod("setCam", Executor1<CameraMan, lua_State*, const std::string&>(&CameraMan::setCam))
                         ->addMethod("togglFade", Executor0<CameraMan, lua_State*>(&CameraMan::togglFade))
                         ->addMethod("getCurrCameraCoorX", Executor0ret<CameraMan, lua_State*,float>(&CameraMan::getCurrCameraCoorX))
@@ -44 +44 @@
   this->farClip = 1000.0;
 
-  currentCam=State::getCamera();
-  this->cameras.push_back(currentCam);
-
-  State::setCamera(currentCam, currentCam->getTarget());
   this->fadeToBlack=new BlackScreen();
-  this->fadeToBlack->setParent(this->currentCam);
-  this->fadeToBlack->setRelCoor(3., 0., 0.);
-  
+
+  this->setCam( State::getCamera());
+
   if (root != NULL)
     this->loadParams(root);
@@ -60 +56 @@
 {
   BaseObject::loadParams(root);
-  
+
   LOAD_PARAM_START_CYCLE(root, object);
   {
@@ -83 +79 @@
   if (cameraNo<cameras.size())
   {
-  currentCam=cameras[cameraNo];
+    this->setCam( cameras[cameraNo]);
+  }
+}
+
+void CameraMan::setCam(const std::string& camName)
+{
+  BaseObject* object = ObjectListBase::getBaseObject("Camera", camName);
+
+  if(object != NULL)
+  {
+    Camera* currentCam = dynamic_cast<Camera*>(object) ;
+
+    this->setCam(currentCam);
+    return;
+  }
+  printf("ERROR CAMERAMANAGER: Couldn't set camera : %s \n", camName.c_str());
+}
+
+
+void CameraMan::setCam(Camera* camera)
+{
+  if( camera == NULL)
+  {
+    PRINTF(0)("trying to add a zero camera! uiuiui!\n");
+  }
+  this->currentCam = camera;
+
   State::setCamera(currentCam, currentCam->getTarget());
   OrxSound::SoundEngine::getInstance()->setListener(currentCam);
 
+  // check if it is already added
+  if( ! this->cameraIsInVector(currentCam) )
+    this->cameras.push_back(currentCam);
+
+  this->fadeToBlack->setRelCoor(0., 0., 0.);
   this->fadeToBlack->setParent(this->currentCam);
-  this->fadeToBlack->setRelCoor(3., 0., 0.);
-  }
-
-}
-
-void CameraMan::setCam(const std::string& camName)
-{
-  BaseObject* object = ObjectListBase::getBaseObject("Camera", camName);
-  
-  if(object != NULL)
-  {
-    
-    currentCam = dynamic_cast<Camera*>(object) ;
-    
-    if( ! this->cameraIsInVector(currentCam) )
-      this->cameras.push_back(currentCam);
-    
-    State::setCamera(currentCam, currentCam->getTarget());
-    OrxSound::SoundEngine::getInstance()->setListener(currentCam);
-    this->fadeToBlack->setParent(this->currentCam);
-    this->fadeToBlack->setRelCoor(3., 0., 0.);
-    return;
-  }
-  printf("ERROR CAMERAMANAGER: Couldn't set camera : %s \n", camName.c_str());
-  
-}
+}
+
 
 void CameraMan::moveCurrCam(int x, int y, int z)
 {
-currentCam->target->trans(x,y,z);
+  currentCam->target->trans(x,y,z);
 }
 
@@ -123 +126 @@
 void CameraMan::moveCam(int x, int y, int z, int camNo)
 {
-cameras[camNo]->target->trans(x,y,z);
+  cameras[camNo]->target->trans(x,y,z);
 }
 

trunk/src/world_entities/cameraman.h

@@ -22 +22 @@
     void setCam(int CameraNo);
     void setCam(const std::string& camName);
+    void setCam(Camera* camera);
+
     void createCam(const TiXmlElement* root);
     void moveCam(int x, int y, int z,  int camNo);
@@ -34 +36 @@
     void setClipRegion(float nearClip, float farClip);
     void togglFade();
-    
+
     /// LOADING
     virtual void loadParams(const TiXmlElement* root);
-    
+
     /// POLLING
     float getCurrCameraCoorX(){ return this->currentCam->getAbsCoorX(); }

trunk/src/world_entities/sound_entity.cc

@@ -41 +41 @@
   this->soundSource.setSourceNode(this);
 
+  this->bInit = false;
+
   if( root != NULL)
     this->loadParams(root);
@@ -75 +77 @@
 {
   this->soundBuffer = OrxSound::ResourceSoundBuffer(fileName);
+  this->bInit = true;
 }
 
@@ -80 +83 @@
 void SoundEntity::activate()
 {
+  this->soundSource.play();
 }
 

trunk/src/world_entities/sound_entity.h

@@ -37 +37 @@
   private:
 
+    bool                     bInit;
     OrxSound::SoundSource    soundSource;
     OrxSound::SoundBuffer    soundBuffer;