Changeset 10330 in orxonox.OLD

Timestamp:

Jan 24, 2007, 3:02:45 PM (17 years ago)

Author:

gfilip

Message:

all working

Location:

branches/camera/src/world_entities

Files:

• blackscreen.cc (modified) (7 diffs)
• blackscreen.h (modified) (1 diff)
• cameraman.cc (modified) (4 diffs)
• cameraman.h (modified) (3 diffs)
• test_entity.cc (modified) (3 diffs)

branches/camera/src/world_entities/blackscreen.cc

@@ -33 +33 @@
  *
  */
-blackscreen::blackscreen ()
+blackscreen::blackscreen()
 {
   this->init();
@@ -57 +57 @@
  *
  */
-blackscreen::~blackscreen ()
+blackscreen::~blackscreen()
 {}
 
@@ -70 +70 @@
 
   this->material = new Material();
-  this->material->setIllum(3);
-  this->material->setDiffuse(0,0,0);
+ // this->material->setIllum(3);
+ // this->material->setDiffuse(0,0,0);
   this->material->setSpecular(0.0,0.0,0.0);
-  this->material->setAmbient(0, 0, 0);
+ // this->material->setAmbient(0, 0, 0);
 
-  i=0.5;
+  i=1;
   state=0;
   fadeSpeed=1;
@@ -118 +118 @@
 
 glColor4f(0, 0, 0, i);
-/*this->material->select();
+this->material->select();
+this->material->setTransparency(i);
   glBegin(GL_QUADS);
   glVertex3f(State::getCameraNode()->getAbsCoorX()+3,State::getCameraNode()->getAbsCoorY() -100.0f,
@@ -128 +129 @@
   glVertex3f(State::getCameraNode()->getAbsCoorX()+3, State::getCameraNode()->getAbsCoorY()+100.0f,
              State::getCameraNode()->getAbsCoorZ()-100.0f);
-*/
 
- glBegin(GL_QUADS);
+
+/* 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);
-
+*/
 
 
@@ -149 +150 @@
 void blackscreen::tick (float time)
 {
-/*if (state == true)
+if (state == true)
   fadeOut();
 else
-  fadeIn();*/
+  fadeIn();
 }
 
@@ -169 +170 @@
 void  blackscreen::toggleFade ()
 {
-  state=!state;
+
+    this->state= !this->state;
 }
 

branches/camera/src/world_entities/blackscreen.h

@@ -21 +21 @@
 
   public:
-    blackscreen ();
+    blackscreen();
     blackscreen(const TiXmlElement* root);
-    virtual ~blackscreen ();
+    virtual ~blackscreen();
 
     void init();
     virtual void loadParams(const TiXmlElement* root);
 
-    void toggleFade ();
+    void toggleFade();
     void changeFadeSpeed(float newSpeed);
     virtual void tick (float time);

branches/camera/src/world_entities/cameraman.cc

@@ -21 +21 @@
 #include "sound_engine.h"
 
+
 ObjectListDefinition(cameraman);
 
@@ -34 +35 @@
   this->cameras.push_back(currentCam);
   State::setCamera(currentCam, currentCam->getTarget());
-//   currentCam->setClipRegion(nearClip, farClip);
+  this->fadeToBlack=new blackscreen();
 }
 
@@ -123 +124 @@
 
 
+void cameraman::togglFade()
+{
+  if( this->fadeToBlack)
+    fadeToBlack->toggleFade();
+}
+
+
+
+//how to get a class fkt pointer
+
+//BaseObject* object = ObjectListBase::getBaseObject(className, objectName);
 
 
@@ -137 +149 @@
 
 
-
-

branches/camera/src/world_entities/cameraman.h

@@ -6 +6 @@
 #include <vector>
 #include "base_object.h"
+#include "blackscreen.h"
 
 class cameraman : public BaseObject {
@@ -14 +15 @@
     float nearClip;
     float farClip;
-
+    blackscreen* fadeToBlack;
 
   public:
@@ -31 +32 @@
     void testCam();
     void setClipRegion(float nearClip, float farClip);
-
+    void togglFade();
 
 };

branches/camera/src/world_entities/test_entity.cc

@@ -86 +86 @@
 void TestEntity::t2()
 {
+  CM= State::getCameraman();
+
   CM->moveCurrCam(0, -300, 0);
 
@@ -92 +94 @@
 void TestEntity::t3()
 {
+  CM= State::getCameraman();
 
   CM->setCam(1);
@@ -98 +101 @@
 void TestEntity::t4()
 {
+  CM= State::getCameraman();
 
+CM->togglFade();
 }
 
 void TestEntity::t5()
 {
+  CM= State::getCameraman();
+
   CM->setCam(0);
 }