Changeset 6522 in orxonox.OLD for trunk/src

Timestamp:

Jan 18, 2006, 2:20:13 AM (19 years ago)

Author:

bensch

Message:

trunk: switch to WireFrame with
Shell → GraphicsEngine wireframe

Location:

trunk/src

Files:

• lib/graphics/graphics_engine.cc (modified) (3 diffs)
• lib/graphics/graphics_engine.h (modified) (1 diff)
• world_entities/environments/water.cc (modified) (2 diffs)

trunk/src/lib/graphics/graphics_engine.cc

@@ -36 +36 @@
 #include "texture.h"
 
+#include "shell_command.h"
+
 #ifdef __WIN32__
  #include "class_list.h"
@@ -41 +43 @@
 #endif
 using namespace std;
+
+SHELL_COMMAND(wireframe, GraphicsEngine, wireframe);
 
 /**
@@ -468 +472 @@
 }
 
+void GraphicsEngine::wireframe()
+{
+  glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
+}
+
 /**
  *  stores the GL_matrices

trunk/src/lib/graphics/graphics_engine.h

@@ -60 +60 @@
     static void enter2DMode();
     static void leave2DMode();
+
+    void wireframe();
 
     static void storeMatrices();

trunk/src/world_entities/environments/water.cc

@@ -46 +46 @@
   this->velocities = NULL;
   this->viscosity = 5;
-  this->cohesion = .00000001;
+  this->cohesion = .0000000001;
 
   if (root != NULL)
@@ -157 +157 @@
           4 * this->grid->height(i, j);
       this->velocities[i][j] += dt * this->viscosity * this->viscosity * u / this->height;
-    }
-  }
-  // advect
+      this->grid->height(i, j) += dt * this->velocities[i][j];
+    }
+  }
+/*  // advect
   for(j = 1; j < this->grid->rows() - 1; j++) {
     for(i = 1; i < this->grid->columns() - 1; i++) {
       this->grid->height(i, j) += dt * this->velocities[i][j];
     }
-  }
+  }*/
   // bound
 //   unsigned int w = this->grid->columns - 1;