Changeset 8089 in orxonox.OLD for branches/water/src/lib

Timestamp:

Jun 1, 2006, 5:24:57 PM (18 years ago)

Author:

stefalie

Message:

water: gui hack

Location:

branches/water/src/lib

Files:

• graphics/importer/material.cc (modified) (1 diff)
• graphics/importer/texture.cc (modified) (3 diffs)
• graphics/importer/texture.h (modified) (1 diff)
• gui/gl_gui/glgui_cursor.cc (modified) (1 diff)
• gui/gl_gui/glgui_handler.cc (modified) (1 diff)
• gui/gl_gui/glgui_widget.cc (modified) (1 diff)
• gui/gl_gui/glgui_widget.h (modified) (1 diff)

branches/water/src/lib/graphics/importer/material.cc

@@ -103 +103 @@
  * @brief sets the material with which the following Faces will be painted
  */
-bool Material::select() const
+  bool Material::select() const
 {
   if (unlikely(this == Material::selectedMaterial))

branches/water/src/lib/graphics/importer/texture.cc

@@ -115 +115 @@
 
 
-Texture::Texture(GLenum target)
+Texture::Texture(GLenum target, unsigned int width, unsigned int height, unsigned int channels, GLenum type)
 {
   this->init();
-  GLuint texture;
+  GLuint texture = 0;
   Texture::generateTexture(texture, target);
+
+  glBindTexture(target, texture);
+
+  unsigned int* pixels = new unsigned int[width * height * channels];
+  memset(pixels, 0, width * height * channels * sizeof(unsigned int));
+  
+  
+  glTexParameterf(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR);
+  glTexParameterf(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_LINEAR);
+  glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+  glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+
+  glTexImage2D(target, 0, channels, width, height, 0, type, GL_UNSIGNED_INT, pixels);
+  
+  
+  
+  delete[] pixels;
+
   this->data->setTexture(texture);
 }
@@ -346 +364 @@
   //  printf("%s, w:%d h:%d, 0x%x\n", this->getName(), surface->w, surface->h, target);
 
+  /* control the mipmap levels */
+  glTexParameterf(GL_TEXTURE_ENV, GL_TEXTURE_MIN_LOD, 5);
+  glTexParameterf(GL_TEXTURE_ENV, GL_TEXTURE_MAX_LOD, 0);
+
   // build the MipMaps automaticaly
   errorCode = gluBuild2DMipmaps(target, format,
@@ -372 +394 @@
   glTexParameteri(target, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
 
-  /* control the mipmap levels */
-  glTexParameterf(GL_TEXTURE_ENV, GL_TEXTURE_MIN_LOD, 5);
-  glTexParameterf(GL_TEXTURE_ENV, GL_TEXTURE_MAX_LOD, 0);
-}
+}

branches/water/src/lib/graphics/importer/texture.h

@@ -50 +50 @@
   Texture();
   Texture(const Texture& texture);
-  Texture(GLenum target);
+  Texture(GLenum target, unsigned int width, unsigned int height, unsigned int channels, GLenum type);
   Texture(const std::string& imageName, GLenum target = GL_TEXTURE_2D);
   Texture(SDL_Surface* surface, GLenum target = GL_TEXTURE_2D);

branches/water/src/lib/gui/gl_gui/glgui_cursor.cc

@@ -32 +32 @@
     this->init();
 
-    this->subscribeEvent(ES_MENU,  EV_MOUSE_MOTION);
-    this->subscribeEvent(ES_MENU, EV_WINDOW_FOCUS);
+    this->subscribeEvent(ES_ALL,  EV_MOUSE_MOTION);
+    this->subscribeEvent(ES_ALL, EV_WINDOW_FOCUS);
 
 

branches/water/src/lib/gui/gl_gui/glgui_handler.cc

@@ -40 +40 @@
 
 
-    EventHandler::getInstance()->withUNICODE(ES_MENU, true );
+    EventHandler::getInstance()->withUNICODE(ES_ALL, true );
 
     this->cursor = NULL;
     for (unsigned int i = 0; i < EV_NUMBER; i++)
     {
-      this->subscribeEvent(ES_MENU, i);
+      this->subscribeEvent(ES_ALL, i);
     }
   }

branches/water/src/lib/gui/gl_gui/glgui_widget.cc

@@ -204 +204 @@
 
 
+
   void GLGuiWidget::hide()
   {

branches/water/src/lib/gui/gl_gui/glgui_widget.h

@@ -42 +42 @@
     void show();
     void hide();
-
 
     void setParentWidget(GLGuiWidget* parent);