Changeset 8369 in orxonox.OLD for trunk/src/lib/graphics/importer/objModel.cc

Timestamp:

Jun 14, 2006, 11:04:24 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: finaly moved the *#\!3i^{& chars out of Material}

File:

• trunk/src/lib/graphics/importer/objModel.cc (modified) (11 diffs)

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

@@ -28 +28 @@
 
 /**
- *  Crates a 3D-Model, loads in a File and scales it.
+ * @brief Crates a 3D-Model, loads in a File and scales it.
  * @param fileName file to parse and load (must be a .obj file)
  * @param scaling The factor that the model will be scaled with.
@@ -47 +47 @@
 
 /**
- *  deletes an OBJModel.
-
-   Looks if any from model allocated space is still in use, and if so deleted it.
-*/
+ * @brief deletes an OBJModel.
+ */
 OBJModel::~OBJModel()
 { }
@@ -86 +84 @@
 
 /**
- *  Reads in the .obj File and sets all the Values.
-   This function does read the file, parses it for the occurence of things like vertices, faces and so on, and executes the specific tasks
-*/
+ * @brief Reads in the .obj File and sets all the Values.
+ * @param fileName the FileName of the Model.
+ *
+ * This function does read the file, parses it for the occurence of things like vertices, faces and so on, and executes the specific tasks
+ */
 bool OBJModel::readFromObjFile(const std::string& fileName)
 {
@@ -153 +153 @@
 
 /**
- * Function to read in a mtl File.
+ * @brief Function to read in a mtl File.
  * @param mtlFile The .mtl file to read
  *
@@ -191 +191 @@
         {
           if (likely(tmpMat != NULL))
-            tmpMat->setIllum(buffer+6);
+            setIllum(tmpMat, buffer+6);
 
         }
@@ -198 +198 @@
         {
           if (likely(tmpMat != NULL))
-            tmpMat->setDiffuse(buffer+3);
+            setDiffuse(tmpMat, buffer+3);
         }
       // setting Ambient Color
@@ -204 +204 @@
         {
           if (likely(tmpMat != NULL))
-            tmpMat->setAmbient(buffer+3);
+            setAmbient(tmpMat, buffer+3);
         }
       // setting Specular Color
@@ -210 +210 @@
         {
           if (likely(tmpMat != NULL))
-            tmpMat->setSpecular(buffer+3);
+            setSpecular(tmpMat, buffer+3);
         }
       // setting The Specular Shininess
@@ -216 +216 @@
         {
           if (likely(tmpMat != NULL))
-            tmpMat->setShininess(buffer+3);
+            setShininess(tmpMat, buffer+3);
         }
       // setting up transparency
@@ -222 +222 @@
         {
           if (likely(tmpMat != NULL))
-            tmpMat->setTransparency(buffer+2);
+            setTransparency(tmpMat, buffer+2);
         }
       else if (!strncmp(buffer, "Tf ", 3))
         {
           if (likely(tmpMat != NULL))
-            tmpMat->setTransparency(buffer+3);
+            setTransparency(tmpMat, buffer+3);
         }
 
@@ -256 +256 @@
   return true;
 }
+
+
+/**
+ * @brief Sets the Material Illumination Model.
+ * @param material: the Material to apply the change to.
+ * @param illu: illumination Model in char* form
+ */
+void OBJModel::setIllum (Material* material, const char* illum)
+{
+  material->setIllum (atoi(illum));
+}
+
+/**
+ * @brief Sets the Material Diffuse Color.
+ * @param material: the Material to apply the change to.
+ * @param rgb The red, green, blue channel in char format (with spaces between them)
+ */
+void OBJModel::setDiffuse (Material* material, const char* rgb)
+{
+  float r,g,b;
+  sscanf (rgb, "%f %f %f", &r, &g, &b);
+  material->setDiffuse (r, g, b);
+}
+
+/**
+ * @brief Sets the Material Ambient Color.
+ * @param material: the Material to apply the change to.
+ * @param rgb The red, green, blue channel in char format (with spaces between them)
+ */
+void OBJModel::setAmbient (Material* material, const char* rgb)
+{
+  float r,g,b;
+  sscanf (rgb, "%f %f %f", &r, &g, &b);
+  material->setAmbient (r, g, b);
+}
+
+/**
+ * @brief Sets the Material Specular Color.
+ * @param material: the Material to apply the change to.
+ * @param rgb The red, green, blue channel in char format (with spaces between them)
+ */
+void OBJModel::setSpecular (Material* material, const char* rgb)
+{
+  float r,g,b;
+  sscanf (rgb, "%f %f %f", &r, &g, &b);
+  material->setSpecular (r, g, b);
+}
+
+/**
+ * @brief Sets the Material Shininess.
+ * @param material: the Material to apply the change to.
+ * @param shini stes the Shininess from char*.
+ */
+void OBJModel::setShininess (Material* material, const char* shini)
+{
+  material->setShininess (atof(shini));
+}
+
+/**
+ * @brief Sets the Material Transparency.
+ * @param material: the Material to apply the change to.
+ * @param trans stes the Transparency from char*.
+ */
+void OBJModel::setTransparency (Material* material, const char* trans)
+{
+  material->setTransparency (atof(trans));
+}