Changeset 4730 in orxonox.OLD for orxonox/trunk/src/lib/physics

Timestamp:

Jun 29, 2005, 1:46:15 AM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: loading fields

Location:

orxonox/trunk/src/lib/physics

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (1 diff)
• fields/field.cc (modified) (1 diff)
• fields/field.h (modified) (1 diff)
• fields/gravity.cc (modified) (2 diffs)
• physics_engine.cc (modified) (5 diffs)

orxonox/trunk/src/lib/physics/Makefile.am

@@ -2 +2 @@
 include $(MAINSRCDIR)/defs/include_paths.am
 
-noinst_LIBRARIES = libORXphysics.a 
+noinst_LIBRARIES = libORXphysics.a
 
 libORXphysics_a_SOURCES = physics_interface.cc \
-                          physics_connection.cc \
-                          physics_engine.cc \
-                          fields/field.cc \
-                          fields/gravity.cc \
-                          fields/point_gravity.cc \
-                          fields/twirl.cc
+                          physics_connection.cc \
+                          physics_engine.cc \
+                          fields/field.cc \
+                          fields/gravity.cc \
+                          fields/point_gravity.cc \
+                          fields/twirl.cc
 
 noinst_HEADERS= physics_interface.h \
-                physics_connection.h \
-                physics_engine.h \
-                fields/fields.h \
-                fields/field.h \
-                fields/gravity.h \
-                fields/point_gravity.h \
-                fields/twirl.h
+                physics_connection.h \
+                physics_engine.h \
+                fields/fields.h \
+                fields/field.h \
+                fields/gravity.h \
+                fields/point_gravity.h \
+                fields/twirl.h

orxonox/trunk/src/lib/physics/Makefile.in

@@ -187 +187 @@
 target_vendor = @target_vendor@
 MAINSRCDIR = ../..
-noinst_LIBRARIES = libORXphysics.a 
+noinst_LIBRARIES = libORXphysics.a
 libORXphysics_a_SOURCES = physics_interface.cc \
-                          physics_connection.cc \
-                          physics_engine.cc \
-                          fields/field.cc \
-                          fields/gravity.cc \
-                          fields/point_gravity.cc \
-                          fields/twirl.cc
+                          physics_connection.cc \
+                          physics_engine.cc \
+                          fields/field.cc \
+                          fields/gravity.cc \
+                          fields/point_gravity.cc \
+                          fields/twirl.cc
 
 noinst_HEADERS = physics_interface.h \
-                physics_connection.h \
-                physics_engine.h \
-                fields/fields.h \
-                fields/field.h \
-                fields/gravity.h \
-                fields/point_gravity.h \
-                fields/twirl.h
+                physics_connection.h \
+                physics_engine.h \
+                fields/fields.h \
+                fields/field.h \
+                fields/gravity.h \
+                fields/point_gravity.h \
+                fields/twirl.h
 
 all: all-am

orxonox/trunk/src/lib/physics/fields/field.cc

@@ -30 +30 @@
 {
   this->init();
-}
-
-/**
-  \param root The XML-element to load settings from
- */
-Field::Field(const TiXmlElement* root)
-{
-  this->init();
-  this->loadParams(root);
 }
 

orxonox/trunk/src/lib/physics/fields/field.h

@@ -36 +36 @@
  public:
   Field();
-  Field(const TiXmlElement* root);
   virtual ~Field();
 

orxonox/trunk/src/lib/physics/fields/gravity.cc

@@ -10 +10 @@
 
    ### File Specific:
-   main-programmer: ...
+   main-programmer: Benjamin Grauer
    co-programmer: ...
 */
@@ -53 +53 @@
 {
   static_cast<Field*>(this)->loadParams(root);
-
 }
 

orxonox/trunk/src/lib/physics/physics_engine.cc

@@ -21 +21 @@
 
 #include "list.h"
-#include "game_loader.h"
 #include "tinyxml.h"
+#include "factory.h"
 
 using namespace std;
@@ -30 +30 @@
    \brief standard constructor
 */
-PhysicsEngine::PhysicsEngine()
+PhysicsEngine::PhysicsEngine(void)
 {
   this->setClassID(CL_PHYSICS_ENGINE, "PhysicsEngine");
@@ -48 +48 @@
 
 */
-PhysicsEngine::~PhysicsEngine ()
+PhysicsEngine::~PhysicsEngine(void)
 {
   PhysicsEngine::singletonRef = NULL;
@@ -56 +56 @@
   \param root the XML-element to load settings from
  */
-void loadParams(const TiXmlElement* root)
-{
-  const TiXmlElement* element;
-
-  PRINTF(4)("Loading Physical Fields\n");
+void PhysicsEngine::loadParams(const TiXmlElement* root)
+{
+  const TiXmlElement* element = NULL;
+
+  PRINTF(0)("Loading Physical Fields\n");
   element = root->FirstChildElement("Fields");
-  {
-    element = element->FirstChildElement();
-    GameLoader::getInstance()->fabricate(element);
+  printf("PPPPPOOOOINNNTERRRR: %p\n", element);
+  element = element->FirstChildElement();
+  printf("PPPPPOOOOINNNTERRRR: %p\n", element);
+  while (element != NULL)
+  {
+    Factory::getFirst()->fabricate(element)->getName();
 
     element = element->NextSiblingElement();
   }
-
-  PRINTF(4)("Loading Physical Connections\n");
-  element = root->FirstChildElement("PhysicsConnections");
-  {
-    element = element->FirstChildElement();
-    GameLoader::getInstance()->fabricate(element);
+  element = NULL;
+
+  PRINTF(0)("Loading Physical Connections\n");
+  element = root->FirstChildElement("Connections");
+  element = element->FirstChildElement();
+  while (element != NULL)
+  {
+    Factory::getFirst()->fabricate(element);
 
     element = element->NextSiblingElement();
   }
-
-}
-
-
-
+}
 
 /**
@@ -260 +261 @@
   PRINT(0)(" reference: %p\n", this);
   PRINT(0)(" number of Interfaces: %d\n", this->interfaces->getSize());
+  PRINT(0)(" number of Fields: %d\n", this->fields->getSize());
   PRINT(0)(" number of Connections: %d\n", this->connections->getSize());