Changeset 953 for GTP/trunk/Lib/Illum/GPUObscurancesGT/src

Timestamp:

05/12/06 16:00:21 (19 years ago)

Author:

igarcia

Message:

 

Location:

GTP/trunk/Lib/Illum/GPUObscurancesGT/src

Files:

• CMesh.cpp (modified) (3 diffs)
• MyFrame.cpp (modified) (2 diffs)

GTP/trunk/Lib/Illum/GPUObscurancesGT/src/CMesh.cpp

@@ -95 +95 @@
 }
 
+float CMesh::getValue(const char *string, int &i)
+{
+        int j = 0;
+        float value;
+        char substring[100];
+
+        while ((string[i] != ' ') && (string[i] != '\0'))
+        {
+                substring[j] = string[i];
+                i++;
+                j++;
+        }
+
+        substring[j] = '\0';
+
+        value = atof(substring);
+
+        return (value);
+
+}
+
 void CMesh::XMLToSNStr(char *name)
 {
         int i = 0, j = 0, k;
-        bool cont = true;
+        const char *string;
+        bool cont = true, color = false;
 
         // Read root element and decide from there what type
     String response;
+        String::iterator iter;
+
         TiXmlDocument* doc = new TiXmlDocument(name);
     // Some double-parsing here but never mind  
@@ -194 +218 @@
                 tri = tri->FirstChildElement("vertexbuffer");
 
+                const char *cad = tri->Attribute("colours_diffuse");
+
+                if (!strcmp(cad, "true")) color = true;
+
+
                 m_pObject._geo[0]._triSet[i]._numVer = NVer;
                 
@@ -225 +254 @@
                         m_pObject._geo[0]._triSet[i]._tex[2 * j + 1] = atof(aux1->Attribute("v"));
 
-                        /*->aux1 = aux->FirstChildElement("colour_diffuse");
+                        aux1 = aux->FirstChildElement("colour_diffuse");
                         response = aux1->Attribute("value");
-                        /*->m_pObject._geo[0]._triSet[i]._ver[3 * j] = atof(aux1->Attribute("x"));
-                        m_pObject._geo[0]._triSet[i]._ver[3 * j + 1] = atof(aux1->Attribute("y"));
-                        m_pObject._geo[0]._triSet[i]._ver[3 * j + 2] = atof(aux1->Attribute("z"));*/
-
-                        m_pObject._geo[0]._triSet[i]._refl[3 * j] = 0.5;
-                        m_pObject._geo[0]._triSet[i]._refl[3 * j + 1] = 0.5;
-                        m_pObject._geo[0]._triSet[i]._refl[3 * j + 2] = 0.5;
+
+                        if (color)
+                        {
+                                string = response.c_str();                      
+                                k = 0;
+                                m_pObject._geo[0]._triSet[i]._refl[3 * j] = getValue(string, k);
+                                k++;
+                                m_pObject._geo[0]._triSet[i]._refl[3 * j + 1] = getValue(string, k);
+                                k++;
+                                m_pObject._geo[0]._triSet[i]._refl[3 * j + 2] = getValue(string, k);
+                                k++;
+                                getValue(string, k);
+                        }
+                        else
+                        {
+                                m_pObject._geo[0]._triSet[i]._refl[3 * j] = 0.5;
+                                m_pObject._geo[0]._triSet[i]._refl[3 * j + 1] = 0.5;
+                                m_pObject._geo[0]._triSet[i]._refl[3 * j + 2] = 0.5;
+                        }
 
                         aux = aux->NextSiblingElement();

GTP/trunk/Lib/Illum/GPUObscurancesGT/src/MyFrame.cpp

@@ -226 +226 @@
         float r_float;
 
-        i = 0;
-        j = 0;  
-        while (i < (res * res * 4))
+        for (i = 0, j = 0; i < (res * res * 4); i += 4, j += 3)
         {
                 r_float = ObscuranceMap[i] * 255;
@@ -236 +234 @@
                 r_float = ObscuranceMap[i+2] * 255;
                 bmp[j + 2] = uchar(r_float);
-
-                j += 3;
-                i += 4;
         }