Changeset 10424 in orxonox.OLD for trunk/src

Timestamp:

Jan 28, 2007, 1:03:34 AM (18 years ago)

Author:

patrick

Message:

more on planet atmos, fading and track

Location:

trunk/src

Files:

• util/track/track.cc (modified) (1 diff)
• world_entities/blackscreen.cc (modified) (1 diff)
• world_entities/blackscreen.h (modified) (1 diff)
• world_entities/cameraman.cc (modified) (2 diffs)
• world_entities/cameraman.h (modified) (1 diff)
• world_entities/planet.cc (modified) (1 diff)

trunk/src/util/track/track.cc

@@ -299 +299 @@
             glVertex3f(tmpVector.x, tmpVector.y, tmpVector.z);
           }
-          tmpVector.debug();
       glEnd();
 

trunk/src/world_entities/blackscreen.cc

@@ -169 +169 @@
 }
 
+
+void BlackScreen::initFadeBlack()
+{
+  this->i = 1.;
+  this->state = true;
+  this->toList(OM_COMMON);
+}
+
+
 void BlackScreen::changeFadeSpeed(float newSpeed)
 {

trunk/src/world_entities/blackscreen.h

@@ -29 +29 @@
 
     void toggleFade();
+    void initFadeBlack();
     void changeFadeSpeed(float newSpeed);
     bool isBlack();

trunk/src/world_entities/cameraman.cc

@@ -39 +39 @@
                         ->addMethod("setCam", Executor1<CameraMan, lua_State*, const std::string&>(&CameraMan::setCam))
                         ->addMethod("togglFade", Executor0<CameraMan, lua_State*>(&CameraMan::togglFade))
+                        ->addMethod("initFadeBlack", Executor0<CameraMan, lua_State*>(&CameraMan::initFadeBlack))
                         ->addMethod("getCurrCameraCoorX", Executor0ret<CameraMan, lua_State*,float>(&CameraMan::getCurrCameraCoorX))
                         ->addMethod("getCurrCameraCoorY", Executor0ret<CameraMan, lua_State*,float>(&CameraMan::getCurrCameraCoorY))
@@ -238 +239 @@
 }
 
+void CameraMan::initFadeBlack()
+{
+  if( this->fadeToBlack)
+    fadeToBlack->initFadeBlack();
+}
 
 

trunk/src/world_entities/cameraman.h

@@ -42 +42 @@
     void setClipRegion(float nearClip, float farClip);
     void togglFade();
+    void initFadeBlack();
 
     void cameraInfo();

trunk/src/world_entities/planet.cc

@@ -58 +58 @@
   this->setModel(model);
 
-  this->cloudModel = new PrimitiveModel(PRIM_SPHERE, this->size + 2, 50);
+  this->cloudModel = new PrimitiveModel(PRIM_SPHERE, this->size + 1, 50);
 }