Changeset 4626 in orxonox.OLD for orxonox/trunk/src/subprojects

Timestamp:

Jun 13, 2005, 11:30:58 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: fight for a working lin alg jacobi decomposition algorithm.

Location:

orxonox/trunk/src/subprojects/collision_detection

Files:

• Makefile.am (modified) (2 diffs)
• Makefile.in (modified) (1 diff)
• collision_detection.cc (modified) (2 diffs)

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

@@ -13 +13 @@
                   $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS) \
                   -lpthread
+
+
 
 collision_CPPFLAGS =  -DGUI_MODULE \
@@ -39 +41 @@
                    $(MAINSRCDIR)/lib/coord/p_node.cc \
                    $(MAINSRCDIR)/lib/coord/null_parent.cc \
-                   $(MAINSRCDIR)/lib/gui/gui_gtk.cc \
                    $(MAINSRCDIR)/lib/newmat/include.h \
                    $(MAINSRCDIR)/lib/newmat/newmat.h \
                    $(MAINSRCDIR)/lib/newmat/newmatap.h \
-                   $(MAINSRCDIR)/lib/newmatio.h
+                   $(MAINSRCDIR)/lib/newmatio.h \
+                   $(MAINSRCDIR)/lib/gui/gui_gtk.cc

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

@@ -256 +256 @@
                    $(MAINSRCDIR)/lib/coord/p_node.cc \
                    $(MAINSRCDIR)/lib/coord/null_parent.cc \
-                   $(MAINSRCDIR)/lib/gui/gui_gtk.cc \
                    $(MAINSRCDIR)/lib/newmat/include.h \
                    $(MAINSRCDIR)/lib/newmat/newmat.h \
                    $(MAINSRCDIR)/lib/newmat/newmatap.h \
-                   $(MAINSRCDIR)/lib/newmatio.h
+                   $(MAINSRCDIR)/lib/newmatio.h \
+                   $(MAINSRCDIR)/lib/gui/gui_gtk.cc
 
 all: all-am

orxonox/trunk/src/subprojects/collision_detection/collision_detection.cc

@@ -35 +35 @@
   model = new MD2Model("models/tris.md2", "models/tris.pcx");
   model->tick(0.1f);
-  CDEngine::getInstance()->debugSpawnTree(1, model->data->pVertices, model->data->numVertices);
+  CDEngine::getInstance()->debugSpawnTree(10, model->data->pVertices, model->data->numVertices);
+
 
   LightManager* lightMan = LightManager::getInstance();
@@ -87 +88 @@
 void Framework::moduleInitGui(int argc, char** argv)
 {
-//   Window* guiMainWindow = NULL;
-//
-//   initGUI(0, NULL);
-//
-//   guiMainWindow = new Window("Collision_detection");
-//   {
-//     // all the Widgets you need
-//   }
-//   Window::mainWindow->showall();
-//   Window::mainWindow->setSize(300, 500);
+  Window* guiMainWindow = NULL;
+
+  initGUI(0, NULL);
+
+  guiMainWindow = new Window("Collision_detection");
+  {
+    //all the Widgets you need
+  }
+  Window::mainWindow->showall();
+  Window::mainWindow->setSize(300, 500);
 }