Changeset 3427 in orxonox.OLD

Timestamp:

Feb 28, 2005, 11:38:10 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk/importer: cleaned up the includes, while watching some Monty Python

Location:

orxonox/trunk/src

Files:

• Makefile.in (modified) (1 diff)
• importer/Makefile.am (modified) (1 diff)
• importer/Makefile.in (modified) (3 diffs)
• importer/array.h (modified) (1 diff)
• importer/framework.cc (modified) (1 diff)
• importer/framework.h (modified) (1 diff)
• importer/material.cc (modified) (1 diff)
• importer/material.h (modified) (1 diff)
• importer/model.cc (modified) (1 diff)
• importer/model.h (modified) (2 diffs)
• importer/objModel.cc (modified) (1 diff)
• importer/vector.cc (deleted)
• importer/vector.h (deleted)

orxonox/trunk/src/Makefile.in

@@ -318 +318 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/Makefile'; \
         cd $(top_srcdir) && \
-          $(AUTOMAKE) --foreign  src/Makefile
+          $(AUTOMAKE) --gnu  src/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

orxonox/trunk/src/importer/Makefile.am

@@ -13 +13 @@
                   material.cc \
                   texture.cc \
-                  vector.cc 
+                  ../vector.cc
 
 noinst_HEADERS= framework.h \

orxonox/trunk/src/importer/Makefile.in

@@ -192 +192 @@
                   material.cc \
                   texture.cc \
-                  vector.cc 
+                  ../vector.cc
 
 noinst_HEADERS = framework.h \
@@ -215 +215 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/importer/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/importer/Makefile'; \
         cd $(top_srcdir) && \
-          $(AUTOMAKE) --foreign  src/importer/Makefile
+          $(AUTOMAKE) --gnu  src/importer/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -292 +292 @@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+vector.o: ../vector.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT vector.o -MD -MP -MF "$(DEPDIR)/vector.Tpo" -c -o vector.o `test -f '../vector.cc' || echo '$(srcdir)/'`../vector.cc; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/vector.Tpo" "$(DEPDIR)/vector.Po"; else rm -f "$(DEPDIR)/vector.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='../vector.cc' object='vector.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/vector.Po' tmpdepfile='$(DEPDIR)/vector.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o vector.o `test -f '../vector.cc' || echo '$(srcdir)/'`../vector.cc
+
+vector.obj: ../vector.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT vector.obj -MD -MP -MF "$(DEPDIR)/vector.Tpo" -c -o vector.obj `if test -f '../vector.cc'; then $(CYGPATH_W) '../vector.cc'; else $(CYGPATH_W) '$(srcdir)/../vector.cc'; fi`; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/vector.Tpo" "$(DEPDIR)/vector.Po"; else rm -f "$(DEPDIR)/vector.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='../vector.cc' object='vector.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/vector.Po' tmpdepfile='$(DEPDIR)/vector.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o vector.obj `if test -f '../vector.cc'; then $(CYGPATH_W) '../vector.cc'; else $(CYGPATH_W) '$(srcdir)/../vector.cc'; fi`
 uninstall-info-am:
 

orxonox/trunk/src/importer/array.h

@@ -12 +12 @@
 
 #include "../stdincl.h"
-#include <fstream>
-
 
 //! Array Class that handles dynamic-float arrays.

orxonox/trunk/src/importer/framework.cc

@@ -15 +15 @@
 
 #include "framework.h"
+
+#include "../vector.h"
+
 int verbose;
 void DrawGLScene()

orxonox/trunk/src/importer/framework.h

@@ -4 +4 @@
 #include "windowHandler.h" // Include the Whandler Basecode
 #include "objModel.h"
-#include "vector.h"
+
+class Vector;
 
 float rotatorP;

orxonox/trunk/src/importer/material.cc

@@ -16 +16 @@
 
 #include "material.h"
+
+#include "texture.h"
+#include <stdlib.h>
+#include <string.h>
 
 using namespace std;

orxonox/trunk/src/importer/material.h

@@ -13 +13 @@
 extern int verbose; //!< will be obsolete soon.
 
-#include "../stdincl.h"
-#include "texture.h"
-
 #if HAVE_CONFIG_H 
 #include <config.h> 
 #endif /* HAVE_CONFIG_H */
 
-
+// FORWARD DEFINITIONS //
+class Texture;
 
 

orxonox/trunk/src/importer/model.cc

@@ -15 +15 @@
 
 #include "model.h"
+
 #include <math.h>
 #include <stdarg.h>
+
+#include "array.h"
+#include "../vector.h"
 
 using namespace std;

orxonox/trunk/src/importer/model.h

@@ -7 +7 @@
 #define _MODEL_H
 
-#include "../stdincl.h"
+//#include "../stdincl.h"
 
-#include "array.h"
 #include "material.h"
-#include "vector.h"
+
+// FORWARD DEFINITION //
+class Array;
+class Vector;
 
 using namespace std;
@@ -62 +64 @@
     char* name;         //!< the Name of the Group. this is an identifier, that can be accessed via the draw (char* name) function.
 
-    GLuint listNumber;  //!< The number of the GL-List this Group gets.
+    unsigned int listNumber;//!< The number of the GL-List this Group gets.
     Face* firstFace;    //!< The first Face in this group.
     Face* currentFace;  //!< The current Face in this Group (the one we are currently working with.)

orxonox/trunk/src/importer/objModel.cc

@@ -15 +15 @@
 
 #include "objModel.h"
+
+#include <fstream>
+
+#include "../debug.h"
 
 /**