Changeset 4885 in orxonox.OLD for orxonox/trunk/src/util

Timestamp:

Jul 18, 2005, 3:36:18 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the weaponSystem back to the trunk, because it seems safe
merged with command:
svn merge -r 4847:HEAD branches/weaponSystem/ trunk/
conflict in file src/world-entities/weapons/weapon.h resolved in favor of the weaponSystem

Location:

orxonox/trunk/src/util

Files:

• animation/t_animation.h (modified) (1 diff)
• loading/factory.h (modified) (4 diffs)
• loading/game_loader.cc (modified) (1 diff)
• loading/game_loader.h (modified) (2 diffs)

orxonox/trunk/src/util/animation/t_animation.h

@@ -205 +205 @@
               this->nextKeyFrame = this->keyFrameList->nextElement(this->currentKeyFrame);
 
-              printf("%p from:%f to:%f\n", this->currentKeyFrame,this->currentKeyFrame->value, this->nextKeyFrame->value);
+              //printf("%p from:%f to:%f\n", this->currentKeyFrame,this->currentKeyFrame->value, this->nextKeyFrame->value);
               this->setAnimFunc(this->currentKeyFrame->animFunc);
             }

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

@@ -15 +15 @@
 
 /*!
-  \file factory.h
-  \brief A loadable object handler
+ * @file factory.h
+ * @brief A loadable object handler
 */
 
@@ -31 +31 @@
 
 /**
-    Creates a factory to a Loadable Class.
-    this should be used at the beginning of all the Classes that should be loadable (in the cc-file)
-  @todo make factoryName a BaseObject-parameter. (else it would be redundant)
+ * Creates a factory to a Loadable Class.
+ * this should be used at the beginning of all the Classes that should be loadable (in the cc-file)
 */
-#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
@@ -48 +48 @@
 
   static void registerFactory( Factory* factory);
-  /** \brief sets the Next factory in the list @param nextFactory the next factory */
+  /** sets the Next factory in the list @param nextFactory the next factory */
   inline void setNext( Factory* nextFactory) { this->next = nextFactory; };
   /** @returns the first factory */
@@ -54 +54 @@
   /** @returns the next factory */
   Factory* getNext() const { return this->next; };
-
-
-  private:
 
   private:

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

@@ -19 +19 @@
 #include "campaign.h"
 #include "world.h"
-#include "player.h"
 #include "orxonox.h"
 #include "camera.h"

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

@@ -1 +1 @@
 /*!
-    \file game_loader.h
-  *  loads campaigns, worlds and all other story_entities
+ * @file game_loader.h
+ *  loads campaigns, worlds and all other story_entities
 */
 
@@ -18 +18 @@
 class Campaign;
 class World;
-class Camera;
-class CammandNode;
 class Factory;
 class TiXmlElement;