Changeset 4272 in orxonox.OLD for orxonox/trunk/src/subprojects/importer

Timestamp:

May 22, 2005, 8:41:51 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: importer now uses the graphicsEngine to generate a Window → orxonox gets modular

Location:

orxonox/trunk/src/subprojects/importer

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (4 diffs)
• framework.cc (modified) (9 diffs)
• framework.h (modified) (2 diffs)
• windowHandler.cc (deleted)
• windowHandler.h (deleted)

orxonox/trunk/src/subprojects/importer/Makefile.am

@@ -34 +34 @@
 
 importer_SOURCES= framework.cc \
-                  windowHandler.cc \
                   $(MAINSRCDIR)/lib/graphics/importer/model.cc \
                   $(MAINSRCDIR)/lib/graphics/importer/objModel.cc \

orxonox/trunk/src/subprojects/importer/Makefile.in

@@ -53 +53 @@
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
-am_importer_OBJECTS = framework.$(OBJEXT) windowHandler.$(OBJEXT) \
-        model.$(OBJEXT) objModel.$(OBJEXT) primitive_model.$(OBJEXT) \
-        array.$(OBJEXT) material.$(OBJEXT) texture.$(OBJEXT) \
-        graphics_engine.$(OBJEXT) base_object.$(OBJEXT) \
-        vector.$(OBJEXT) resource_manager.$(OBJEXT) \
-        text_engine.$(OBJEXT) p_node.$(OBJEXT) null_parent.$(OBJEXT)
+am_importer_OBJECTS = framework.$(OBJEXT) model.$(OBJEXT) \
+        objModel.$(OBJEXT) primitive_model.$(OBJEXT) array.$(OBJEXT) \
+        material.$(OBJEXT) texture.$(OBJEXT) graphics_engine.$(OBJEXT) \
+        base_object.$(OBJEXT) vector.$(OBJEXT) \
+        resource_manager.$(OBJEXT) text_engine.$(OBJEXT) \
+        p_node.$(OBJEXT) null_parent.$(OBJEXT)
 importer_OBJECTS = $(am_importer_OBJECTS)
 importer_LDADD = $(LDADD)
@@ -74 +74 @@
 @AMDEP_TRUE@    ./$(DEPDIR)/resource_manager.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/text_engine.Po ./$(DEPDIR)/texture.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/vector.Po ./$(DEPDIR)/windowHandler.Po
+@AMDEP_TRUE@    ./$(DEPDIR)/vector.Po
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
         $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@ -198 +198 @@
 AM_LDFLAGS = $(MWINDOWS)
 importer_SOURCES = framework.cc \
-                  windowHandler.cc \
                   $(MAINSRCDIR)/lib/graphics/importer/model.cc \
                   $(MAINSRCDIR)/lib/graphics/importer/objModel.cc \
@@ -296 +295 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/texture.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@
 
 .cc.o:

orxonox/trunk/src/subprojects/importer/framework.cc

@@ -19 +19 @@
 
 #include "primitive_model.h"
+#include "debug.h"
+#include "graphics_engine.h"
+
 
 
@@ -61 +64 @@
 
   Uint8* keys; // This variable will be used in the keyboard routine
-  int done=FALSE; // We aren't done yet, are we?
+  int done = false; // We aren't done yet, are we?
 
   // Create a new OpenGL window with the title "Cone3D Basecode" at
   // 640x480x32, fullscreen and check for errors along the way
-  if(wHandler.CreateGLWindow("Whandler Basecode", 800, 600, 32, FALSE) == FALSE)
-  {
-    // If an error is found, display a message, kill the GL and SDL screens (if they were created) and exit
-    PRINTF(1)("Could not initalize OpenGL :(\n\n");
-    wHandler.KillGLWindow();
-    return 0;
-  }
-  
-  PRINTF(2)("screensize: %i, %i\n", wHandler.screen->w, wHandler.screen->h);
+  GraphicsEngine::getInstance();
+
   if (argc>=3)
     obj = new OBJModel (argv[1], atof(argv[2]));
@@ -81 +77 @@
     obj = new PrimitiveModel(CYLINDER);
 
-  M = Vector(wHandler.screen->w/2, wHandler.screen->h/2, 0); 
+  M = Vector(GraphicsEngine::getInstance()->getResolutionY()/2, GraphicsEngine::getInstance()->getResolutionX()/2, 0); 
   rotAxis = Vector (0.0,1.0,0.0);
   rotAngle = 0;
@@ -138 +134 @@
             int mX = event.button.x;
             int mY = event.button.y;
-            int wH = wHandler.screen->h;
-            int wW = wHandler.screen->w;
+            int wH = GraphicsEngine::getInstance()->getResolutionY();
+            int wW = GraphicsEngine::getInstance()->getResolutionX();
             Vector tmpV (mX, mY, sqrt ( (float) abs(wH * wH/4 - (wW/2-mX) * (wW/2-mX) - (wH/2-mY) * (wH/2-mY)) ));
             //      PRINTF(0)("tmpV: %f, %f, %f\n", tmpV.x, tmpV.y, tmpV.z);
@@ -182 +178 @@
             int mX = event.button.x;
             int mY = event.button.y;
-            int wH = wHandler.screen->h;
-            int wW = wHandler.screen->w;
+            int wH = GraphicsEngine::getInstance()->getResolutionY();
+            int wW = GraphicsEngine::getInstance()->getResolutionX();
             Vector tmpV (mX, mY, sqrt ( (float) abs(wH * wH/4 - (wW/2-mX) * (wW/2-mX) - (wH/2-mY) * (wH/2-mY)) ));
             p1 = tmpV-M;
@@ -193 +189 @@
             PRINTF(0)("MouseButton %d pressed at (%d,%d).\n",
                    event.button.button, event.button.x, event.button.y);
-            rotatorV = ( (float)wHandler.screen->w/2 -event.button.x) / (float)wHandler.screen->w / 100.0;
+            rotatorV = ( (float)GraphicsEngine::getInstance()->getResolutionY()/2 -event.button.x) / (float)GraphicsEngine::getInstance()->getResolutionY() / 100.0;
           }
             
@@ -233 +229 @@
       case SDL_QUIT:
         // then we're done and we'll end this program
-          done=TRUE;
+          done=true;
           break;
       default:
@@ -246 +242 @@
 
     // and check if ESCAPE has been pressed. If so then quit
-    if(keys[SDLK_ESCAPE]) done=TRUE;
+    if(keys[SDLK_ESCAPE]) done=true;
   }
 
@@ -252 +248 @@
   if (obj)
     delete obj;
-  wHandler.KillGLWindow();
+  delete GraphicsEngine::getInstance();
   // And quit
   return 0;

orxonox/trunk/src/subprojects/importer/framework.h

@@ -2 +2 @@
 #define _FRAMEWORK_H
  
-#include "windowHandler.h" // Include the Whandler Basecode
 #include "objModel.h"
 #include "vector.h"
-
-class Vector;
 
 float rotatorP;
@@ -34 +31 @@
 bool mouse1Down;
 
-WindowHandler wHandler;  // Create an instance of the whandler basecode class
 Model* obj;