Changeset 10348 in orxonox.OLD for branches

Timestamp:

Jan 24, 2007, 6:55:15 PM (18 years ago)

Author:

gfilip

Message:

new

Location:

branches/camera/src/world_entities

Files:

• blackscreen.cc (modified) (2 diffs)
• camera.cc (modified) (2 diffs)
• cameraman.cc (modified) (2 diffs)
• cameraman.h (modified) (1 diff)
• test_entity.cc (modified) (2 diffs)

branches/camera/src/world_entities/blackscreen.cc

@@ -129 +129 @@
   if (i>0)
     i=i-0.005*fadeSpeed;
+  else
+    this->toList(OM_DEAD);
 }
 
@@ -139 +141 @@
 void  BlackScreen::toggleFade ()
 {
+    this->state= !this->state;
 
-    this->state= !this->state;
+    if(state)
+    {
+      this->toList(OM_COMMON);
+    }
 }
 

branches/camera/src/world_entities/camera.cc

@@ -313 +313 @@
 void CameraTarget::detach()
 {
-  masta->setParentSoft(target);
-  masta->getTargetNode()->setParentSoft(target);
+  masta->setParent(target);
+  masta->getTargetNode()->setParent(target);
 }
 
@@ -325 +325 @@
 void CameraTarget::atach(PNode* object)
 {
-  masta->setParentSoft(object);
-  masta->getTargetNode()->setParentSoft(object);
+  masta->setParent(object);
+  masta->getTargetNode()->setParent(object);
 }
 

branches/camera/src/world_entities/cameraman.cc

@@ -54 +54 @@
   State::setCamera(currentCam, currentCam->getTarget());
   OrxSound::SoundEngine::getInstance()->setListener(currentCam);
+
   this->fadeToBlack->setParent(this->currentCam);
   this->fadeToBlack->setRelCoor(3., 0., 0.);
@@ -60 +61 @@
 }
 
-
-void CameraMan::testCam()
-{
-cameras[1]->lookAt(currentCam->getTarget());
-cameras[1]->setParentSoft(currentCam->getParent());
-}
 
 

branches/camera/src/world_entities/cameraman.h

@@ -30 +30 @@
     void jumpCurrCam(int x, int y, int z);
     void changeSpeed(float speed);
-    void testCam();
     void setClipRegion(float nearClip, float farClip);
     void togglFade();

branches/camera/src/world_entities/test_entity.cc

@@ -80 +80 @@
 {
   CM= State::getCameraman();
-  CM->createCam();
-  CM->moveCam(-300, 0, 0, 0);
+  CM->changeCurrTarget( "BlackScreen", "fadeToBlack");
 }
 
@@ -126 +125 @@
 {
 
+
+  glColor4f(0,0,0,0);
+  glBegin(GL_QUADS);
+  glVertex3f(50.,-100.0f,-100.0f);
+  glVertex3f(50., -100.0f,100.0f);
+  glVertex3f(50., 100.0f,100.0f);
+  glVertex3f(50., 100.0f,-100.0f);
+
+  glEnd();
+
 }