Changeset 3790 in orxonox.OLD for orxonox/trunk/src/lib/graphics

Timestamp:

Apr 13, 2005, 12:33:07 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the textEngine back into the trunk.
merged with command:
svn merge -r 3681:HEAD branches/textEngine/ trunk/

conflicts in:
world.cc/h orxonox.cc NEWS
changed in favor of the trunk

Location:

orxonox/trunk/src/lib/graphics

Files:

• font (deleted)
• graphics_engine.cc (modified) (1 diff)
• graphics_engine.h (modified) (1 diff)
• importer/material.cc (modified) (4 diffs)
• importer/material.h (modified) (1 diff)
• importer/texture.cc (modified) (4 diffs)
• importer/texture.h (modified) (4 diffs)
• text_engine.cc (copied) (copied from orxonox/branches/textEngine/src/lib/graphics/text_engine.cc)
• text_engine.h (copied) (copied from orxonox/branches/textEngine/src/lib/graphics/text_engine.h)

orxonox/trunk/src/lib/graphics/graphics_engine.cc

@@ -167 +167 @@
 
 
+/**
+   \brief entering 2D Mode
+   
+   this is a GL-Projection-mode, that is orthogonal, for placing the font in fron of everything else
+*/
+void GraphicsEngine::enter2DMode(void)
+{
+  SDL_Surface *screen = SDL_GetVideoSurface();
+  
+  /* Note, there may be other things you need to change,
+     depending on how you have your OpenGL state set up.
+  */
+  glPushAttrib(GL_ENABLE_BIT);
+  glDisable(GL_DEPTH_TEST);
+  glDisable(GL_CULL_FACE);
+  glDisable(GL_LIGHTING);  // will be set back when leaving 2D-mode
+  glEnable(GL_TEXTURE_2D);
+
+  /* This allows alpha blending of 2D textures with the scene */
+  glEnable(GL_BLEND);
+  glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+  
+  glViewport(0, 0, screen->w, screen->h);
+  
+  glMatrixMode(GL_PROJECTION);
+  glPushMatrix();
+  glLoadIdentity();
+  
+  glOrtho(0.0, (GLdouble)screen->w, (GLdouble)screen->h, 0.0, 0.0, 1.0);
+  
+  glMatrixMode(GL_MODELVIEW);
+  glPushMatrix();
+  glLoadIdentity();
+  
+  glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+}
+
+/**
+   \brief leaves the 2DMode again also \see Font::enter2DMode(void)
+*/
+void GraphicsEngine::leave2DMode(void)
+{
+  glMatrixMode(GL_MODELVIEW);
+  glPopMatrix();
+  
+  glMatrixMode(GL_PROJECTION);
+  glPopMatrix();
+  
+  glPopAttrib();
+}
 
 

orxonox/trunk/src/lib/graphics/graphics_engine.h

@@ -26 +26 @@
   int setGLattribs(void);
   int setResolution(int width, int height, int bpp);
+  /** \returns the x resolution */
+  inline int getResolutionX(void) {return this->resolutionX;}
+  /** \returns the y resolution */
+  inline int getResolutionY(void) {return this->resolutionY;}
+  /** \returns the Bits Per Pixel */
+  inline int getbbp(void) {return this->bitsPerPixel;}
   int resolutionChanged(SDL_ResizeEvent* resizeInfo);
   void listModes(void);
 
   static bool texturesEnabled;
+
+  static void enter2DMode(void);
+  static void leave2DMode(void);
 
  private:

orxonox/trunk/src/lib/graphics/importer/material.cc

@@ -30 +30 @@
 using namespace std;
 
