Changeset 4730 in orxonox.OLD for orxonox/trunk

Timestamp:

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

Author:

bensch

Message:

orxonox/trunk: loading fields

Location:

orxonox/trunk/src

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (1 diff)
• lib/physics/Makefile.am (modified) (1 diff)
• lib/physics/Makefile.in (modified) (1 diff)
• lib/physics/fields/field.cc (modified) (1 diff)
• lib/physics/fields/field.h (modified) (1 diff)
• lib/physics/fields/gravity.cc (modified) (2 diffs)
• lib/physics/physics_engine.cc (modified) (5 diffs)
• story_entities/world.cc (modified) (4 diffs)
• util/loading/factory.cc (modified) (2 diffs)
• util/loading/factory.h (modified) (5 diffs)

orxonox/trunk/src/Makefile.am

@@ -153 +153 @@
 endif
 
-SUBDIRS = lib . $(SUB_PROGS) subprojects
+SUBDIRS = lib . $(SUB_PROGS)
 
 

orxonox/trunk/src/Makefile.in

@@ -391 +391 @@
 @SUB_PROJECTS_FALSE@SUB_PROGS = 
 @SUB_PROJECTS_TRUE@SUB_PROGS = subprojects
-SUBDIRS = lib . $(SUB_PROGS) subprojects
+SUBDIRS = lib . $(SUB_PROGS)
 all: all-recursive
 

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());
 

orxonox/trunk/src/story_entities/world.cc

@@ -415 +415 @@
 
     LoadParam<ParticleEngine>(root, "ParticleEngine", ParticleEngine::getInstance(), &ParticleEngine::loadParams);
+    LoadParam<PhysicsEngine>(root, "PhysicsEngine", PhysicsEngine::getInstance(), &PhysicsEngine::loadParams);
 
   // find Track
@@ -494 +495 @@
   ////////////
 
-  Field* gravity = new Gravity();
-  gravity->setMagnitude(30.0);
-
+  Gravity* test = new Gravity();
 
   // SYSTEM TRAILING THE PLAYER
@@ -525 +524 @@
   particleEngine->addConnection(emitter, system);
 
-  new PhysicsConnection(system, gravity);
+  //new PhysicsConnection(system, gravity);
   //    new PhysicsConnection(this->localPlayer, gravity);
 
@@ -552 +551 @@
 
 
-//   new PhysicsConnection(testEntity, gravity);
-
-  // printing out some debug stuff
-  NullParent::getInstance()->debug(0);
-  this->localPlayer->whatIs();
-  this->whatIs();
-  GraphicsEngine::getInstance()->whatIs();
+  PhysicsEngine::getInstance()->debug();
+
 }
 

orxonox/trunk/src/util/loading/factory.cc

@@ -35 +35 @@
   this->setName(factoryName);
 
+  if (Factory::first == NULL)
+    Factory::first = this;
   next = NULL;
 
   initialize();
 }
+
+Factory* Factory::first = NULL;
 
 /**
@@ -55 +59 @@
 
 /**
-   \brief generates the associated object from data
-*/
-BaseObject* Factory::fabricate(const TiXmlElement* data)
-{
-  return NULL;
-}
-
-/**
    \brief make this particular factory known to the LevelFactory
 */
 void Factory::initialize()
 {
-#ifdef IS_ORXONOX
   GameLoader::getInstance()->registerFactory( this);
-#endif /* IS_ORXONOX */
 }
 

orxonox/trunk/src/util/loading/factory.h

@@ -35 +35 @@
   \todo make factoryName a BaseObject-parameter. (else it would be redundant)
 */
-#define CREATE_FACTORY(CLASS_NAME) tFactory<CLASS_NAME>* global_##CLASS_NAME##Factory = new tFactory<CLASS_NAME>(#CLASS_NAME)
+#define CREATE_FACTORY(CLASS_NAME) tFactory<CLASS_NAME>* global_##CLASS_NAME##_Factory = new tFactory<CLASS_NAME>(#CLASS_NAME)
 
 //! The Factory is a loadable object handler
@@ -45 +45 @@
 
 
-  virtual BaseObject* fabricate(const TiXmlElement* root);
+  virtual BaseObject* fabricate(const TiXmlElement* root) = NULL;
   void initialize();
   void registerFactory( Factory* factory);
   /** \brief sets the Next factory in the list \param nextFactory the next factory */
   inline void setNext( Factory* nextFactory) { this->next = nextFactory; };
+  /** \returns the first factory */
+  static Factory* getFirst(void) { return Factory::first; };
   /** \returns the next factory */
   Factory* getNext(void) const { return this->next; };
+
 
  private:
@@ -69 +72 @@
 
   private:
-  BaseObject* fabricate(const TiXmlElement* root);
+  virtual BaseObject* fabricate(const TiXmlElement* root);
 };
 
@@ -79 +82 @@
 tFactory<T>::tFactory(const char* factoryName) : Factory(factoryName)
 {
-  PRINTF(5)("fileName: %s loadable\n", this->getName());
+  PRINTF(5)("Class: %s loadable\n", this->getName());
 }
 
@@ -90 +93 @@
 BaseObject* tFactory<T>::fabricate(const TiXmlElement* root)
 {
-  if(!strcmp(root->Value(), getName()))
+  if(!strcmp(root->Value(), this->getName()))
     return new T ( root);
   else if( getNext() != NULL)