Changeset 3605 in orxonox.OLD for orxonox/branches/levelloader/src/lib

Timestamp:

Mar 18, 2005, 11:52:15 AM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: merged trunk back to levelloader
merged with command:
svn merge -r 3499:HEAD trunk branches/levelloader

Conflicts in
C track_manager.h
C world_entities/player.cc
C world_entities/player.h
C world_entities/environment.h
C lib/coord/p_node.cc
C defs/debug.h
C track_manager.cc
C story_entities/campaign.h

solved in merge-favouring. It was quite easy because Chris only worked on the headers, and he didi it quite clean. Thats the spirit

Conflits in world.cc are a MESS: fix it

Location:

orxonox/branches/levelloader/src/lib

Files:

• Makefile.in (modified) (5 diffs)
• coord/helper_parent.cc (modified) (1 diff)
• coord/helper_parent.h (modified) (1 diff)
• coord/null_parent.cc (modified) (6 diffs)
• coord/null_parent.h (modified) (1 diff)
• coord/p_node.cc (modified) (18 diffs)
• coord/p_node.h (modified) (5 diffs)
• graphics/Makefile.in (modified) (5 diffs)
• graphics/font/fontset.cc (modified) (1 diff)
• graphics/importer/Makefile.in (modified) (10 diffs)
• graphics/importer/array.cc (modified) (7 diffs)
• graphics/importer/array.h (modified) (1 diff)
• graphics/importer/material.cc (modified) (13 diffs)
• graphics/importer/material.h (modified) (1 diff)
• graphics/importer/model.cc (modified) (29 diffs)
• graphics/importer/objModel.cc (modified) (7 diffs)
• graphics/importer/texture.cc (modified) (32 diffs)
• graphics/importer/texture.h (modified) (1 diff)
• graphics/importer/windowHandler.h (modified) (1 diff)
• graphics/light.cc (copied) (copied from orxonox/trunk/src/lib/graphics/light.cc)
• graphics/light.h (copied) (copied from orxonox/trunk/src/lib/graphics/light.h)
• gui/Makefile.in (modified) (5 diffs)
• gui/console/Makefile.in (modified) (9 diffs)
• gui/gui/Makefile.in (modified) (9 diffs)
• gui/gui/orxonox_gui_gtk.h (modified) (1 diff)
• lang/base_object.cc (modified) (2 diffs)
• lang/base_object.h (modified) (1 diff)
• math/curve.cc (modified) (5 diffs)
• math/curve.h (modified) (4 diffs)
• math/matrix.cc (deleted)
• math/matrix.h (deleted)
• math/vector.cc (modified) (4 diffs)
• math/vector.h (modified) (2 diffs)
• util/list.h (modified) (9 diffs)

orxonox/branches/levelloader/src/lib/Makefile.in

@@ -1 @@
-# Makefile.in generated by automake 1.8.2 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
@@ -78 +78 @@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOCUMENTATION_FALSE = @DOCUMENTATION_FALSE@
+DOCUMENTATION_TRUE = @DOCUMENTATION_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_FALSE = @DOXYGEN_FALSE@
@@ -181 +183 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/Makefile'; \
         cd $(top_srcdir) && \
-          $(AUTOMAKE) --gnu  src/lib/Makefile
+          $(AUTOMAKE) --foreign  src/lib/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -276 +278 @@
         tags=; \
         here=`pwd`; \
-        if (etags --etags-include --version) >/dev/null 2>&1; then \
+        if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
           include_option=--etags-include; \
+          empty_fix=.; \
         else \
           include_option=--include; \
+          empty_fix=; \
         fi; \
         list='$(SUBDIRS)'; for subdir in $$list; do \
           if test "$$subdir" = .; then :; else \
-            test -f $$subdir/TAGS && \
+            test ! -f $$subdir/TAGS || \
               tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
           fi; \