-
-/**
-   \brief creates a default Material with no Name
-   normally you call this to create a material List (for an obj-file) and then append with addMaterial()
-*/
-Material::Material()
-{
-  this->init();
-  
-  this->setName ("");
-}
-
 /**
    \brief creates a Material.
@@ -48 +36 @@
 Material::Material (char* mtlName)
 {
-  this->init();
-  
-  this->setName (mtlName);
+   PRINTF(4)("initializing new Material.\n");
+  this->nextMat = NULL;
+  this->name ="";
+  this->setIllum(3);
+  this->setDiffuse(0,0,0);
+  this->setAmbient(0,0,0);
+  this->setSpecular(.5,.5,.5);
+  this->setShininess(2.0);
+  this->setTransparency(1.0);
+
+
+  this->diffuseTexture = NULL;
+  this->ambientTexture = NULL;
+  this->specularTexture = NULL;
+
+  this->diffuseTextureSet = false;
+  this->ambientTextureSet = false;
+  this->specularTextureSet = false;
+
+  if (mtlName)
+    this->setName (mtlName);
+  else
+    this->setName("");
 }
 
@@ -86 +94 @@
 
 /**
-   \brief initializes a new Material with its default Values
-*/
-void Material::init(void)
-{
-  PRINTF(4)("initializing new Material.\n");
-  this->nextMat = NULL;
-  this->name ="";
-  this->setIllum(3);
-  this->setDiffuse(0,0,0);
-  this->setAmbient(0,0,0);
-  this->setSpecular(.5,.5,.5);
-  this->setShininess(2.0);
-  this->setTransparency(0.0);
-
-
-  this->diffuseTexture = NULL;
-  this->ambientTexture = NULL;
-  this->specularTexture = NULL;
-
-  this->diffuseTextureSet = false;
-  this->ambientTextureSet = false;
-  this->specularTextureSet = false;
-}
-
-/**
    \brief Search for a Material called mtlName
    \param mtlName the Name of the Material to search for
@@ -151 +134 @@
   glMaterialf(GL_FRONT, GL_SHININESS, this->shininess);
   
+  // setting the transparency
+  if (this->transparency == 1.0)
+    {
+      glDisable(GL_BLEND);
+    }
+  else
+    {
+      glEnable(GL_BLEND);
+      glColor4f(1.0f, 1.0f, 1.0f, this->transparency);
+      glBlendFunc(GL_SRC_ALPHA, GL_ONE);
+    }
+
   // setting illumination Model 
   if (this->illumModel == 1) //! \todo make this work, if no vertex-normals are read.

orxonox/trunk/src/lib/graphics/importer/material.h

@@ -22 +22 @@
 {
  public:
-  Material ();
-  Material (char* mtlName);
+  Material (char* mtlName = "");
   Material* addMaterial(char* mtlName);
   ~Material ();
-  void init(void);
 
   Material* search(char* mtlName);

orxonox/trunk/src/lib/graphics/importer/texture.cc

@@ -98 +98 @@
 }
 
-#ifdef HAVE_SDL_SDL_IMAGE_H
+#ifdef HAVE_SDL_IMAGE_H
 bool Texture::loadImage(const char* imageName)
 {
@@ -118 +118 @@
             pImage->format = GL_RGB;
           else if (pImage->bpp == 4)
-            pImage->format = GL_RGBA;
-          
+            {
+              pImage->format = GL_RGBA;
+              SDL_SetAlpha(this->map, 0, 0);
+            }
+
           if( !IMG_isPNG(SDL_RWFromFile(imageName, "rb")) && !IMG_isJPG(SDL_RWFromFile(imageName, "rb")))
             for (int i=0;i<map->h * map->w *3;i+=3)
@@ -146 +149 @@
 
 
-#else /* HAVE_SDL_SDL_IMAGE_H */
+#else /* HAVE_SDL_IMAGE_H */
 /**
    \brief Makes the Programm ready to Read-in a texture-File
@@ -832 +835 @@
 
 }
-#endif /* HAVE_SDL_SDL_IMAGE_H */
+#endif /* HAVE_SDL_IMAGE_H */

orxonox/trunk/src/lib/graphics/importer/texture.h

@@ -14 +14 @@
 #include "debug.h"
 
-#ifdef HAVE_SDL_SDL_IMAGE_H
-#include <SDL/SDL_image.h>
+#ifdef HAVE_SDL_IMAGE_H
+#include <SDL_image.h>
 #else
 // IMAGE LIBS //
@@ -26 +26 @@
 #include <png.h>
 #endif /* HAVE_PNG_H */
-#endif /* HAVE_SDL_SDL_IMAGE_H */
+#endif /* HAVE_SDL_IMAGE_H */
 
 //! A Class, that reads in Textures from different fileformats.
@@ -57 +57 @@
 
   bool loadImage(const char* imageName);
-#ifndef HAVE_SDL_SDL_IMAGE_H
+#ifndef HAVE_SDL_IMAGE_H
 
   bool loadBMP (char* bmpName);
@@ -74 +74 @@
 
 };
-
-
-
 #endif /* _TEXTURE_H */