Changeset 7830 in orxonox.OLD for branches/water

Timestamp:

May 24, 2006, 6:30:08 PM (19 years ago)

Author:

bensch

Message:

shaders testing

Location:

branches/water/src

Files:

• lib/graphics/shader.cc (modified) (1 diff)
• world_entities/skybox.cc (modified) (2 diffs)

branches/water/src/lib/graphics/shader.cc

@@ -184 +184 @@
     shader.getline(lineBuffer, PARSELINELENGTH);
     output += lineBuffer;
-    printf("line:: %s\n");
-    printf("OUTPUT:: %s\n", output.c_str());
+    output += "\n";
   }
 

branches/water/src/world_entities/skybox.cc

@@ -28 +28 @@
 #include "converter.h"
 #include "util/loading/resource_manager.h"
-
+#include "shader.h"
 
 using namespace std;
@@ -52 +52 @@
 {
   this->preInit();
+
+  Shader test ("/home/grauerb/svn/orxonox/data/shaders/water.vert", "/home/grauerb/svn/orxonox/data/shaders/water.frag");
 
   if( root != NULL)