Changeset 3655 in orxonox.OLD for orxonox/trunk/src/lib/graphics/importer

Timestamp:

Mar 26, 2005, 3:28:39 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: moved protoclass to folder proto
added protosingleton
added resourceManager
modiefied some stuff to work better

Location:

orxonox/trunk/src/lib/graphics/importer

Files:

• material.cc (modified) (3 diffs)
• objModel.cc (modified) (2 diffs)
• objModel.h (modified) (2 diffs)
• texture.cc (modified) (4 diffs)
• texture.h (modified) (2 diffs)

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

@@ -23 +23 @@
 #include <stdlib.h>
 #include <string.h>
+
+//! \todo check if we are in RESOURCE MANAGER-mode
+#include "resource_manager.h"
 
 using namespace std;
@@ -104 +107 @@
   this->ambientTextureSet = false;
   this->specularTextureSet = false;
-
-  
 }
 
@@ -333 +334 @@
 {
   PRINTF(4)("setting Diffuse Map %s\n", dMap);
-  diffuseTexture = new Texture();
-  this->diffuseTextureSet = diffuseTexture->loadImage(dMap);
-
+    diffuseTexture = new Texture();
+    this->diffuseTextureSet = diffuseTexture->loadImage(dMap);
+
+  //! \todo check if RESOURCE MANAGER is availiable
+  //this->diffuseTextureSet = this->diffuseTexture = (Texture*)ResourceManager::load(dMap, IMAGE);
 }
 

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

@@ -21 +21 @@
 
 #include "debug.h"
-
-/**
-   \brief Crates a 3D-Model and loads in a File.
-   \param fileName file to parse and load (must be a .obj file)
-*/
-OBJModel::OBJModel(char* fileName)
-{
-  this->initializeOBJ();
-
-  this->importFile (fileName);
-
-  this->importToGL ();
-
-  this->cleanup();
-}
 
 /**
@@ -193 +178 @@
       else if (!strncmp(Buffer, "s ", 2)) //! \todo smoothing groups have to be implemented
         {
-          PRINTF(3)("smoothing groups not supportet yet. line: %s\n", Buffer);
+          PRINTF(2)("smoothing groups not supportet yet. line: %s\n", Buffer);
         }
     }

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

@@ -13 +13 @@
 {
  public:
-  OBJModel(char* fileName);
-  OBJModel(char* fileName, float scaling);
+  OBJModel(char* fileName, float scaling = 1.0);
   virtual ~OBJModel();
   void initializeOBJ(void);
@@ -28 +27 @@
   bool readFromObjFile (void);
   bool readMtlLib (char* matFile);
-
 };
 

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

@@ -131 +131 @@
 
 /**
+   \brief Constructor for a Texture
+*/
+Texture::Texture(const char* imageName)
+{
+  this->pImage = new Image;
+  this->pImage->data = NULL;
+  this->map = NULL;
+  this->texture = 0;
+  this->loadImage(imageName);
+}  
+
+/**
    \brief Destructor of a Texture
    
@@ -149 +161 @@
    \returns pathName+texName if texName was found in the pathList. NULL if the Texture is not found.
 */
-char* Texture::searchTextureInPaths(char* texName) const
+char* Texture::searchTextureInPaths(const char* texName) const
 {
   char* tmpName = NULL;
@@ -215 +227 @@
 
 #ifdef HAVE_SDL_SDL_IMAGE_H
-bool Texture::loadImage(char* imageName)
+bool Texture::loadImage(const char* imageName)
 {
   if (GraphicsEngine::texturesEnabled)
@@ -269 +281 @@
    \todo Checks where to find the Image
 */
-bool Texture::loadImage(char* imageName)
+bool Texture::loadImage(const char* imageName)
 {
   if (GraphicsEngine::texturesEnabled)

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

@@ -70 +70 @@
   GLuint texture;   //!< The Texture-ID of opengl from this Texture.
   SDL_Surface* map; //!< The map SDL initializes for this element.
-  char* searchTextureInPaths(char* texName) const;
+  char* searchTextureInPaths(const char* texName) const;
   inline void swap(unsigned char &a, unsigned char &b);
  public:
   Texture(void);
+  Texture(const char* imageName);
   ~Texture(void);
   /** \returns The textureID of this texture.  */
@@ -79 +80 @@
   bool loadTexToGL (Image* pImage);
 
-  bool loadImage(char* imageName);
+  bool loadImage(const char* imageName);
 #ifndef HAVE_SDL_SDL_IMAGE_H