Changeset 2932 in orxonox.OLD for orxonox/trunk

Timestamp:

Nov 20, 2004, 3:00:24 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk/importer: added vectors from src. better caseCheck-in object.cc::addGLElement

Location:

orxonox/trunk/importer

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (4 diffs)
• framework.cc (modified) (2 diffs)
• framework.h (modified) (1 diff)
• object.cc (modified) (1 diff)
• vector.cc (copied) (copied from orxonox/trunk/src/vector.cc)
• vector.h (copied) (copied from orxonox/trunk/src/vector.h)

orxonox/trunk/importer/Makefile.am

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

orxonox/trunk/importer/Makefile.in

@@ -53 +53 @@
 PROGRAMS = $(bin_PROGRAMS)
 am_importer_OBJECTS = framework.$(OBJEXT) windowHandler.$(OBJEXT) \
-        object.$(OBJEXT) array.$(OBJEXT) material.$(OBJEXT)
+        vector.$(OBJEXT) object.$(OBJEXT) array.$(OBJEXT) \
+        material.$(OBJEXT)
 importer_OBJECTS = $(am_importer_OBJECTS)
 importer_LDADD = $(LDADD)
@@ -61 +62 @@
 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/array.Po ./$(DEPDIR)/framework.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/material.Po ./$(DEPDIR)/object.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/windowHandler.Po
+@AMDEP_TRUE@    ./$(DEPDIR)/vector.Po ./$(DEPDIR)/windowHandler.Po
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
         $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@ -151 +152 @@
 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 material.cc
-noinst_HEADERS = framework.h windowHandler.h object.h array.h material.h
+importer_SOURCES = framework.cc windowHandler.cc vector.cc object.cc array.cc material.cc
+noinst_HEADERS = framework.h windowHandler.h  vector.h object.h array.h material.h
 all: all-am
 
@@ -223 +224 @@
 @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)/vector.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/windowHandler.Po@am__quote@
 

orxonox/trunk/importer/framework.cc

@@ -1 +1 @@
 #include "framework.h"
 
-int verbose = 1;
+int verbose = 4;
 
 void DrawGLScene()
@@ -82 +82 @@
         break;
       case SDL_MOUSEBUTTONDOWN:
-        printf("MouseButton %d pressed at (%d,%d).\n",
-               event.button.button, event.button.x, event.button.y);
-        rotatorV = ( 250-event.button.x) / 500.0 /100;
-        
+        if (event.button.button == 4)
+          printf("MouseWheel up\n");
+        else if (event.button.button == 5)
+          printf("MouseWheel down\n");
+        else
+          {
+            printf("MouseButton %d pressed at (%d,%d).\n",
+                   event.button.button, event.button.x, event.button.y);
+            rotatorV = ( 250-event.button.x) / 500.0 /100;
+          }
+            
         break;
-      case SDL_MOUSEBUTTONUP:
+            /*      case SDL_MOUSEBUTTONUP:
         printf("MouseButton %d released at (%d,%d).\n",
                event.button.button, event.button.x, event.button.y);
-
-        
         break;
-
+            */
         // If a quit event was recieved
       case SDL_QUIT:

orxonox/trunk/importer/framework.h

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

orxonox/trunk/importer/object.cc

@@ -442 +442 @@
 
   char* texture;
-  texture = strstr (vertex, "/");
-  texture[0] = '\0';
-  texture ++;
-  if (verbose>=3)
-    printf ("includeing texture #%i, and mapping it to group texture #%i, textureArray has %i entries.\n", atoi(texture), (atoi(texture)-1 - currentGroup->firstVertexTexture)*3, currentGroup->vTexture->getCount());
-  glTexCoord2fv(currentGroup->vTexture->getArray()+(atoi(texture)-1 - currentGroup->firstVertexTexture)*2);
-
-  char* normal;
-  if ((normal = strstr (texture, "/")) !=NULL)
-    {
-      normal[0] = '\0';
-      normal ++;
-      //glArrayElement(atoi(vertex)-1);
-      glNormal3fv(currentGroup->normals->getArray() +(atoi(normal)-1 - currentGroup->firstNormal)*3);
+  if ((texture = strstr (vertex, "/")) != NULL)
+    {
+      texture[0] = '\0';
+      texture ++;
+      if (verbose>=3)
+        printf ("includeing texture #%i, and mapping it to group texture #%i, textureArray has %i entries.\n", atoi(texture), (atoi(texture)-1 - currentGroup->firstVertexTexture)*3, currentGroup->vTexture->getCount());
+      glTexCoord2fv(currentGroup->vTexture->getArray()+(atoi(texture)-1 - currentGroup->firstVertexTexture)*2);
+
+      char* normal;
+      if ((normal = strstr (texture, "/")) !=NULL)
+        {
+          normal[0] = '\0';
+          normal ++;
+          //glArrayElement(atoi(vertex)-1);
+          glNormal3fv(currentGroup->normals->getArray() +(atoi(normal)-1 - currentGroup->firstNormal)*3);
+        }
     }
   if (verbose>=3)