@@ -293 +297 @@
           $(AWK) '    { files[$$0] = 1; } \
                END { for (i in files) print i; }'`; \
-        test -z "$(ETAGS_ARGS)$$tags$$unique" \
-          || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-             $$tags $$unique
+        if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+          test -n "$$unique" || unique=$$empty_fix; \
+          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+            $$tags $$unique; \
+        fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \

orxonox/branches/levelloader/src/lib/coord/helper_parent.cc

@@ -39 +39 @@
    \todo this deconstructor is not jet implemented - do it
 */
-HelperParent::~HelperParent () {}
+HelperParent::~HelperParent () 
+{
 
+}

orxonox/branches/levelloader/src/lib/coord/helper_parent.h

@@ -17 +17 @@
  public:
   HelperParent ();
-  ~HelperParent ();
-
+  virtual ~HelperParent ();
 
 };

orxonox/branches/levelloader/src/lib/coord/null_parent.cc

@@ -16 +16 @@
 */
 
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_NULL_PARENT
 
 #include "null_parent.h"
@@ -26 +27 @@
 NullParent* NullParent::getInstance ()
 {
-  if( singletonRef == NULL)
+  if(!singletonRef)
     singletonRef = new NullParent ();
   return singletonRef;
@@ -36 +37 @@
    \todo this constructor is not jet implemented - do it
 */
-NullParent::NullParent () 
+NullParent::NullParent () : PNode (new Vector(0,0,0), NULL)
 {
+  PRINTF(4)("NullParent::NullParent() - making new NullParent, there can only be one..\n");
   this->parent = this;
-  this->mode = ALL;
+  this->mode = PNODE_ALL;
+  this->setName("NullParent");
 }
 
 
-NullParent::NullParent (Vector* absCoordinate)
+NullParent::NullParent (Vector* absCoordinate) : PNode (new Vector(0,0,0), NULL)
 {
+  singletonRef = this;
   this->parent = this;
-  this->mode = ALL;
+  this->mode = PNODE_ALL;
   this->absCoordinate = *absCoordinate;
+  this->setName("NullParent");
 }
 
@@ -58 +63 @@
 NullParent::~NullParent () 
 {
-  delete singletonRef;
+  //delete singletonRef;
   singletonRef = NULL;
 }
-
-
-
 
 /**
@@ -72 +74 @@
    worry, normaly...
 */
-void NullParent::update (float timeStamp)
+void NullParent::update ()
 {
+
+  PRINTF(4)("NullParent::update - (%f, %f, %f)\n", this->absCoordinate.x, this->absCoordinate.y, this->absCoordinate.z);
   this->absCoordinate = this->relCoordinate;
   this->absDirection = parent->getAbsDir () * this->relDirection;
@@ -85 +89 @@
       if( this->bRelDirChanged || this->bAbsDirChanged)
         pn->parentDirChanged ();
-      pn->update (timeStamp);
+      pn->update ();
       pn = this->children->nextElement ();
     }

orxonox/branches/levelloader/src/lib/coord/null_parent.h

@@ -16 +16 @@
  public:
   static NullParent* getInstance ();
-  ~NullParent ();
-  
-  static NullParent* singletonRef;
+  virtual ~NullParent ();
 
-  virtual void update (float timeStamp);
+
+  virtual void update ();
 
  private:
   NullParent ();
   NullParent (Vector* absCoordinate);
+  static NullParent* singletonRef;
 
 };

orxonox/branches/levelloader/src/lib/coord/p_node.cc

@@ -13 +13 @@
    ### File Specific:
    main-programmer: Patrick Boenzli
-   co-programmer: ...
-
-   \todo Null-Parent => center of the coord system - singleton
+   co-programmer: 
+
    \todo Smooth-Parent: delay, speed
-   \todo destroy the stuff again, delete...
-*/
-
+*/
+
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_PNODE
 
 #include "p_node.h"
 
+#include "null_parent.h"
+#include "vector.h"
 
 using namespace std;
@@ -34 +35 @@
 PNode::PNode () 
 {
-  this->children = new tList<PNode>();
-  this->bRelCoorChanged = true;
-  this->bAbsCoorChanged = false;
-  this->bRelDirChanged = true;
-  this->bAbsDirChanged = false;
-  this->parent = NULL;
+  init(NULL);
+
+  NullParent* np = NullParent::getInstance();
+  np->addChild(this);
   this->objectName = NULL;
 }
@@ -51 +50 @@
 PNode::PNode (Vector* absCoordinate, PNode* parent )
 {
+  this->init(parent);
+
   this->absCoordinate = *absCoordinate;
-  this->relCoordinate = this->absCoordinate - parent->getAbsCoor ();
-  
-  this->children = new tList<PNode>();
-  this->bRelCoorChanged = true;
-  this->bAbsCoorChanged = false;
-  this->bRelDirChanged = true;
-  this->bAbsDirChanged = false;
-  this->parent = parent;
-  this->objectName = NULL;
-  
-  parent->addChild (this);
-}
-
+  if (parent != NULL)
+    {
+      this->relCoordinate = this->absCoordinate - parent->getAbsCoor ();
+      parent->addChild (this);
+    }
+  else 
+    this->relCoordinate = Vector(0,0,0);
+}
 
 /**
@@ -80 +76 @@
   delete &this->absDirection;
   */
-  this->parent = NULL;
+  //this->parent = NULL;
   if( this->objectName) delete this->objectName;
   /* there is currently a problem with cleaning up - fix*/
-}
-
+
+  PNode* pn = this->children->enumerate();
+  while( pn != NULL) 
+    { 
+      delete pn;
+      pn = this->children->nextElement();
+
+    }
+   
+  /* this deletes all children in the list */
+  delete this->children;
+
+  delete []this->objectName;
+}
+
+void PNode::init(PNode* parent)
+{
+  this->children = new tList<PNode>();
+  this->bRelCoorChanged = true;
+  this->bAbsCoorChanged = false;
+  this->bRelDirChanged = true;
+  this->bAbsDirChanged = false;
+  this->parent = parent; 
+  this->objectName = NULL;
+}
 
 /**
@@ -91 +110 @@
    cleans up all pnodes
 */
+/*
 void PNode::destroy ()
 {
@@ -99 +119 @@
       pn = this->children->nextElement();
     } 
+  // this deletes all children in the list 
   this->children->destroy ();
-}
-
+
+  static_cast<BaseObject*>(this)->destroy();
+}
+*/
 
 /**
@@ -262 +285 @@
 {}
 
-
-
 /**
    \brief adds a child and makes this node to a parent
@@ -283 +304 @@
    use this to add a child to this node.
 */
-void PNode::addChild (PNode* pNode, parentingMode mode)
-{
-  pNode->mode = mode;
+void PNode::addChild (PNode* pNode, int parentingMode)
+{
+  if( pNode->parent != NULL )
+    {
+      PRINTF(2)("PNode::addChild() - reparenting node: removing it and adding it again\n");
+      pNode->parent->children->remove(pNode);
+    }
+  pNode->mode = parentingMode;
   pNode->parent = this;
-  this->children->add (pNode);
+  this->children->add(pNode);
 }
 
@@ -294 +320 @@
    \brief removes a child from the node
    \param pNode the child to remove from this pNode.
+
+   Children from pNode will not be lost, they are referenced to NullPointer
 */
 void PNode::removeChild (PNode* pNode)
 {
+  pNode->remove();
   this->children->remove (pNode);
+  pNode->parent = NULL;
+}
+
+
+/**
+   \brief remove this pnode from the tree and adds all following to NullParent
+
+   this can be the case, if an entity in the world is been destroyed.
+*/
+void PNode::remove()
+{
+  NullParent* np = NullParent::getInstance();
+  PNode* pn = this->children->enumerate();
+  while( pn != NULL) 
+    { 
+      this->children->remove(pn);
+      np->addChild(pn, pn->getMode());
+      pn = this->children->nextElement();
+    }
 }
 
@@ -307 +355 @@
 void PNode::setParent (PNode* parent)
 {
-  this->parent = parent;
-}
+  parent->addChild(this);
+}
+
 
 /**
@@ -314 +363 @@
    \param mode the mode of the bind-type.
 */
-void PNode::setMode (parentingMode mode)
-{
-  this->mode = mode;
+void PNode::setMode (int parentingMode)
+{
+  this->mode = parentingMode;
+}
+
+
+/**
+   \brief gets the mode of this parent manualy
+   \return the mode of the bind-type.
+*/
+int PNode::getMode()
+{
+  return this->mode;
 }
 
@@ -351 +410 @@
    worry, normaly...
 */
-void PNode::update (float timeStamp)
-{
-  printf ("PNode::update - %s - (%f, %f, %f)\n", this->objectName, this->absCoordinate.x, this->absCoordinate.y, this->absCoordinate.z);
-
-      if( this->mode == MOVEMENT || this->mode == ALL)
+void PNode::update ()
+{
+  PRINTF(2)("PNode::update - %s - (%f, %f, %f)\n", this->objectName, this->absCoordinate.x, this->absCoordinate.y, this->absCoordinate.z);
+  // printf("%s", this->objectName);
+  if(this->mode & PNODE_MOVEMENT )
+    {
+      if( this->bAbsCoorChanged /*&& this->timeStamp != DataTank::timeStamp*/)
         {
-          if( this->bAbsCoorChanged /*&& this->timeStamp != DataTank::timeStamp*/)
+          /* if you have set the absolute coordinates this overrides all other changes */
+          this->relCoordinate = this->absCoordinate - parent->getAbsCoor ();
+        }
+      else if( this->bRelCoorChanged /*&& this->timeStamp != DataTank::timeStamp*/)
+        {
+          /*this is bad style... must be deleted later - just for testing*/
+          if( this->parent == NULL)
             {
-              printf("PNode::update () - this->bAbsCoorChanged = true\n");
-              /* if you have set the absolute coordinates this overrides all other changes */
-              this->relCoordinate = this->absCoordinate - parent->getAbsCoor ();
+              this->absCoordinate = this->relCoordinate;
             }
-          else if( this->bRelCoorChanged /*&& this->timeStamp != DataTank::timeStamp*/)
-            {
-              /*this is bad style... must be deleted later - just for testing*/
-              if( this->parent == NULL)
-                {
-                this->absCoordinate = this->relCoordinate;
-                }
-              else
-                this->absCoordinate = parent->getAbsCoor () + this->relCoordinate;            /* update the current absCoordinate */
-            }
+          else
+            this->absCoordinate = parent->getAbsCoor() + this->relCoordinate;         /* update the current absCoordinate */
         }
-      
-      if( this->mode == ROTATION && this->mode == ALL)
+    }
+  
+  if( this->mode & PNODE_LOCAL_ROTATE)
+    {
+      if( this->bAbsDirChanged /*&& this->timeStamp != DataTank::timeStamp*/)
         {
-          if( this->bAbsDirChanged /*&& this->timeStamp != DataTank::timeStamp*/)
-            {
-              /* if you have set the absolute coordinates this overrides all other changes */
-              this->relDirection = this->absDirection - parent->getAbsDir ();
-            }
-          else if( this->bRelDirChanged /*&& this->timeStamp != DataTank::timeStamp*/)
-            {
-              /* update the current absDirection - remember * means rotation around sth.*/
-              this->absDirection = parent->getAbsDir () * this->relDirection;
-            }
-        }    
-      // }
+          /* if you have set the absolute coordinates this overrides all other changes */
+          this->relDirection = this->absDirection - parent->getAbsDir();
+        }
+      else if( this->bRelDirChanged /*&& this->timeStamp != DataTank::timeStamp*/)
+        {
+          /* update the current absDirection - remember * means rotation around sth.*/
+          this->absDirection = parent->getAbsDir() * this->relDirection;
+        }
+    }
+  
+  if( this->mode & PNODE_ROTATE_MOVEMENT)
+    {
+      if( this->bAbsCoorChanged /*&& this->timeStamp != DataTank::timeStamp*/)
+        {
+          /* if you have set the absolute coordinates this overrides all other changes */
+          this->relCoordinate = this->absCoordinate - parent->getAbsCoor ();
+        }
+      else if( this->bRelCoorChanged /*&& this->timeStamp != DataTank::timeStamp*/)
+        {
+          /*this is bad style... must be deleted later - just for testing*/
+          if( this->parent == NULL)
+            this->absCoordinate = this->relCoordinate;
+          else
+            this->absCoordinate = parent->getAbsCoor() + parent->getAbsDir().apply(this->relCoordinate);              /* update the current absCoordinate */
+        }
+    }
+  
+  
   PNode* pn = this->children->enumerate();
   while( pn != NULL) 
@@ -397 +473 @@
       if( this->bRelDirChanged || this->bAbsDirChanged)
         pn->parentDirChanged ();
-      pn->update(timeStamp);
+      pn->update();
       pn = this->children->nextElement();
     }
@@ -415 +491 @@
 void PNode::processTick (float dt)
 {
-  this->tick (dt);
+  //this->tick (dt);
   PNode* pn = this->children->enumerate();
   while( pn != NULL) 
@@ -424 +500 @@
 }
 
-/**
-   \param dt time to tick
-*/
-void PNode::tick (float dt)
-{}
 
 /**
@@ -435 +506 @@
 void PNode::debug()
 {
-  printf("PNode::debug() - absCoord: (%f, %f, %f)\n", 
+  PRINTF(2)("PNode::debug() - absCoord: (%f, %f, %f)\n", 
          this->absCoordinate.x, 
          this->absCoordinate.y,
@@ -451 +522 @@
 void PNode::setName (const char* newName)
 {
-        int l = strlen( newName);
-        
-        if( this->objectName != NULL) delete this->objectName;
-        this->objectName = NULL;
-        
-        if( newName != NULL)
-        {
-                this->objectName = new char[l+1];
-                
-                for( int i = 0; i < l+1; i++)
-                        this->objectName[i] = newName[i];
-        }
+  if (this->objectName)
+    delete []this->objectName;
+  this->objectName = new char[strlen(newName)+1];
+  strcpy(this->objectName,newName);
 }
 
@@ -473 +536 @@
   return this->objectName;
 }
+

orxonox/branches/levelloader/src/lib/coord/p_node.h

@@ -22 +22 @@
 #define _P_NODE_H
 
-#include "stdincl.h"
+#include "base_object.h"
 
+// FORWARD DEFINITION \\
 class PNode; /* forward decleration, so that parentEntry has access to PNode */
+class Quaternion;
+class Vector;
 
 //! enumeration for the different translation-binding-types
-typedef enum parentingMode {MOVEMENT = 0, ROTATION, ALL};
+//typedef enum parentingMode {PNODE_LOCAL_ROTATE, PNODE_ROTATE_MOVEMENT, PNODE_ALL, PNODE_MOVEMENT, PNODE_ROTATE_AND_MOVE};
+// linkage modes
+#define PNODE_LOCAL_ROTATE       1    //!< Rotates all the children around their centers.
+#define PNODE_ROTATE_MOVEMENT    2    //!< Moves all the children around the center of their parent, without the rotation around their own centers.
+#define PNODE_MOVEMENT           4    //!< Moves all children along with the parent.
+// special linkage modes
+#define PNODE_ALL                3    //!< Moves all children around the center of their parent, and also rotates their centers
+#define PNODE_ROTATE_AND_MOVE    5    //!< Rotates all children around their axis, and moves them as the Parent Moves, but does not rotate around the center of their parent.
+
 //! The default mode of the translation-binding.
-#define DEFAULT_MODE ALL
+#define DEFAULT_MODE PNODE_ALL
 
 //! Patent Node is a Engine to calculate the position of an Object in respect to the position of its parent.
@@ -39 +50 @@
   virtual ~PNode ();
 
-  void destroy ();
-
   PNode* parent;            //!< a pointer to the parent node
   tList<PNode>* children;   //!< list of the children
 
-  parentingMode mode;       //!< the mode of the binding
+
 
   Vector getRelCoor ();
@@ -62 +71 @@
 
   void addChild (PNode* pNode);
-  void addChild (PNode* pNode, parentingMode mode);
+  void addChild (PNode* pNode, int parentingMode);
   void removeChild (PNode* pNode);
+  void remove();
+
+
   void setParent (PNode* parent);
   void parentCoorChanged ();
   void parentDirChanged ();
-  void setMode (parentingMode mode);
+  void setMode (int parentingMode);
+  int getMode();
 
-  virtual void update (float timeStamp);
+  virtual void update ();
   void processTick (float dt);
-  virtual void tick (float dt);
 
   void setName (const char* newName);
@@ -79 +91 @@
   void debug ();
 
+ private:
+  void init(PNode* parent);
+
+ protected:
   float timeStamp;         //!< this the timeStamp of when the abs{Coordinat, Direction} has been calculated
   char* objectName;        //!< The name of the Object
@@ -91 +107 @@
   Quaternion absDirection; //!< absolute direvtion in the world ( from (0,0,1) )
 
+  int mode;                //!< the mode of the binding
+
 };
 
 #endif /* _P_NODE_H */
+ 

orxonox/branches/levelloader/src/lib/graphics/Makefile.in

@@ -1 @@
-# Makefile.in generated by automake 1.8.2 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
@@ -78 +78 @@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOCUMENTATION_FALSE = @DOCUMENTATION_FALSE@
+DOCUMENTATION_TRUE = @DOCUMENTATION_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_FALSE = @DOXYGEN_FALSE@
@@ -175 +177 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/graphics/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/graphics/Makefile'; \
         cd $(top_srcdir) && \
-          $(AUTOMAKE) --gnu  src/lib/graphics/Makefile
+          $(AUTOMAKE) --foreign  src/lib/graphics/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -270 +272 @@
         tags=; \
         here=`pwd`; \
-        if (etags --etags-include --version) >/dev/null 2>&1; then \
+        if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
           include_option=--etags-include; \
+          empty_fix=.; \
         else \
           include_option=--include; \
+          empty_fix=; \
         fi; \
         list='$(SUBDIRS)'; for subdir in $$list; do \
           if test "$$subdir" = .; then :; else \
-            test -f $$subdir/TAGS && \
+            test ! -f $$subdir/TAGS || \
               tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
           fi; \
@@ -287 +291 @@
           $(AWK) '    { files[$$0] = 1; } \
                END { for (i in files) print i; }'`; \
