Changeset 2776 in orxonox.OLD for orxonox/branches

Timestamp:

Nov 10, 2004, 2:19:31 AM (20 years ago)

Author:

bensch

Message:

orxonox/branches/importer: added minimum material importer. does nothing for the time being

Location:

orxonox/branches/importer/importer

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (4 diffs)
• array.h (modified) (2 diffs)
• material.cc (added)
• material.h (added)
• object.cc (modified) (4 diffs)
• object.h (modified) (4 diffs)

orxonox/branches/importer/importer/Makefile.am

@@ -6 +6 @@
 
 bin_PROGRAMS=importer
-importer_SOURCES=framework.cc windowHandler.cc object.cc array.cc 
+importer_SOURCES=framework.cc windowHandler.cc object.cc array.cc material.cc
 
-noinst_HEADERS=windowHandler.h object.h array.h
+noinst_HEADERS=windowHandler.h object.h array.h material.h
 
 

orxonox/branches/importer/importer/Makefile.in

@@ -53 +53 @@
 PROGRAMS = $(bin_PROGRAMS)
 am_importer_OBJECTS = framework.$(OBJEXT) windowHandler.$(OBJEXT) \
-        object.$(OBJEXT) array.$(OBJEXT)
+        object.$(OBJEXT) array.$(OBJEXT) material.$(OBJEXT)
 importer_OBJECTS = $(am_importer_OBJECTS)
 importer_LDADD = $(LDADD)
@@ -60 +60 @@
 am__depfiles_maybe = depfiles
 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/array.Po ./$(DEPDIR)/framework.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/object.Po ./$(DEPDIR)/windowHandler.Po
+@AMDEP_TRUE@    ./$(DEPDIR)/material.Po ./$(DEPDIR)/object.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/windowHandler.Po
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
         $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@ -150 +151 @@
 AM_CXXFLAGS = "-I/usr/X11R6/include"
 AM_LDFLAGS = "-L/usr/Mesa-6.0.1/lib  -L/usr/X11R6/lib -lXt -lX11" $(MWINDOWS)
-importer_SOURCES = framework.cc windowHandler.cc object.cc array.cc 
-noinst_HEADERS = windowHandler.h object.h array.h
+importer_SOURCES = framework.cc windowHandler.cc object.cc array.cc material.cc
+noinst_HEADERS = windowHandler.h object.h array.h material.h
 all: all-am
 
@@ -220 +221 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/array.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/framework.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/material.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/object.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/windowHandler.Po@am__quote@

orxonox/branches/importer/importer/array.h

@@ -1 @@
-//#include "windowHandler.h"
+#ifndef _ARRAY_H
+#define _ARRAY_H
+
 #include <GL/gl.h>
 #include <GL/glu.h>
@@ -24 +26 @@
 
 };
+
+#endif

orxonox/branches/importer/importer/object.cc

@@ -1 +1 @@
 #include "object.h"
+
 Object::Object ()
 {
@@ -80 +81 @@
         {
           readFace (Buffer+2);
+        }
+      
+      else if (!strncmp(Buffer, "mtllib", 6))
+        {
+          readMtlLib (Buffer+7);
         }
 
@@ -173 +179 @@
 }
 
+bool Object::readMtlLib (char* mtlFile)
+{
+  MTL_FILE = new ifstream (mtlFile);
+  if (!MTL_FILE->is_open())
+    {
+      printf ("unable to open file: %s\n", mtlFile);
+      return false;
+    }
+  
+  char Buffer[500];
+  vertices = new Array();
+  faces = new Array();
+  
+  while(!MTL_FILE->eof())
+    {
+      MTL_FILE->getline(Buffer, 500);
+      //      printf("%s\n", Buffer);
+      
+
+      // create new Material
+      if (!strncmp(Buffer, "newmtl ", 2))
+        {
+          material = new Material(Buffer+7);
+        }
+      // setting a illumMode
+      else if (!strncmp(Buffer, "illum", 5))
+        {
+          material->setIllum(Buffer+6);
+        }
+      // setting Diffuse Color
+      else if (!strncmp(Buffer, "Kd", 2))
+        {
+          material->setDiffuse(Buffer+3);
+        }
+      // setting Ambient Color
+      else if (!strncmp(Buffer, "Ka", 2))
+        {
+          material->setAmbient(Buffer+3);
+        }
+      // setting Specular Color
+      else if (!strncmp(Buffer, "Ks", 2))
+        {
+          material->setSpecular(Buffer+3);
+        }
+     
+
+
+    }
+  return true;
+}
 
 bool Object::readUseMtl (char* matString)
@@ -178 +234 @@
   if (faceMode != -1)
     glEnd();
-  faceMode = 1;
+  faceMode = 0;
+  //printf ("%s\n", matString);
   glColor3f((float)rand()/2000000000.0,(float)rand()/2000000000.0,(float)rand()/2000000000.0);
 }
+
+

orxonox/branches/importer/importer/object.h

@@ -1 @@
-#ifndef OBJECT_H
-#define OBJECT_H
+#ifndef _OBJECT_H
+#define _OBJECT_H
 
 #include <GL/gl.h>
@@ -6 +6 @@
 
 #include "array.h"
+#include "material.h"
 #include <fstream.h>
 
@@ -32 +33 @@
   int faceMode;
   bool readVertices;
+  Material* material;
 
   ifstream* OBJ_FILE;
@@ -39 +41 @@
   bool readFace (char* faceString);
   bool readVT (char* vtString);
-  bool readUseMtl (char* matString);
+  bool readMtlLib (char* matFile);
+  bool readUseMtl (char* mtlString);
 
   bool addGLElement (char* elementString);