Changeset 10254 in orxonox.OLD

Timestamp:

Jan 17, 2007, 1:53:58 PM (18 years ago)

Author:

gfilip

Message:

hm…..

Location:

branches/camera/src/world_entities

Files:

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

branches/camera/src/world_entities/blackscreen.cc

@@ -50 +50 @@
   if( root != NULL)
     this->loadParams(root);
-  i=0.5;
-  state=0;
+
 }
 
@@ -72 +71 @@
   this->material = new Material();
   this->material->setIllum(3);
-  this->material->setDiffuse(1.0,1.0,1.0);
+  this->material->setDiffuse(0,0,0);
   this->material->setSpecular(0.0,0.0,0.0);
-  this->material->setAmbient(1.0, 1.0, 1.0);
+  this->material->setAmbient(0, 0, 0);
+
+  i=0.5;
+  state=0;
+  fadeSpeed=1;
 
 }
@@ -146 +149 @@
 void blackscreen::tick (float time)
 {
-  if (state==0 && i==1)
-    i=0;
-  if (state==1 && i<=1)
-    i=i+0.005;
+/*if (state == true)
+  fadeOut();
+else
+  fadeIn();*/
 }
 
+void blackscreen::fadeIn()
+{
+  if (i>0)
+    i=i-0.005*fadeSpeed;
+}
 
-void  blackscreen::changeState (bool sta)
+void blackscreen::fadeOut()
 {
-  state=sta;
+  if (i<=1)
+    i=i+0.005*fadeSpeed;
 }
+
+void  blackscreen::toggleFade ()
+{
+  state=!state;
+}
+
+void blackscreen::changeFadeSpeed(float newSpeed)
+{
+  fadeSpeed=newSpeed;
+}
+

branches/camera/src/world_entities/blackscreen.h

@@ -16 +16 @@
     bool state;
     Material*       material;
+    void fadeIn();
+    void fadeOut();
+    float fadeSpeed;
 
   public:
@@ -25 +28 @@
     virtual void loadParams(const TiXmlElement* root);
 
-    void changeState (bool);
+    void toggleFade ();
+    void changeFadeSpeed(float newSpeed);
     virtual void tick (float time);
+
     virtual void draw() const;
 

branches/camera/src/world_entities/cameraman.cc

@@ -24 +24 @@
 cameraman::cameraman()
 {
-  cout << "TTTT*" << cameras.size();
   currentCam=State::getCamera();
   this->cameras.push_back(currentCam);
   currentCam->target->detach();
-  cout << "TTTT*" << cameras.size();
   State::setCamera(currentCam, currentCam->getTarget());
 }
@@ -37 +35 @@
  // Camera* newCamera=new Camera();
   this->cameras.push_back(new Camera());
-  //cameras[cameras.size()-1]->target->detach();
+  cameras[cameras.size()-1]->target->detach();
 
 }
@@ -54 +52 @@
 }
 
+
+void cameraman::testCam()
+{
+cameras[1]->lookAt(currentCam->getTarget());
+cameras[1]->setParentSoft(currentCam->getParent());
+}
 
 

branches/camera/src/world_entities/cameraman.h

@@ -26 +26 @@
     void jumpCurrCam(int x, int y, int z);
     void changeSpeed(float speed);
-
+    void testCam();