-        test -z "$(ETAGS_ARGS)$$tags$$unique" \
-          || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-             $$tags $$unique
+        if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+          test -n "$$unique" || unique=$$empty_fix; \
+          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+            $$tags $$unique; \
+        fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \

orxonox/branches/levelloader/src/lib/graphics/font/fontset.cc

@@ -45 +45 @@
 #include <stdarg.h>
 
-#include "../importer/texture.h"
+#include "texture.h"
+#include <string.h>
 
 /** 

orxonox/branches/levelloader/src/lib/graphics/importer/Makefile.in

@@ -1 @@
-# Makefile.in generated by automake 1.8.2 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
@@ -42 +42 @@
 subdir = src/lib/graphics/importer
 DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
-        $(srcdir)/Makefile.in TODO
+        $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -50 +50 @@
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
-am__installdirs = $(DESTDIR)$(bindir)
+am__installdirs = "$(DESTDIR)$(bindir)"
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
@@ -98 +98 @@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOCUMENTATION_FALSE = @DOCUMENTATION_FALSE@
+DOCUMENTATION_TRUE = @DOCUMENTATION_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_FALSE = @DOXYGEN_FALSE@
@@ -215 +217 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/graphics/importer/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/graphics/importer/Makefile'; \
         cd $(top_srcdir) && \
-          $(AUTOMAKE) --gnu  src/lib/graphics/importer/Makefile
+          $(AUTOMAKE) --foreign  src/lib/graphics/importer/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -237 +239 @@
 install-binPROGRAMS: $(bin_PROGRAMS)
         @$(NORMAL_INSTALL)
-        $(mkdir_p) $(DESTDIR)$(bindir)
+        test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
         @list='$(bin_PROGRAMS)'; for p in $$list; do \
           p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
@@ -243 +245 @@
           ; then \
             f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-           echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
-           $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
+           echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+           $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
           else :; fi; \
         done
@@ -252 +254 @@
         @list='$(bin_PROGRAMS)'; for p in $$list; do \
           f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-          echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
-          rm -f $(DESTDIR)$(bindir)/$$f; \
+          echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+          rm -f "$(DESTDIR)$(bindir)/$$f"; \
         done
 
@@ -330 +332 @@
           $(AWK) '    { files[$$0] = 1; } \
                END { for (i in files) print i; }'`; \
-        test -z "$(ETAGS_ARGS)$$tags$$unique" \
-          || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-             $$tags $$unique
+        if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+          test -n "$$unique" || unique=$$empty_fix; \
+          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+            $$tags $$unique; \
+        fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
@@ -387 +391 @@
 all-am: Makefile $(PROGRAMS) $(HEADERS)
 installdirs:
-        $(mkdir_p) $(DESTDIR)$(bindir)
+        for dir in "$(DESTDIR)$(bindir)"; do \
+          test -z "$$dir" || $(mkdir_p) "$$dir"; \
+        done
 install: install-am
 install-exec: install-exec-am

orxonox/branches/levelloader/src/lib/graphics/importer/array.cc

@@ -13 +13 @@
    co-programmer: ...
 */
+
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_IMPORTER
 
 #include "array.h"
