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

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

Files:

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

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 */

orxonox/trunk/src/lib/util/list.h

@@ -107 +107 @@
   void destroy();
   T* firstElement();
+  T* lastElement();
   bool isEmpty();
   int getSize();
@@ -217 +218 @@
 }
 
+template<class T>
+T* tList<T>::lastElement()
+{
+  return this->last->curr;
+}
+
 
 template<class T>

orxonox/trunk/src/lib/util/resource_manager.cc

@@ -22 +22 @@
 #include "primitive_model.h"
 #include "texture.h"
+#include "text_engine.h"
 
 #include "list.h"
@@ -141 +142 @@
    \returns a pointer to a desired Resource.
 */
-void* ResourceManager::load(const char* fileName, ResourcePriority prio)
+void* ResourceManager::load(const char* fileName, ResourcePriority prio, void* param1, void* param2, void* param3)
 {
   ResourceType tmpType;
@@ -158 +159 @@
            !strcmp(fileName, "cone"))
     tmpType = PRIM;
+  else if (!strncmp(fileName+(strlen(fileName)-4), ".ttf", 4))
+    tmpType = TTF;
   else 
     tmpType = IMAGE;
 
-  return this->load(fileName, tmpType, prio);
+  return this->load(fileName, tmpType, prio, param1, param2, param3);
 }
 
@@ -171 +174 @@
    \returns a pointer to a desired Resource.
 */
