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

Timestamp:

Jan 20, 2006, 12:08:41 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: Material can now be copied
ParticleSprite used for all Projectiles

Location:

trunk/src/lib/graphics/importer

Files:

• material.cc (modified) (2 diffs)
• material.h (modified) (2 diffs)

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

@@ -68 +68 @@
     ResourceManager::getInstance()->unload(this->specularTexture);
 }
+
+Material& Material::operator=(const Material& m)
+{
+  this->setIllum(m.illumModel);
+  this->setDiffuse(m.diffuse[0],m.diffuse[1],m.diffuse[2]);
+  this->setAmbient(m.ambient[0],m.ambient[1],m.ambient[2]);
+  this->setSpecular(m.specular[0],m.specular[1],m.specular[2]);
+  this->setShininess(m.shininess);
+  this->setTransparency(m.transparency);
+
+  if (this->diffuseTexture != NULL)
+    ResourceManager::getInstance()->unload(this->diffuseTexture);
+  if (m.diffuseTexture != NULL)
+    this->diffuseTexture = m.diffuseTexture; /// HACK shoudl be:(Texture*)ResourceManager::getInstance()->load();
+  this->ambientTexture = NULL; /// FIXME
+  this->specularTexture = NULL; /// FIXME
+
+  this->setName(m.getName());
+}
+
 
 /**
@@ -282 +302 @@
   //! @todo check if RESOURCE MANAGER is availiable
   //! @todo Textures from .mtl-file need special care.
-  if (dMap!= NULL)
+  if (dMap != NULL)
     this->diffuseTexture = (Texture*)ResourceManager::getInstance()->load(dMap, IMAGE, RP_GAME, (void*)&target);
   else

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

@@ -28 +28 @@
   virtual ~Material ();
 
+  Material& operator=(const Material& material);
+
   bool select () const;
 
   void setIllum (int illum);
   void setIllum (char* illum);
+  int getIllumModel() const { return this->illumModel; };
   void setDiffuse (float r, float g, float b);
   void setDiffuse (char* rgb);
@@ -58 +61 @@
     float       shininess;        //!< The shininess of the Material.
     float       transparency;     //!< The transperency of the Material.
-  public:
+
     Texture*    diffuseTexture;   //!< The diffuse texture of the Material.
     Texture*    ambientTexture;   //!< The ambient texture of the Material.