@@ -30 +32 @@
 Array::~Array()
 {
-  PRINTF(2)("deleting array\n");
+  PRINTF(4)("deleting array\n");
   Entry* walker = this->firstEntry;
   Entry* previous;
@@ -49 +51 @@
 void Array::initializeArray ()
 {
-  PRINTF(2)("crating new Array\n");
+  PRINTF(4)("crating new Array\n");
   this->firstEntry = new Entry;
   this->firstEntry->next =NULL;
@@ -64 +66 @@
 void Array::finalizeArray (void)
 {
-  PRINTF(3)("Finalizing array. Length: %i\n", entryCount);  
+  PRINTF(4)("Finalizing array. Length: %i\n", entryCount);  
   //  if ((array = (GLfloat*)malloc( entryCount* sizeof(GLfloat))) == NULL)
   if (!(this->array = new GLfloat [this->entryCount]))
@@ -87 +89 @@
   if (!this->finalized)
     {
-      PRINTF(3)("adding new Entry to Array: %f\n", entry);
+      PRINTF(5)("adding new Entry to Array: %f\n", entry);
       
       this->currentEntry->value = entry;
@@ -96 +98 @@
     }
   else 
-    PRINTF(1)("adding failed, because list has been finalized\n");
+    PRINTF(2)("adding failed, because list has been finalized\n");
 }
 
@@ -131 +133 @@
 void Array::debug ()
 {
-  PRINTF(0)("entryCount=%i, address=%p\n", this->entryCount, this->array);
+  PRINT(0)("entryCount=%i, address=%p\n", this->entryCount, this->array);
 }

orxonox/branches/levelloader/src/lib/graphics/importer/array.h

@@ -8 +8 @@
 #ifndef _ARRAY_H
 #define _ARRAY_H
-
-extern int verbose; //!< will be obsolete soon
 
 #include "stdincl.h"

orxonox/branches/levelloader/src/lib/graphics/importer/material.cc

@@ -15 +15 @@
 */
 
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_IMPORTER
+
 #include "material.h"
 
 #include "texture.h"
+#include "debug.h"
 #include <stdlib.h>
 #include <string.h>
@@ -51 +54 @@
 Material::~Material()
 {
-  PRINTF(2)("delete Material %s.\n", this->name);
+  PRINTF(4)("delete Material %s.\n", this->name);
   if (this->name)
     delete []this->name;
@@ -67 +70 @@
 Material* Material::addMaterial(char* mtlName)
 {
-  PRINTF(2)("adding Material %s.\n", mtlName);
+  PRINTF(4)("adding Material %s.\n", mtlName);
    Material* tmpMat = this;
   while (tmpMat->nextMat != NULL)
@@ -83 +86 @@
 void Material::init(void)
 {
-  PRINTF(2)("initializing new Material.\n");
+  PRINTF(4)("initializing new Material.\n");
   this->nextMat = NULL;
   this->name ="";
@@ -112 +115 @@
 Material* Material::search(char* mtlName)
 {
-  PRINTF(2)("Searching for material %s", mtlName);
+  PRINTF(5)("Searching for material %s", mtlName);
   Material* searcher = this;
   while (searcher != NULL)
     {
-      PRINT(2)(".");
+      PRINT(5)(".");
       if (!strcmp (searcher->getName(), mtlName))
         {
-          PRINT(2)("found.\n");
+          PRINT(5)("found.\n");
           return searcher;
         }
       searcher = searcher->nextMat;
     }
-  PRINT(2)("not found\n");
+  PRINT(2)("material %s not found\n", mtlName);
   return NULL;
 }
@@ -153 +156 @@
 
   if (this->diffuseTextureSet)
-    glBindTexture(GL_TEXTURE_2D, this->diffuseTexture->getTexture());
+    {
+      glEnable(GL_TEXTURE_2D);
+      glBindTexture(GL_TEXTURE_2D, this->diffuseTexture->getTexture());
+    }
   else
-    glBindTexture(GL_TEXTURE_2D, 0);
-  
+    {
+      glDisable(GL_TEXTURE_2D);
+      glBindTexture(GL_TEXTURE_2D, 0);
+    }
 }
 
@@ -166 +174 @@
 void Material::setName (char* mtlName)
 {
-  PRINTF(3)("setting Material Name to %s.\n", this->name);
+  PRINTF(4)("setting Material Name to %s.\n", this->name);
   this->name = new char [strlen(mtlName)+1];
   strcpy(this->name, mtlName);
@@ -185 +193 @@
 void Material::setIllum (int illum)
 {
-  PRINTF(3)("setting illumModel of Material %s to %i\n", this->name, illum);
+  PRINTF(4)("setting illumModel of Material %s to %i\n", this->name, illum);
   this->illumModel = illum;
-  //  PRINTF(3)("setting illumModel to: %i\n", illumModel);
 }
 /**
@@ -205 +212 @@
 void Material::setDiffuse (float r, float g, float b)
 {
-  PRINTF(3)("setting Diffuse Color of Material %s to r=%f g=%f b=%f.\n", this->name, r, g, b);
+  PRINTF(4)("setting Diffuse Color of Material %s to r=%f g=%f b=%f.\n", this->name, r, g, b);
   this->diffuse[0] = r;
   this->diffuse[1] = g;
@@ -231 +238 @@
 void Material::setAmbient (float r, float g, float b)
 {
-  PRINTF(3)("setting Ambient Color of Material %s to r=%f g=%f b=%f.\n", this->name, r, g, b);
+  PRINTF(4)("setting Ambient Color of Material %s to r=%f g=%f b=%f.\n", this->name, r, g, b);
   this->ambient[0] = r;
   this->ambient[1] = g;
@@ -256 +263 @@
 void Material::setSpecular (float r, float g, float b)
 {
-  PRINTF(3)("setting Specular Color of Material %s to r=%f g=%f b=%f.\n", this->name, r, g, b);
+  PRINTF(4)("setting Specular Color of Material %s to r=%f g=%f b=%f.\n", this->name, r, g, b);
   this->specular[0] = r;
   this->specular[1] = g;
@@ -296 +303 @@
 void Material::setTransparency (float trans)
 {
-  PRINTF(3)("setting Transparency of Material %s to %f.\n", this->name, trans);
+  PRINTF(4)("setting Transparency of Material %s to %f.\n", this->name, trans);
   this->transparency = trans;
 }
@@ -325 +332 @@
 void Material::setDiffuseMap(char* dMap)
 {
-  PRINTF(3)("setting Diffuse Map %s\n", dMap);
+  PRINTF(4)("setting Diffuse Map %s\n", dMap);
   diffuseTexture = new Texture();
   this->diffuseTextureSet = diffuseTexture->loadImage(dMap);

orxonox/branches/levelloader/src/lib/graphics/importer/material.h

@@ -9 +9 @@
 #define _MATERIAL_H
 
-
-
-extern int verbose; //!< will be obsolete soon.
 
 #if HAVE_CONFIG_H 

orxonox/branches/levelloader/src/lib/graphics/importer/model.cc

@@ -13 +13 @@
    co-programmer: ...
 */
+
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_IMPORTER
 
 #include "model.h"
@@ -80 +82 @@
 Model::~Model(void)
 {
-  PRINTF(3)("Deleting Model ");
+  PRINTF(4)("Deleting Model ");
   if (this->name)
     {
-      PRINT(3)("%s\n", this->name);
+      PRINT(4)("%s\n", this->name);
       delete []this->name;
     }
   else
-      PRINT(3)("\n");
-
-  PRINTF(3)("Deleting display Lists.\n");
+      PRINT(4)("\n");
+
+  PRINTF(4)("Deleting display Lists.\n");
   Group* walker = this->firstGroup;
   while (walker != NULL)
@@ -99 +101 @@
     }
 
-  PRINTF(3)("Deleting Materials.\n");
+  PRINTF(4)("Deleting Materials.\n");
   if (this->material)
     delete this->material;
@@ -122 +124 @@
 void Model::draw (void) const
 {
-  PRINTF(2)("drawing the 3D-Models\n"); 
+  PRINTF(4)("drawing the 3D-Models\n"); 
   Group* walker = this->firstGroup;
   while (walker != NULL)
     {
-      PRINTF(3)("Drawing model %s\n", walker->name);
+      PRINTF(5)("Drawing model %s\n", walker->name);
       glCallList (walker->listNumber);
       walker = walker->next;
@@ -142 +144 @@
   if (groupNumber >= this->groupCount)
     {
-      PRINTF(1)("You requested model number %i, but this File only contains of %i Models.\n", groupNumber-1, this->groupCount);
+      PRINTF(2)("You requested model number %i, but this File only contains of %i Models.\n", groupNumber-1, this->groupCount);
       return;
     }
-  PRINTF(2)("drawing the requested 3D-Models if found.\n"); 
+  PRINTF(4)("drawing the requested 3D-Models if found.\n"); 
   Group* walker = this->firstGroup;
   int counter = 0;
@@ -152 +154 @@
       if (counter == groupNumber)
         {
-          PRINTF(2)("Drawing model number %i named %s\n", counter, walker->name);
+          PRINTF(4)("Drawing model number %i named %s\n", counter, walker->name);
           glCallList (walker->listNumber);
           return;
@@ -159 +161 @@
       walker = walker->next;
     }
-  PRINTF(1)("Model number %i in %s not Found.\n", groupNumber, this->name);
+  PRINTF(2)("Model number %i in %s not Found.\n", groupNumber, this->name);
   return;
 
@@ -172 +174 @@
 void Model::draw (char* groupName) const
 {
-  PRINTF(2)("drawing the requested 3D-Models if found.\n"); 
+  PRINTF(4)("drawing the requested 3D-Models if found.\n"); 
   Group* walker = this->firstGroup;
   while (walker != NULL)
@@ -178 +180 @@
       if (!strcmp(walker->name, groupName))
         {
-          PRINTF(2)("Drawing model %s\n", walker->name);
+          PRINTF(4)("Drawing model %s\n", walker->name);
           glCallList (walker->listNumber);
           return;
@@ -184 +186 @@
       walker = walker->next;
     }
-  PRINTF(1)("Model Named %s in %s not Found.\n", groupName, this->name);
+  PRINTF(2)("Model Named %s in %s not Found.\n", groupName, this->name);
   return;
 }
@@ -204 +206 @@
 bool Model::initialize (void)
 {
-  PRINTF(2)("new 3D-Model is being created\n"); 
+  PRINTF(4)("new 3D-Model is being created\n"); 
 
   this->name = NULL;
@@ -243 +245 @@
 bool Model::initGroup(Group* group)
 {
-  PRINTF(3)("Adding new Group\n");
+  PRINTF(4)("Adding new Group\n");
   group->name = "";
   group->faceMode = -1;
@@ -277 +279 @@
 bool Model::cleanup(void)
 {
-  PRINTF(3)("cleaning up the 3D-Model to save Memory.\n");
+  PRINTF(4)("cleaning up the 3D-Model to save Memory.\n");
 
   if (this->vertices)
@@ -296 +298 @@
 bool Model::cleanupGroup (Group* group)
 {
-  PRINTF(3)("Cleaning up group\n");
+  PRINTF(5)("Cleaning up group\n");
   if (group->firstFace != NULL)
     {
@@ -314 +316 @@
 bool Model::cleanupFace (Face* face)
 {
-  PRINTF(3)("Cleaning up Face\n");
+  PRINTF(5)("Cleaning up Face\n");
 
   if (face->materialString != NULL)
@@ -355 +357 @@
 bool Model::addGroup (char* groupString)
 {
-  PRINTF(3)("Read Group: %s.\n", groupString);
+  PRINTF(5)("Read Group: %s.\n", groupString);
   if (this->groupCount != 0 && this->currentGroup->faceCount>0)
     {
@@ -384 +386 @@
   float subbuffer3;
   sscanf (vertexString, "%f %f %f", &subbuffer1, &subbuffer2, &subbuffer3);
-  PRINTF(3)("reading in a vertex: %f %f %f\n", &subbuffer1, &subbuffer2, &subbuffer3);
+  PRINTF(5)("reading in a vertex: %f %f %f\n", &subbuffer1, &subbuffer2, &subbuffer3);
   this->vertices->addEntry(subbuffer1*scaleFactor, subbuffer2*scaleFactor, subbuffer3*scaleFactor);
   return true;
@@ -398 +400 @@
 bool Model::addVertex(const float x, const float y, const float z)
 {
-  PRINTF(4)("reading in a vertex: %f %f %f\n", x, y, z);
+  PRINTF(5)("reading in a vertex: %f %f %f\n", x, y, z);
   this->vertices->addEntry(x*scaleFactor, y*scaleFactor, z*scaleFactor);
   return true;
@@ -513 +515 @@
   float subbuffer3;
   sscanf (normalString, "%f %f %f", &subbuffer1, &subbuffer2, &subbuffer3);
-  PRINTF(3)("found vertex-Normal %f, %f, %f\n", &subbuffer1,&subbuffer2,&subbuffer3);
+  PRINTF(5)("found vertex-Normal %f, %f, %f\n", &subbuffer1,&subbuffer2,&subbuffer3);
   this->normals->addEntry(subbuffer1, subbuffer2, subbuffer3);
   return true;
@@ -544 +546 @@
   float subbuffer2;
   sscanf (vTextureString, "%f %f", &subbuffer1, &subbuffer2);
-  PRINTF(3)("found vertex-Texture %f, %f\n", &subbuffer1, &subbuffer2);
+  PRINTF(5)("found vertex-Texture %f, %f\n", &subbuffer1, &subbuffer2);
   this->vTexture->addEntry(subbuffer1);
   this->vTexture->addEntry(subbuffer2);
@@ -610 +612 @@
       if ((this->currentGroup->listNumber = glGenLists(1)) == 0)
         {
-          PRINTF(1)("list could not be created for this Model\n");
+          PRINTF(2)("glList could not be created for this Model\n");
           return false;
         }
@@ -628 +630 @@
                 {
                   tmpMat->select();
-                  PRINTF(2)("using material %s for coming Faces.\n", tmpFace->materialString);
+                  PRINTF(5)("using material %s for coming Faces.\n", tmpFace->materialString);
                 }
               else 
-                PRINTF(1)("material %s not found.\n", tmpFace->materialString);
+                PRINTF(2)("material %s not found.\n", tmpFace->materialString);
 
 
@@ -646 +648 @@
               
               this->currentGroup->faceMode = 3;
-              PRINTF(3)("found triag.\n");
+              PRINTF(5)("found triag.\n");
             }
           
@@ -658 +660 @@
                 }
               this->currentGroup->faceMode = 4;
-              PRINTF(3)("found quad.\n");
+              PRINTF(5)("found quad.\n");
             }
           
@@ -666 +668 @@
                 glEnd();
               glBegin(GL_POLYGON);
-              PRINTF(3)("Polygon with %i faces found.", tmpFace->vertexCount);
+              PRINTF(5)("Polygon with %i faces found.", tmpFace->vertexCount);
               this->currentGroup->faceMode = tmpFace->vertexCount;
             }
@@ -698 +700 @@
 bool Model::addGLElement (FaceElement* elem)
 {
-  PRINTF(3)("importing grafical Element to openGL.\n");
+  PRINTF(5)("importing grafical Element to openGL.\n");
 
   if (elem->texCoordNumber != -1)
@@ -721 +723 @@
 {
   
-  PRINTF(2)("Normals are being calculated.\n");
+  PRINTF(4)("Normals are being calculated.\n");
 
   Vector* normArray = new Vector [vertices->getCount()/3];
@@ -778 +780 @@
     {
       normArray[i].normalize();
-      PRINTF(3)("Found Normale number %d: (%f; %f, %f).\n", i, normArray[i].x, normArray[i].y, normArray[i].z);
+      PRINTF(5)("Found Normale number %d: (%f; %f, %f).\n", i, normArray[i].x, normArray[i].y, normArray[i].z);
       
       this->normals->addEntry(normArray[i].x, normArray[i].y, normArray[i].z);
@@ -881 +883 @@
         //printf ("%f %f\n", vz, sin (vz));
         if (i==0.0)
-                  printf("%f, %f\n", j/df*2.0*PI, cos(j/df*PI));
+          PRINTF(0)("%f, %f\n", j/df*2.0*PI, cos(j/df*PI));
       }
     }

orxonox/branches/levelloader/src/lib/graphics/importer/objModel.cc

@@ -13 +13 @@
    co-programmer: ...
 */
+
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_IMPORTER
 
 #include "objModel.h"
@@ -86 +88 @@
 bool OBJModel::importFile (const char* fileName)
 {
-  PRINTF(3)("preparing to read in file: %s\n", fileName);
+  PRINTF(4)("preparing to read in file: %s\n", fileName);
 
 
@@ -107 +109 @@
   strncpy(this->objPath, fileName, name-fileName);
   this->objPath[name-fileName] = '\0';
-  if (verbose>=2)
-    if (strlen(objPath)> 0)
-      PRINTF(0)("Resolved file %s to folder: %s.\n", name, objPath);
-    else
-      PRINTF(0)("Resolved file %s.\n", name);
+  if (strlen(objPath)> 0)
+    PRINTF(5)("Resolved file %s to folder: %s.\n", name, objPath);
+  else
+    PRINTF(5)("Resolved file %s.\n", name);
   
   this->setName(name);
@@ -144 +145 @@
       return false;
     }
-  PRINTF(2)("Reading from opened file %s\n", fileName);
+  PRINTF(4)("Reading from opened file %s\n", fileName);
   char Buffer[10000];
   while(!OBJ_FILE->eof())
     {
       OBJ_FILE->getline(Buffer, 10000);
-      PRINTF(3)("Read input line: %s\n", Buffer);
+      PRINTF(5)("Read input line: %s\n", Buffer);
       
 
@@ -192 +193 @@
       else if (!strncmp(Buffer, "s ", 2)) //! \todo smoothing groups have to be implemented
         {
-          if (verbose >= 2)
-            PRINTF(2)("smoothing groups not supportet yet. line: %s\n", Buffer);
+          PRINTF(3)("smoothing groups not supportet yet. line: %s\n", Buffer);
         }
     }
@@ -221 +221 @@
   
 
-  PRINTF(3)("Opening mtlFile: %s\n", fileName);
+  PRINTF(4)("Opening mtlFile: %s\n", fileName);
 
   ifstream* MTL_FILE = new ifstream (fileName);
   if (MTL_FILE->fail())
     {
-      PRINTF(1)("unable to open file: %s\n", fileName);
+      PRINTF(2)("unable to open file: %s\n", fileName);
       MTL_FILE->close();
       delete []fileName;
@@ -237 +237 @@
     {
       MTL_FILE->getline(Buffer, 500);
-      PRINTF(4)("found line in mtlFile: %s\n", Buffer);
+      PRINTF(5)("found line in mtlFile: %s\n", Buffer);
       
 

orxonox/branches/levelloader/src/lib/graphics/importer/texture.cc

@@ -17 +17 @@
 */
 
+
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_IMPORTER
 
 #include "texture.h"
@@ -87 +89 @@
   if (pName[0] == '\0')
     {
-      PRINTF(3)("not Adding empty Path to the List.\n");
+      PRINTF(2)("not Adding empty Path to the List.\n");
       return;
     }
@@ -99 +101 @@
       if (status.st_mode & S_IFDIR)
         {
-          PRINTF(2)("Adding Path %s to the PathList.\n", pName);
+          PRINTF(4)("Adding Path %s to the PathList.\n", pName);
           PathList* tmpPathList = this;
           while (tmpPathList->next)
@@ -193 +195 @@
 bool Texture::loadTexToGL (Image* pImage)
 {
-  PRINTF(2)("Loading texture to OpenGL-Environment.\n");
+  PRINTF(4)("Loading texture to OpenGL-Environment.\n");
   glGenTextures(1, &this->texture);
   glBindTexture(GL_TEXTURE_2D, this->texture);
@@ -229 +231 @@
         pImage->format = GL_RGBA;
           
-      PRINTF(0)("Bits Per Pixel: %d\n", pImage->bpp);
       if( !IMG_isPNG(SDL_RWFromFile(imgNameWithPath, "rb")) && !IMG_isJPG(SDL_RWFromFile(imgNameWithPath, "rb")))
         for (int i=0;i<map->h * map->w *3;i+=3)
@@ -249 +250 @@
   else
     {
-      PRINTF(1)("Image not Found: %s\n", imgNameWithPath);
+      PRINTF(2)("Image not Found: %s\n", imgNameWithPath);
       return false;
     }
@@ -268 +269 @@
       if (!strncmp(imgNameWithPath+strlen(imgNameWithPath)-4, ".bmp", 4))
         {
-          PRINTF(3)("Requested bmp-image. Trying to Import.\n");
+          PRINTF(4)("Requested bmp-image. Trying to Import.\n");
           return this->loadBMP(imgNameWithPath);
         }
@@ -274 +275 @@
       else if (!strncmp(imgNameWithPath+strlen(imgNameWithPath)-4, ".jpg", 4) || !strncmp(imgNameWithPath+strlen(imgNameWithPath)-5, ".jpg", 5))
         {
-          PRINTF(3)("Requested jpeg-image. Trying to Import\n");
+          PRINTF(4)("Requested jpeg-image. Trying to Import\n");
           return this->loadJPG(imgNameWithPath);
         }
       else if (!strncmp(imgNameWithPath+strlen(imgNameWithPath)-4, ".tga", 4))
         {
-          PRINTF(3)("Requested tga-image. Trying to Import\n");
+          PRINTF(4)("Requested tga-image. Trying to Import\n");
           return this->loadTGA(imgNameWithPath);
         }
       else if (!strncmp(imgNameWithPath+strlen(imgNameWithPath)-4, ".png", 4))
         {
-          PRINTF(3)("Requested png-image. Trying to Import\n");
+          PRINTF(4)("Requested png-image. Trying to Import\n");
           return this->loadPNG(imgNameWithPath);
         }
       else
         {
-          PRINTF(1)("Requested Image was not recognized in its type. (Maybe a type-Cast-error.)\n FileName: %s", imgNameWithPath);
+          PRINTF(2)("Requested Image was not recognized in its type. (Maybe a type-Cast-error.)\n FileName: %s", imgNameWithPath);
           return false;
         }
@@ -295 +296 @@
   else
     {
-      PRINTF(1)("Image not Found: %s\n", imgNameWithPath);
+      PRINTF(2)("Image not Found: %s\n", imgNameWithPath);
       return false;
     }
@@ -316 +317 @@
   if ((file = fopen(bmpName, "rb"))==NULL)
     {
-      PRINTF(1)("File Not Found : %s\n",bmpName);
+      PRINTF(2)("File Not Found : %s\n",bmpName);
       return false;
     }
@@ -325 +326 @@
   if ((i = fread(&pImage->width, 4, 1, file)) != 1) 
     {
-      PRINTF(1)("Error reading width from %s.\n", bmpName);
+      PRINTF(2)("Error reading width from %s.\n", bmpName);
       return false;
     }
@@ -331 +332 @@
   if ((i = fread(&pImage->height, 4, 1, file)) != 1) 
     {
-      PRINTF(1)("Error reading height from %s.\n", bmpName);
+      PRINTF(2)("Error reading height from %s.\n", bmpName);
       return false;
     }
@@ -341 +342 @@
   if ((fread(&planes, 2, 1, file)) != 1) 
     {
-      PRINTF(1)("Error reading planes from %s.\n", bmpName);
+      PRINTF(2)("Error reading planes from %s.\n", bmpName);
       return false;
     }
@@ -353 +354 @@
   if ((i = fread(&bpp, 2, 1, file)) != 1) 
     {
-      PRINTF(1)("Error reading bpp from %s.\n", bmpName);
+      PRINTF(2)("Error reading bpp from %s.\n", bmpName);
       return false;
     }
   if (bpp != 24) 
     {
-      PRINTF(1)("Bpp from %s is not 24: %u\n", bmpName, bpp);
+      PRINTF(2)("Bpp from %s is not 24: %u\n", bmpName, bpp);
       return false;
     }
@@ -369 +370 @@
   if (pImage->data == NULL) 
     {
-      PRINTF(1)("Error allocating memory for color-corrected image data");
+      PRINTF(2)("Error allocating memory for color-corrected image data");
       return false;     
     }
@@ -375 +376 @@
   if ((i = fread(pImage->data, size, 1, file)) != 1) 
     {
-      PRINTF(1)("Error reading image data from %s.\n", bmpName);
+      PRINTF(2)("Error reading image data from %s.\n", bmpName);
       return false;
     }
@@ -418 +419 @@
     {
       // Display an error message saying the file was not found, then return NULL
-      PRINTF(1)("Unable to load JPG File %s.\n", jpgName);
+      PRINTF(2)("Unable to load JPG File %s.\n", jpgName);
       return false;
     }
@@ -521 +522 @@
   if(fTGA == NULL)
     {
-      PRINTF(1)("Error could not open texture file: %s\n", tgaName);
+      PRINTF(2)("Error could not open texture file: %s\n", tgaName);
       return false;
     }
@@ -527 +528 @@
   if(fread(&tgaHeader, sizeof(TGAHeader), 1, fTGA) == 0)
     {
-      PRINTF(1)("Error could not read file header of %s\n", tgaName);
+      PRINTF(2)("Error could not read file header of %s\n", tgaName);
       if(fTGA != NULL)
         {
@@ -549 +550 @@
   else
     {
-      PRINTF(1)("Error TGA file be type 2 or type 10\n");
+      PRINTF(2)("Error TGA file be type 2 or type 10\n");
       if (fTGA)
         fclose(fTGA);
@@ -576 +577 @@
   if(fread(header, sizeof(header), 1, fTGA) == 0)
     {
-      PRINTF(1)("Error could not read info header\n");
+      PRINTF(2)("Error could not read info header\n");
       return false;
     }
@@ -586 +587 @@
   if((pImage->width <= 0) || (pImage->height <= 0) || ((pImage->bpp != 24) && (pImage->bpp !=32)))
     {
-      PRINTF(1)("Error invalid texture information\n");
+      PRINTF(2)("Error invalid texture information\n");
       return false;
     }
@@ -605 +606 @@
   if(pImage->data == NULL)
     {
-      PRINTF(1)("Error could not allocate memory for image\n");
+      PRINTF(2)("Error could not allocate memory for image\n");
       return false;
     }
@@ -611 +612 @@
   if(fread(pImage->data, 1, imageSize, fTGA) != imageSize)
     {
-      PRINTF(1)("Error could not read image data\n");
+      PRINTF(2)("Error could not read image data\n");
       if(pImage->data != NULL)
         {
@@ -648 +649 @@
   if(fread(header, sizeof(header), 1, fTGA) == 0)
     {
-      PRINTF(1)("Error could not read info header\n");
+      PRINTF(2)("Error could not read info header\n");
       return false;
     }
@@ -664 +665 @@
   if((pImage->width <= 0) || (pImage->height <= 0) || ((pImage->bpp != 24) && (pImage->bpp !=32)))
     {
-      PRINTF(1)("Error Invalid pImage information\n");
+      PRINTF(2)("Error Invalid pImage information\n");
       return false;
     }
@@ -674 +675 @@
   if(pImage->data == NULL)
     {
-      PRINTF(1)("Error could not allocate memory for image\n");
+      PRINTF(2)("Error could not allocate memory for image\n");
       return false;
     }
@@ -684 +685 @@
       if(fread(&chunkheader, sizeof(GLubyte), 1, fTGA) == 0)
         {
-          PRINTF(1)("Error could not read RLE header\n");
+          PRINTF(2)("Error could not read RLE header\n");
           if(pImage->data != NULL)
             {
@@ -702 +703 @@
               if(fread(colorbuffer, 1, bytesPerPixel, fTGA) != bytesPerPixel)
                 {
-                  PRINTF(1)("Error could not read image data\n");
+                  PRINTF(2)("Error could not read image data\n");
                   if(colorbuffer != NULL)
                     {
@@ -732 +733 @@
               if(currentpixel > pixelcount)     
                 {
-                  PRINTF(1)("Error too many pixels read\n");
+                  PRINTF(2)("Error too many pixels read\n");
                   if(colorbuffer != NULL)
                     {
@@ -754 +755 @@
           if(fread(colorbuffer, 1, bytesPerPixel, fTGA) != bytesPerPixel) // Attempt to read following color values 
             {
-              PRINTF(1)("Error could not read from file");
+              PRINTF(2)("Error could not read from file");
               if(colorbuffer != NULL)
                 {
@@ -785 +786 @@
               if(currentpixel > pixelcount)
                 {
-                  PRINTF(1)("Error too many pixels read\n");
+                  PRINTF(2)("Error too many pixels read\n");
                   if(colorbuffer != NULL)
                     {

orxonox/branches/levelloader/src/lib/graphics/importer/texture.h

@@ -10 +10 @@
 #define _TEXTURE_H
 
-#include "stdincl.h"
+#include "glincl.h"
+
+#include "debug.h"
+
 #ifdef HAVE_SDL_SDL_IMAGE_H
 #include <SDL/SDL_image.h>

orxonox/branches/levelloader/src/lib/graphics/importer/windowHandler.h

@@ -7 +7 @@
 #ifndef _WINDOWHANDLER_H
 #define _WINDOWHANDLER_H
-
-extern int verbose;
 
 #include "stdincl.h"

orxonox/branches/levelloader/src/lib/gui/Makefile.in

@@ -1 @@
-# Makefile.in generated by automake 1.8.2 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
@@ -78 +78 @@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOCUMENTATION_FALSE = @DOCUMENTATION_FALSE@
+DOCUMENTATION_TRUE = @DOCUMENTATION_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_FALSE = @DOXYGEN_FALSE@
@@ -177 +179 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/gui/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/gui/Makefile'; \
         cd $(top_srcdir) && \
-          $(AUTOMAKE) --gnu  src/lib/gui/Makefile
+          $(AUTOMAKE) --foreign  src/lib/gui/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -272 +274 @@
         tags=; \
         here=`pwd`; \
-        if (etags --etags-include --version) >/dev/null 2>&1; then \
+        if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
           include_option=--etags-include; \
+          empty_fix=.; \
         else \
           include_option=--include; \
+          empty_fix=; \
         fi; \
         list='$(SUBDIRS)'; for subdir in $$list; do \
           if test "$$subdir" = .; then :; else \
-            test -f $$subdir/TAGS && \
+            test ! -f $$subdir/TAGS || \
               tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
           fi; \
@@ -289 +293 @@
           $(AWK) '    { files[$$0] = 1; } \
                END { for (i in files) print i; }'`; \
-        test -z "$(ETAGS_ARGS)$$tags$$unique" \
-          || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-             $$tags $$unique
+        if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+          test -n "$$unique" || unique=$$empty_fix; \
+          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+            $$tags $$unique; \
+        fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \

orxonox/branches/levelloader/src/lib/gui/console/Makefile.in

@@ -1 @@
-# Makefile.in generated by automake 1.8.2 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
@@ -50 +50 @@
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
-am__installdirs = $(DESTDIR)$(bindir)
+am__installdirs = "$(DESTDIR)$(bindir)"
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
@@ -96 +96 @@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOCUMENTATION_FALSE = @DOCUMENTATION_FALSE@
+DOCUMENTATION_TRUE = @DOCUMENTATION_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_FALSE = @DOXYGEN_FALSE@
@@ -203 +205 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/gui/console/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/gui/console/Makefile'; \
         cd $(top_srcdir) && \
-          $(AUTOMAKE) --gnu  src/lib/gui/console/Makefile
+          $(AUTOMAKE) --foreign  src/lib/gui/console/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -225 +227 @@
 install-binPROGRAMS: $(bin_PROGRAMS)
         @$(NORMAL_INSTALL)
-        $(mkdir_p) $(DESTDIR)$(bindir)
+        test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
         @list='$(bin_PROGRAMS)'; for p in $$list; do \
           p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
@@ -231 +233 @@
           ; then \
             f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-           echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
-           $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
+           echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+           $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
           else :; fi; \
         done
@@ -240 +242 @@
         @list='$(bin_PROGRAMS)'; for p in $$list; do \
           f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-          echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
-          rm -f $(DESTDIR)$(bindir)/$$f; \
+          echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+          rm -f "$(DESTDIR)$(bindir)/$$f"; \
         done
 
@@ -297 +299 @@
           $(AWK) '    { files[$$0] = 1; } \
                END { for (i in files) print i; }'`; \
-        test -z "$(ETAGS_ARGS)$$tags$$unique" \
-          || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-             $$tags $$unique
+        if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+          test -n "$$unique" || unique=$$empty_fix; \
+          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+            $$tags $$unique; \
+        fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
@@ -354 +358 @@
 all-am: Makefile $(PROGRAMS) $(HEADERS)
 installdirs:
-        $(mkdir_p) $(DESTDIR)$(bindir)
+        for dir in "$(DESTDIR)$(bindir)"; do \
+          test -z "$$dir" || $(mkdir_p) "$$dir"; \
+        done
 install: install-am
 install-exec: install-exec-am

orxonox/branches/levelloader/src/lib/gui/gui/Makefile.in

@@ -1 @@
-# Makefile.in generated by automake 1.8.2 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
@@ -50 +50 @@
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
-am__installdirs = $(DESTDIR)$(bindir)
+am__installdirs = "$(DESTDIR)$(bindir)"
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
@@ -105 +105 @@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOCUMENTATION_FALSE = @DOCUMENTATION_FALSE@
+DOCUMENTATION_TRUE = @DOCUMENTATION_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_FALSE = @DOXYGEN_FALSE@
@@ -236 +238 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/gui/gui/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/gui/gui/Makefile'; \
         cd $(top_srcdir) && \
-          $(AUTOMAKE) --gnu  src/lib/gui/gui/Makefile
+          $(AUTOMAKE) --foreign  src/lib/gui/gui/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -258 +260 @@
 install-binPROGRAMS: $(bin_PROGRAMS)
         @$(NORMAL_INSTALL)
-        $(mkdir_p) $(DESTDIR)$(bindir)
+        test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
         @list='$(bin_PROGRAMS)'; for p in $$list; do \
           p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
@@ -264 +266 @@
           ; then \
             f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-           echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
-           $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
+           echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+           $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
           else :; fi; \
         done
@@ -273 +275 @@
         @list='$(bin_PROGRAMS)'; for p in $$list; do \
           f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-          echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
-          rm -f $(DESTDIR)$(bindir)/$$f; \
+          echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+          rm -f "$(DESTDIR)$(bindir)/$$f"; \
         done
 
@@ -336 +338 @@
           $(AWK) '    { files[$$0] = 1; } \
                END { for (i in files) print i; }'`; \
-        test -z "$(ETAGS_ARGS)$$tags$$unique" \
-          || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-             $$tags $$unique
+        if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+          test -n "$$unique" || unique=$$empty_fix; \
+          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+            $$tags $$unique; \
+        fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
@@ -393 +397 @@
 all-am: Makefile $(PROGRAMS) $(HEADERS)
 installdirs:
-        $(mkdir_p) $(DESTDIR)$(bindir)
+        for dir in "$(DESTDIR)$(bindir)"; do \
+          test -z "$$dir" || $(mkdir_p) "$$dir"; \
+        done
 install: install-am
 install-exec: install-exec-am

orxonox/branches/levelloader/src/lib/gui/gui/orxonox_gui_gtk.h

@@ -9 +9 @@
 #include <config.h> 
 #endif
-
-//! verbose level, soon obsolete
-extern int verbose; // soon obsolete here
 
 #include "debug.h"

orxonox/branches/levelloader/src/lib/lang/base_object.cc

@@ -26 +26 @@
    \brief standard constructor
 */
-BaseObject::BaseObject () {}
+BaseObject::BaseObject () 
+{
+  this->className = NULL;
+}
 
 
@@ -32 +35 @@
    \brief standard deconstructor
 */
-BaseObject::~BaseObject () {}
-
+BaseObject::~BaseObject () 
+{
+  delete []this->className;
+}
 
 void BaseObject::setClassName (char* className)
 {
-  this->className = className;
+  this->className = new char[strlen(className)+1];
+  strcpy(this->className, className);
 }
 

orxonox/branches/levelloader/src/lib/lang/base_object.h

@@ -15 +15 @@
  public:
   BaseObject ();
-  ~BaseObject ();
+  virtual ~BaseObject ();
 
   void setClassName (char* className);

orxonox/branches/levelloader/src/lib/math/curve.cc

@@ -19 +19 @@
      local-Time implementation
      NURBS
+     tList implementation
      
 */
 
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_MATH
+
 #include "curve.h"
-#include "matrix.h"
+
 #include "debug.h"
 
 #include <math.h>
 #include <stdio.h>
+
+
+/** 
+    \brief default constructor for a Curve
+*/
+Curve::Curve(void)
+{
+  nodeCount = 0;
+  firstNode = new PathNode;
+  currentNode = firstNode;
+
+  firstNode->position = Vector (.0, .0, .0);
+  firstNode->number = 0;
+  firstNode->next = 0; // not sure if this really points to NULL!!
+}
 
 /**
@@ -131 +149 @@
   this->derivation = 0;
   dirCurve = new BezierCurve(1);
-  this->init();
 }
 
@@ -141 +158 @@
   this->derivation = derivation;
   dirCurve=NULL;
-  this->init();
 }
 
@@ -161 +177 @@
   if (dirCurve)
     delete dirCurve;
-}
-
-/**
-   \brief Initializes a BezierCurve
-*/
-void BezierCurve::init(void)
-{
-  nodeCount = 0;
-  firstNode = new PathNode;
-  currentNode = firstNode;
-
-  firstNode->position = Vector (.0, .0, .0);
-  firstNode->number = 0;
-  firstNode->next = 0; // not sure if this really points to NULL!!
-
-  return;
 }
 
@@ -285 +285 @@
   return curvePoint;
 }
-
-
-
-///////////////////////////////////
-//// Uniform Point curve  /////////
-///////////////////////////////////
-/**
-   \brief Creates a new UPointCurve
-*/
-UPointCurve::UPointCurve (void)
-{
-  this->derivation = 0;
-  this->init();
-}
-
-/**
-   \brief Creates a new UPointCurve-Derivation-Curve of deriavation'th degree
-*/
-UPointCurve::UPointCurve (int derivation)
-{
-  this->derivation = derivation;
-  dirCurve=NULL;
-  this->init();
-}
-
-/**
-   \brief Deletes a UPointCurve.
-
-   It does this by freeing all the space taken over from the nodes
-*/
-UPointCurve::~UPointCurve(void)
-{
-  PathNode* tmpNode;
-  currentNode = firstNode;
-  while (tmpNode != 0)
-    {
-      tmpNode = currentNode;
-      currentNode = currentNode->next;
-      delete tmpNode;
-    }
-  if (dirCurve)
-    delete dirCurve;
-}
-
-/**
-   \brief Initializes a UPointCurve
-*/
-void UPointCurve::init(void)
-{
-  nodeCount = 0;
-  firstNode = new PathNode;
-  currentNode = firstNode;
-
-  firstNode->position = Vector (.0, .0, .0);
-  firstNode->number = 0;
-  firstNode->next = 0; // not sure if this really points to NULL!!
-
-  return;
-}
-
-/**
-   \brief Rebuilds a UPointCurve
-   
-   \todo very bad algorithm
-*/
-void UPointCurve::rebuild(void)
-{
-  // rebuilding the Curve itself
-  PathNode* tmpNode = this->firstNode;
-  int i=0;
-  Matrix xTmpMat = Matrix(this->nodeCount, this->nodeCount);
-  Matrix yTmpMat = Matrix(this->nodeCount, this->nodeCount);
-  Matrix zTmpMat = Matrix(this->nodeCount, this->nodeCount);
-  Matrix xValMat = Matrix(this->nodeCount, 3);
-  Matrix yValMat = Matrix(this->nodeCount, 3);
-  Matrix zValMat = Matrix(this->nodeCount, 3);
-  while(tmpNode)
-    {
-      Vector fac = Vector(1,1,1);
-      for (int j = 0; j < this->nodeCount; j++)
-        {
-          xTmpMat(i,j) = fac.x; fac.x *= (float)i/(float)this->nodeCount;//tmpNode->position.x;
-          yTmpMat(i,j) = fac.y; fac.y *= (float)i/(float)this->nodeCount;//tmpNode->position.y;
-          zTmpMat(i,j) = fac.z; fac.z *= (float)i/(float)this->nodeCount;//tmpNode->position.z;
-        }
-      xValMat(i,0) = tmpNode->position.x;
-      yValMat(i,0) = tmpNode->position.y;
-      zValMat(i,0) = tmpNode->position.z;
-      ++i;
-      tmpNode = tmpNode->next;
-    }
-  tmpNode = this->firstNode;
-  xValMat = xTmpMat.Inv() *= xValMat;
-  yValMat = yTmpMat.Inv() *= yValMat;
-  zValMat = zTmpMat.Inv() *= zValMat;
-  i = 0;
-  while(tmpNode)
-    {
-      tmpNode->vFactor.x = xValMat(i,0);
-      tmpNode->vFactor.y = yValMat(i,0);
-      tmpNode->vFactor.z = zValMat(i,0);
-
-      i++;
-      tmpNode = tmpNode->next;
-    }
-}
-
-/**
-   \brief calculates the Position on the curve
-   \param t The position on the Curve (0<=t<=1)
-   \return the Position on the Path
-*/
-Vector UPointCurve::calcPos(float t) 
-{
-  PathNode* tmpNode = firstNode;
-  Vector ret = Vector(0.0,0.0,0.0);
-  float factor = 1.0;
-  while(tmpNode)
-    {
-      ret.x += tmpNode->vFactor.x * factor;
-      ret.y += tmpNode->vFactor.y * factor;
-      ret.z += tmpNode->vFactor.z * factor;
-      factor *= t;
-
-      tmpNode = tmpNode->next;
-    }
-  return ret;
-}
-
-/**
-   \brief Calulates the direction of the Curve at time t.
-   \param The time at which to evaluate the curve.
-   \returns The vvaluated Vector.
-*/
-Vector UPointCurve::calcDir (float t)
-{
-  PathNode* tmpNode = firstNode;
-  Vector ret = Vector(0.0,0.0,0.0);
-  float factor = 1.0/t;
-  int k=0;
-  while(tmpNode)
-    {
-      ret.x += tmpNode->vFactor.x * factor *k;
-      ret.y += tmpNode->vFactor.y * factor *k;
-      ret.z += tmpNode->vFactor.z * factor *k;
-      factor *= t;
-      k++;
-      tmpNode = tmpNode->next;
-    }
-  ret.normalize();
-  return ret;
-}
-
-Vector UPointCurve::calcAcc (float t)
-{
-}
-
-/**
-   \brief Calculates the Quaternion needed for our rotations
-   \param t The time at which to evaluate the cuve.
-   \returns The evaluated Quaternion.
-*/
-Quaternion UPointCurve::calcQuat (float t)
-{
-  return Quaternion (calcDir(t), Vector(0,0,1));
-}
-
-
-/**
-  \brief returns the Position of the point calculated on the Curve
-  \return a Vector to the calculated position
-*/
-Vector UPointCurve::getPos(void) const
-{
-  return curvePoint;
-}

orxonox/branches/levelloader/src/lib/math/curve.h

@@ -13 +13 @@
 
 //! An Enumerator that defines what sort of Curves are availible
-enum CurveType {BEZIERCURVE, UPOINTCURVE};
+enum CurveType {BEZIERCURVE};
 
 
@@ -38 +38 @@
   PathNode* currentNode; //!< The node we are working with (the Last node).
 
+
  private:
   virtual void rebuild(void) = 0;
  public:
+  Curve(void);
+
   Curve* dirCurve;       //!< The derivation-curve of this Curve.
   void addNode(const Vector& newNode);
@@ -68 +71 @@
   BezierCurve(void);
   BezierCurve(int derivation);
-  ~BezierCurve(void);
-  void init(void);
+  virtual ~BezierCurve(void);
 
   Vector calcPos(float t);
@@ -91 +93 @@
 };
 
-//! Uniform Point Curve-class
-/**
-   A UPoint Curve is a A Curve, that flows through all the nodes given it.
-   The Algorithm to buid the curve is rather slow, but Painting and tracing along the curve has high speed, so do not change this curve during the Game.
-
-   This Curve is very erattic, so i do not recommend to use it.
-*/
-class UPointCurve : public Curve
-{
- private:
-  void rebuild(void);
- public:
-  UPointCurve(void);
-  UPointCurve(int derivation);
-  ~UPointCurve(void);
-  void init(void);
-
-  Vector calcPos(float t);
-  Vector calcDir(float t);
-  Vector calcAcc(float t);
-  Quaternion calcQuat(float t);
-  
-  Vector getPos(void) const;
-};
-
 #endif /* _CURVE_H */

orxonox/branches/levelloader/src/lib/math/vector.cc

@@ -19 +19 @@
 */
 
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_MATH
 
 #include "vector.h"
-
+#include "debug.h"
 
 using namespace std;
@@ -201 +202 @@
 }
 
-
 /**
    \brief calculate the angle between two vectors in radiances
@@ -225 +225 @@
   f = acos( v1 * v2 / (v1.len() * v2.len()));
   return f * 180 / PI;
+}
+
+
+/**
+   \brief Outputs the values of the Vector
+*/
+void Vector::debug(void)
+{
+  PRINT(0)("Vector Debug information\n");
+  PRINT(0)("x: %f; y: %f; z: %f", x, y, z);
+  PRINT(3)(" lenght: %f", len());
+  PRINT(0)("\n");
 }
 
@@ -581 +593 @@
 
 /**
+   \brief outputs some nice formated debug information about this quaternion
+*/
+void Quaternion::debug(void)
+{
+  PRINT(0)("Quaternion Debug Information\n");
+  PRINT(0)("real a=%f; imag: x=%f y=%f z=%f\n", w, v.x, v.y, v.z);
+}
+
+/**
    \brief create a rotation from a vector
    \param v: a vector

orxonox/branches/levelloader/src/lib/math/vector.h

@@ -41 +41 @@
   Vector* getNormalized();
   Vector abs();
+
+  void debug();
 };
 
@@ -53 +55 @@
 {
  public:
-        Vector v;       //!< Imaginary Vector
-        float w;        //!< Real part of the number
-
-        Quaternion ();
-        Quaternion (float m[4][4]);
-        Quaternion (float angle, const Vector& axis);
-        Quaternion (const Vector& dir, const Vector& up);
-        Quaternion (float roll, float pitch, float yaw);
-        
-        Quaternion operator/ (const float& f) const;
-        Quaternion operator* (const float& f) const;
-        Quaternion operator* (const Quaternion& q) const;
-        Quaternion operator+ (const Quaternion& q) const;
-        Quaternion operator- (const Quaternion& q) const;
-        Quaternion conjugate () const;
-        Quaternion inverse () const;
-        Vector apply (Vector& f) const;
-        float norm () const;
-        void matrix (float m[4][4]) const;
-        void quatSlerp(const Quaternion* from, const Quaternion* to, const float t, Quaternion* res);
-
+  Vector v;     //!< Imaginary Vector
+  float w;        //!< Real part of the number
+  
+  Quaternion ();
+  Quaternion (float m[4][4]);
+  Quaternion (float angle, const Vector& axis);
+  Quaternion (const Vector& dir, const Vector& up);
+  Quaternion (float roll, float pitch, float yaw);
+  
+  Quaternion operator/ (const float& f) const;
+  Quaternion operator* (const float& f) const;
+  Quaternion operator* (const Quaternion& q) const;
+  Quaternion operator+ (const Quaternion& q) const;
+  Quaternion operator- (const Quaternion& q) const;
+  Quaternion conjugate () const;
+  Quaternion inverse () const;
+  Vector apply (Vector& f) const;
+  float norm () const;
+  void matrix (float m[4][4]) const;
+  void quatSlerp(const Quaternion* from, const Quaternion* to, const float t, Quaternion* res);
+  
+  void debug();
  private:
-        float DELTA;      //!< resolution of calculation
+  float DELTA;      //!< resolution of calculation
 
 };

orxonox/branches/levelloader/src/lib/util/list.h

@@ -86 +86 @@
   T* enumerate();
   T* nextElement();
+  T* nextElement(T* toEntity);
   T* toArray();
   void debug();
@@ -101 +102 @@
 template<class T>
 tList<T>::~tList () 
-{}
+{
+  this->currentEl = this->first;
+  while(this->currentEl != NULL)
+    {
+      listElement* le = this->currentEl->next;
+      //delete this->currentEl->curr;
+      delete this->currentEl;
+      this->currentEl = le;
+    }
+  this->first = NULL;
+  this->last = NULL;
+  this->size = 0;
+}
+
 
 template<class T>
 void tList<T>::add(T* entity)
 {
+  if( entity == NULL) return;
   listElement* el = new listElement;
   el->prev = this->last;
@@ -113 +128 @@
   this->last = el;
 
-  if(this->size == 0) this->first = el;
+  if(el->prev == NULL) this->first = el; /* if first element */
   else el->prev->next = el;
   this->size++;
@@ -122 +137 @@
 void tList<T>::remove(T* entity)
 {
+  if( entity == NULL) return;
   this->currentEl = this->first;
   listElement* te;
@@ -134 +150 @@
           else this->currentEl->next->prev = this->currentEl->prev;
 
-          te = this->currentEl->next;
+          te = this->currentEl->next;  // for what am i doing this?
           delete this->currentEl;
           this->currentEl = te;
+          this->size--;
           return;
         }
@@ -151 +168 @@
     {
       listElement* le = this->currentEl->next;
-      delete this->currentEl->curr;
+      //delete this->currentEl->curr;
       delete this->currentEl;
       this->currentEl = le;
@@ -185 +202 @@
 T* tList<T>::enumerate()
 {
+  //if( this->last == this->first == NULL) return NULL;
   if(this->size == 0) return NULL;
   this->currentEl = this->first;
@@ -194 +212 @@
 T* tList<T>::nextElement()
 {
+  // if( this->last == this->first == NULL) return NULL;
   if(this->size == 0) return NULL;
   this->currentEl = this->currentEl->next;
@@ -201 +220 @@
 
 
+/**
+   \brief this returns the next element after toEntity or the first if toEntity is last
+*/
+template<class T>
+T* tList<T>::nextElement(T* toEntity)
+{
+  //if( this->last == this->first == NULL) return NULL;
+  if(this->size == 0) return NULL;
+  if( toEntity == NULL) return this->first->curr;
+  if( toEntity == this->last->curr ) return this->first->curr;
+  this->currentEl = this->first;
+  while(this->currentEl->curr != toEntity && this->currentEl->next != NULL)
+    {
+      this->currentEl = this->currentEl->next;
+    }
+  if(this->currentEl == NULL) return NULL;
+  return this->currentEl->next->curr;
+}
+
+
 template<class T>
 T* tList<T>::toArray()