-void* ResourceManager::load(const char* fileName, ResourceType type, ResourcePriority prio)
+void* ResourceManager::load(const char* fileName, ResourceType type, ResourcePriority prio, void* param1, void* param2, void* param3)
 {
   // searching if the resource was loaded before.
-  Resource* tmpResource = this->locateResourceByName(fileName);
+  Resource* tmpResource = this->locateResourceByInfo(fileName, type, param1, param2,param3);
   if (tmpResource) // if the resource was not loaded before.
     {
@@ -201 +204 @@
         {
         case OBJ:
+          if (param1)
+            tmpResource->modelSize = *(float*)param1;
+          else
+            tmpResource->modelSize = 1.0;
+
           if(isFile(fullName))
-            tmpResource->pointer = new OBJModel(fullName);
+            tmpResource->pointer = new OBJModel(fullName, tmpResource->modelSize);
           else
             {
               PRINTF(2)("Sorry, %s does not exist. Loading a cube-Model instead\n", fullName);
-              tmpResource->pointer = ResourceManager::load("cube", PRIM);
+              tmpResource->pointer = ResourceManager::load("cube", PRIM, prio, &tmpResource->modelSize);
             }
           break;
         case PRIM:
+          if (param1)
+            tmpResource->modelSize = *(float*)param1;
+          else
+            tmpResource->modelSize = 1.0;
+
           if (!strcmp(tmpResource->name, "cube"))
-            tmpResource->pointer = new PrimitiveModel(CUBE);
+            tmpResource->pointer = new PrimitiveModel(CUBE, tmpResource->modelSize);
           else if (!strcmp(tmpResource->name, "sphere"))
-            tmpResource->pointer = new PrimitiveModel(SPHERE);
+            tmpResource->pointer = new PrimitiveModel(SPHERE, tmpResource->modelSize);
           else if (!strcmp(tmpResource->name, "plane"))
-            tmpResource->pointer = new PrimitiveModel(PLANE);
+            tmpResource->pointer = new PrimitiveModel(PLANE, tmpResource->modelSize);
           else if (!strcmp(tmpResource->name, "cylinder"))
-            tmpResource->pointer = new PrimitiveModel(CYLINDER);
+            tmpResource->pointer = new PrimitiveModel(CYLINDER, tmpResource->modelSize);
           else if (!strcmp(tmpResource->name, "cone"))
-            tmpResource->pointer = new PrimitiveModel(CONE);
+            tmpResource->pointer = new PrimitiveModel(CONE, tmpResource->modelSize);
+          break;
+        case TTF:
+            if (param1)
+              tmpResource->ttfSize = *(int*)param1;
+            else
+              tmpResource->ttfSize = FONT_DEFAULT_SIZE;
+            if (param2)
+              {
+                Vector* tmpVec = (Vector*)param2;
+                tmpResource->ttfColorR = (int)tmpVec->x;
+                tmpResource->ttfColorG = (int)tmpVec->y;
+                tmpResource->ttfColorB = (int)tmpVec->z;
+              }
+            else
+              {
+                tmpResource->ttfColorR = FONT_DEFAULT_COLOR_R;
+                tmpResource->ttfColorG = FONT_DEFAULT_COLOR_G;
+                tmpResource->ttfColorB = FONT_DEFAULT_COLOR_B;
+              }
+            
+          if(isFile(fullName))
+            tmpResource->pointer = new Font(fullName,
+                                            tmpResource->ttfSize,
+                                            tmpResource->ttfColorR,
+                                            tmpResource->ttfColorG,
+                                            tmpResource->ttfColorB);
+          else
+            PRINTF(2)("Sorry, %s does not exist. Not loading Font\n", fullName);
           break;
         case IMAGE:
@@ -259 +300 @@
       delete []fullName;
     }
-
-  return tmpResource->pointer;
+  if (tmpResource->pointer)
+    return tmpResource->pointer;
+  else 
+    {
+      PRINTF(2)("Resource %s could not be loaded\n", fileName);
+      delete tmpResource;
+      return NULL;
+    }
 }
 
@@ -299 +346 @@
             case IMAGE:
               delete (Texture*)resource->pointer;
+              break;
+            case TTF:
+              delete (Font*)resource->pointer;
               break;
             default:
@@ -342 +392 @@
 
 /**
-   \brief Searches for a Resource by Name
+   \brief Searches for a Resource by some information
    \param fileName The name to look for
    \returns a Pointer to the Resource if found, NULL otherwise.
 */
-Resource* ResourceManager::locateResourceByName(const char* fileName)
+Resource* ResourceManager::locateResourceByInfo(const char* fileName, ResourceType type, void* param1, void* param2, void* param3)
 {
   //  Resource* enumRes = resourceList->enumerate();
@@ -353 +403 @@
   while (enumRes)
     {
-      if (!strcmp(fileName, enumRes->name))
-        {
-          delete iterator;
-          return enumRes;
+      if (enumRes->type == type && !strcmp(fileName, enumRes->name))
+        {
+          bool match = false;
+          bool subMatch = false;
+          switch (type)
+            {
+            case PRIM:
+            case OBJ:
+              if (!param1)
+                {
+                  if (enumRes->modelSize == 1.0)
+                    match = true;
+                }
+              else if (enumRes->modelSize == *(float*)param1)
+                match = true;
+              break;
+            case TTF:
+              if (!param1)
+                {
+                  if (enumRes->ttfSize == FONT_DEFAULT_SIZE)
+                    subMatch = true;
+                }
+              else if (enumRes->modelSize =- *(int*)param1)
+                subMatch = true;
+              if(subMatch)
+                {
+                  Vector* tmpVec = (Vector*)param2;
+                  if (!param2)
+                    {
+                      if(enumRes->ttfColorR == FONT_DEFAULT_COLOR_R &&
+                         enumRes->ttfColorG == FONT_DEFAULT_COLOR_G &&
+                         enumRes->ttfColorB == FONT_DEFAULT_COLOR_B )
+                        match = true;
+                    }
+                  else if (enumRes->ttfColorR == (int)tmpVec->x &&
+                           enumRes->ttfColorG == (int)tmpVec->y &&
+                           enumRes->ttfColorB == (int)tmpVec->z )
+                    match = true;
+                }
+
+              break;
+            default:
+              match = true;
+              break;
+            }
+          if (match)
+            {
+              delete iterator;
+              return enumRes;
+            }
         }
       enumRes = iterator->nextElement();
@@ -396 +492 @@
   struct stat status;
   stat(directoryName, &status);
-  if (status.st_mode & (S_IFDIR | S_IFLNK))
+  if (status.st_mode & (S_IFDIR 
+#ifndef __WIN32__
+                        | S_IFLNK
+#endif
+                        ))
     return true;
   else
@@ -411 +511 @@
   struct stat status;
   stat(fileName, &status);
-  if (status.st_mode & (S_IFREG | S_IFLNK))
+  if (status.st_mode & (S_IFREG 
+#ifndef __WIN32__
+                        | S_IFLNK
+#endif
+                        ))
     return true;
   else

orxonox/trunk/src/lib/util/resource_manager.h

@@ -19 +19 @@
 
 //! An eumerator for different fileTypes the resourceManager supports \todo WAV, MP3, OGG support
-enum ResourceType {OBJ, PRIM, WAV, MP3, OGG, IMAGE};
+enum ResourceType {OBJ, PRIM, WAV, MP3, OGG, TTF, IMAGE};
 //! An enumerator for different UNLOAD-types. 
 /**
@@ -33 +33 @@
 {
   void* pointer;             //!< Pointer to the Resource.
+  int count;                 //!< How many times this Resource has been loaded.
   
   char* name;                //!< Name of the Resource.
   ResourceType type;         //!< ResourceType of this Resource.
   ResourcePriority prio;     //!< The Priority of this resource. (This will only be increased)
-  int count;                 //!< How many times this Resource has been loaded.
+
+  // more specific
+  float modelSize;
+  unsigned int ttfSize;
+  unsigned char ttfColorR;
+  unsigned char ttfColorG;
+  unsigned char ttfColorB;
 };
 
@@ -49 +56 @@
 
    It does it by looking, if a desired file has already been loaded.
+
+   \todo loading also dependant by parameters.
 */
 class ResourceManager : public BaseObject 
@@ -58 +67 @@
   bool setDataDir(char* dataDir);
   bool addImageDir(char* imageDir);
-  void* load(const char* fileName, ResourcePriority prio = RP_NO);
-  void* load(const char* fileName, ResourceType type, ResourcePriority prio = RP_NO);
+  void* load(const char* fileName, ResourcePriority prio = RP_NO,
+             void* param1 = NULL, void* param2 = NULL, void* param3 = NULL);
+  void* load(const char* fileName, ResourceType type, ResourcePriority prio = RP_NO,
+             void* param1 = NULL, void* param2 = NULL, void* param3 = NULL);
   bool unload(void* pointer, ResourcePriority prio = RP_NO);
   bool unload(Resource* resource, ResourcePriority = RP_NO);
@@ -74 +85 @@
 
 
-  Resource* locateResourceByName(const char* fileName);
+  Resource* locateResourceByInfo(const char* fileName, ResourceType type, void* param1, void* param2, void* param3);
   Resource* locateResourceByPointer(const void* pointer);