Changeset 9320 in orxonox.OLD for branches/proxy/src/subprojects

Timestamp:

Jul 18, 2006, 11:04:32 AM (18 years ago)

Author:

bensch

Message:

valgrind stuff

Location:

branches/proxy/src/subprojects/recapture_mouse

Files:

• Makefile.am (modified) (1 diff)
• recapturer.cc (modified) (1 diff)

branches/proxy/src/subprojects/recapture_mouse/Makefile.am

@@ -27 +27 @@
 
 recapturemouse_SOURCES= \
-                ../framework.cc \
-                recapturer.cc \
-                $(MAINSRCDIR)/world_entities/space_ships/space_ship.cc \
-                $(MAINSRCDIR)/world_entities/weapons/test_gun.cc
-
+                recapturer.cc

branches/proxy/src/subprojects/recapture_mouse/recapturer.cc

@@ -16 +16 @@
 */
 
-#include "framework.h"
+#include "event_handler.h"
 
-#include "light.h"
+int verbose = 3;
 
-#include "objModel.h"
-#include "md2/md2Model.h"
-#include "primitive_model.h"
-#include <stdlib.h>
-
-#include "vertex_array_model.h"
-
-#include "util/loading/resource_manager.h"
-
-Model* obj;
-
-void Framework::moduleInit(int argc, char** argv)
+int main(int argc, char** argv)
 {
-  ResourceManager::getInstance()->addImageDir("./");
-
-  for (int i = 0; i < argc; i++)
-  {
-    printf("%s\n", argv[i]);
-  }
-  ResourceManager::getInstance()->addImageDir("");
-
-
-  if (argc>=3)
-  {
-    if( strstr(argv[1], ".obj") != NULL)
-      obj = new OBJModel (argv[1], atof(argv[2]));
-    else if( strstr(argv[1], ".md2") != NULL)
-    {
-      obj = new MD2Model(argv[1], argv[2]);
-      ((MD2Model*)obj)->tick(0.1f);
-    }
-  }
-  else if (argc>=2)
-  {
-    if( strstr(argv[1], ".obj") != NULL)
-      obj = new OBJModel(argv[1]);
-    else if( strstr(argv[1], ".md2") != NULL) {
-      obj = new MD2Model(argv[1], "fake_texture.bad");
-      obj = new MD2Model(argv[1], argv[2]);
-      ((MD2Model*)obj)->tick(0.1f);
-    }
-  }
- // else
-    obj = new PrimitiveModel(PRIM_CYLINDER);
-
-
-  ResourceManager::getInstance()->debug();
-
-  LightManager* lightMan = LightManager::getInstance();
-  lightMan->setAmbientColor(.1,.1,.1);
-  (new Light())->setAbsCoor(5.0, 10.0, 40.0);
-  (new Light())->setAbsCoor(-10, -20, -100);
+  EventHandler::getInstance()->grabEvents(true);
+  EventHandler::getInstance()->grabEvents(false);
+  exit(-1);
 }
-
-void Framework::moduleEventHandler(SDL_Event* event)
-{
-  switch (event->type)
-    {
-    case SDL_KEYDOWN:
-      switch (event->key.keysym.sym)
-        {
-        case SDLK_i:
-          break;
-        }
-    }
-}
-
-void Framework::moduleTick(float dt)
-{
-
-}
-
-void Framework::moduleDraw(void) const
-{
-  LightManager::getInstance()->draw();
-  obj->draw();
-
-}
-
-
-void Framework::moduleHelp(void) const
-{
-
-}