Changeset 3128 in orxonox.OLD for orxonox

Timestamp:

Dec 7, 2004, 8:10:18 PM (21 years ago)

Author:

bensch

Message:

orxonox/branches/images: faster-fix

Location:

orxonox/branches/images/importer

Files:

• framework.cc (modified) (1 diff)
• material.cc (modified) (4 diffs)

orxonox/branches/images/importer/framework.cc

@@ -1 +1 @@
 #include "framework.h"
 
-int verbose = 4;
+int verbose = 1;
 
 void DrawGLScene()

orxonox/branches/images/importer/material.cc

@@ -288 +288 @@
 void Material::setDiffuse (char* rgb)
 {
-  char r[20],g[20],b[20];
-  sscanf (rgb, "%s %s %s", r, g, b);
-  setDiffuse (atof(r), atof(g), atof(b));
+  float r,g,b;
+  sscanf (rgb, "%f %f %f", &r, &g, &b);
+  setDiffuse (r, g, b);
 }
 
@@ -314 +314 @@
 void Material::setAmbient (char* rgb)
 {
-  char r[20],g[20],b[20];
-  sscanf (rgb, "%s %s %s", r, g, b);
-  setAmbient (atof(r), atof(g), atof(b));
+  float r,g,b;
+  sscanf (rgb, "%f %f %f", &r, &g, &b);
+  setAmbient (r, g, b);
 }
 
@@ -340 +340 @@
 void Material::setSpecular (char* rgb)
 {
-  char r[20],g[20],b[20];
-  sscanf (rgb, "%s %s %s", r, g, b);
-  setSpecular (atof(r), atof(g), atof(b));
+  float r,g,b;
+  sscanf (rgb, "%f %f %f", &r, &g, &b);
+  setSpecular (r, g, b);
 }
 
@@ -378 +378 @@
 void Material::setTransparency (char* trans)
 {
-  char tr[20];
-  sscanf (trans, "%s", tr);
-  setTransparency (atof(tr));
+  setTransparency (atof(trans));
 }