Changeset 8089 in orxonox.OLD

Timestamp:

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

Author:

stefalie

Message:

water: gui hack

Location:

branches/water/src

Files:

• lib/graphics/importer/material.cc (modified) (1 diff)
• lib/graphics/importer/texture.cc (modified) (3 diffs)
• lib/graphics/importer/texture.h (modified) (1 diff)
• lib/gui/gl_gui/glgui_cursor.cc (modified) (1 diff)
• lib/gui/gl_gui/glgui_handler.cc (modified) (1 diff)
• lib/gui/gl_gui/glgui_widget.cc (modified) (1 diff)
• lib/gui/gl_gui/glgui_widget.h (modified) (1 diff)
• story_entities/game_world.cc (modified) (6 diffs)
• story_entities/game_world.h (modified) (2 diffs)
• world_entities/environments/mapped_water.cc (modified) (2 diffs)

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);

branches/water/src/story_entities/game_world.cc

@@ -107 +107 @@
 
 
+
+
+/// HACK only for testing.
+void GameWorld::enterGui()
+{
+  OrxGui::GLGuiBox* imageSelector = new OrxGui::GLGuiBox();
+  {
+    image = new OrxGui::GLGuiImage();
+    image->setWidgetSize(300, 300);
+    image->setAbsCoor2D(300, 300);
+    imageSelector->pack(image);
+
+    imageName = new OrxGui::GLGuiInputLine();
+    imageSelector->pack(imageName);
+
+    OrxGui::GLGuiSlider* slider = new OrxGui::GLGuiSlider();
+    slider->setWidgetSize(200, 30);
+    slider->setRange(0, 200);
+    slider->setStep(1);
+    
+    
+    slider->setValue(slider->min());
+    slider->connect(SIGNAL(slider, valueChanged), this, SLOT(GameWorld, setImage));
+
+    imageSelector->pack(slider);
+    slider->setValue(getImage("/home/stefalie/svn/orxonox/data/trunk/pictures/dudvmap.bmp"));
+  }
+  imageSelector->showAll();
+  imageSelector->setAbsCoor2D(400, 30);
+    OrxGui::GLGuiHandler::getInstance()->activateCursor();
+
+  /////
+}
+
+
+#include "class_list.h"
+void GameWorld::setImage(int i)
+{
+  const std::list<BaseObject*>* textures = ClassList::getList(CL_TEXTURE);
+
+  if(textures)
+  {
+    std::list<BaseObject*>::const_iterator test = textures->begin();
+    std::list<BaseObject*>::const_iterator lastOK = textures->begin();
+    while (true)
+    {
+      if (--i == 0 || test == textures->end())
+        break;
+      if (dynamic_cast<Texture*>(*test)->getTexture() != 0)
+        lastOK = test;
+      test++;
+    }
+    this->image->loadImageFromTexture(*dynamic_cast<Texture*>(*lastOK));
+    this->imageName->setText((*lastOK)->getName());
+    printf(">>>>> %d\n", dynamic_cast<Texture*>(*lastOK)->getTexture());
+  }
+}
+
+int GameWorld::getImage(const std::string& name)
+{
+  const std::list<BaseObject*>* textures = ClassList::getList(CL_TEXTURE);
+
+
+  if(textures)
+  {
+    int number = 0;
+    std::list<BaseObject*>::const_iterator test = textures->begin();
+    std::list<BaseObject*>::const_iterator lastOK = textures->begin();
+    while (true)
+    {
+      if (test == textures->end())
+        return 0;
+      if ((*test)->getName() == name)
+        return number;
+      number++;
+      test++;
+    }
+  }
+}
+
+
+
 /**
  * loads the parameters of a GameWorld from an XML-element
@@ -225 +307 @@
   PRINTF(3)("GameWorld::stop() - got stop signal\n");
   this->bRunning = false;
+  
+  OrxGui::GLGuiHandler::getInstance()->deactivateCursor(true);
+  delete OrxGui::GLGuiHandler::getInstance();
 }
 
@@ -256 +341 @@
 {
   PRINTF(3)("GameWorld::mainLoop() - Entering main loop\n");
+
+  this->enterGui();
+
 
   // initialize Timing
@@ -387 +475 @@
     if( likely(this->dataTank->gameRule != NULL))
       this->dataTank->gameRule->tick(this->dtS);
+      
+      
+    OrxGui::GLGuiHandler::getInstance()->tick(this->dtS);
+
   }
 }
@@ -446 +538 @@
   this->renderPassReflection();
   // redner the refraction texture
-  this->renderPassRefraction();
+  //this->renderPassRefraction();
   // render all
   this->renderPassAll();
@@ -559 +651 @@
   AtmosphericEngine::getInstance()->draw();
 
-  //glEnable(GL_DEPTH_TEST);
-  //glEnable(GL_LIGHTING);
+  glEnable(GL_DEPTH_TEST);
+  glEnable(GL_LIGHTING);
 
   // set camera

branches/water/src/story_entities/game_world.h

@@ -11 +11 @@
 #include "game_world_data.h"
 #include "playable.h"
+
+#include "glgui.h"
 
 namespace OrxShell { class Shell; };
@@ -32 +34 @@
     GameWorld ();
     virtual ~GameWorld ();
+
+//// HACK NOT TO THE TRUNK //
+    void enterGui();
+    void setImage(int i);
+    int getImage(const std::string& name);
+    OrxGui::GLGuiImage* image;
+    OrxGui::GLGuiInputLine* imageName;
+/////////////////////////////
 
     virtual void loadParams(const TiXmlElement* root);

branches/water/src/world_entities/environments/mapped_water.cc

@@ -207 +207 @@
   glViewport(0,0, textureSize, textureSize);
 
+  glMatrixMode(GL_MODELVIEW);
   glPushMatrix();
 
@@ -261 +262 @@
   glViewport(0,0, textureSize, textureSize);
 
+  glMatrixMode(GL_MODELVIEW);
   glPushMatrix();