Changeset 9006 in orxonox.OLD for trunk/src/world_entities/skydome.cc

Timestamp:

Jul 2, 2006, 2:11:59 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the mountain_lake branche back to the trunk
merged with command:
svn merge -r8799:HEAD ​https://svn.orxonox.net/orxonox/branches/mountain_lake .

conflicts in script taken from the branche, since they are indentation-problems.

also fixed the delete-bug for the lightning-effect

File:

• trunk/src/world_entities/skydome.cc (modified) (10 diffs)

trunk/src/world_entities/skydome.cc

@@ -1 +1 @@
 /*
    orxonox - the future of 3D-vertical-scrollers
-
+ 
    Copyright (C) 2006 orx
-
+ 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2, or (at your option)
    any later version.
-
+ 
 ### File Specific:
    main-programmer: hdavid, amaechler
@@ -43 +43 @@
 {
   PRINTF(0)("Skydome init\n");
-  
+
   this->setClassID(CL_SKYDOME, "Skydome");
   this->toList(OM_BACKGROUND);
-  this->toReflectionList(); 
+  this->toReflectionList();
   
+  activateDome = false;
+
 }
 
@@ -57 +59 @@
 {
   PRINTF(0)("Deleting Skydome\n");
-  
+
   if (glIsTexture(texture))
     glDeleteTextures(1, &texture);
@@ -74 +76 @@
 
 
+void Skydome::activate()
+{
+  this->activateDome = true;
+}
+
+void Skydome::deactivate()
+{
+  this->activateDome = false;
+}
+
+
 void Skydome::draw() const
 {
+  if(!activateDome)
+    return;
+  
   glPushAttrib(GL_ENABLE_BIT);
 
@@ -88 +104 @@
   glPushMatrix();
   glTranslatef(0.0f,pRadius,0.0f);
-  
+
 
   glBegin(GL_TRIANGLES);
@@ -113 +129 @@
 {
   PRINTF(0)("Generating a sky plane");
-  
+
   // Make sure our vertex array is clear
-  if (planeVertices) 
+  if (planeVertices)
   {
     delete planeVertices;
@@ -130 +146 @@
   // Set the number of divisions into a valid range
   int divs = divisions;
-  if (divisions < 1) 
+  if (divisions < 1)
     divs = 1;
 
-  if (divisions > 256) 
-    divs = 256; 
+  if (divisions > 256)
+    divs = 256;
 
   pRadius = planetRadius;
@@ -152 +168 @@
   float delta = plane_size/(float)divs;
   float tex_delta = 2.0f/(float)divs;
-  
+
   // Variables we'll use during the dome's generation
   float x_dist   = 0.0f;
@@ -193 +209 @@
       int startvert = (i*(divs+1) + j);
 
-        // tri 1
+      // tri 1
       indices[index++] = startvert;
       indices[index++] = startvert+1;
@@ -203 +219 @@
       indices[index++] = startvert+divs+1;
     }
-  }  
-}
+  }
+}