Changeset 9915 in orxonox.OLD

Timestamp:

Nov 3, 2006, 10:27:59 AM (18 years ago)

Author:

rennerc

Message:

moved copy constructor from LimitedWidthText to BaseObject

Location:

branches/network/src

Files:

• lib/graphics/importer/md2/md2Model.cc (modified) (1 diff)
• lib/graphics/text_engine/limited_width_text.cc (modified) (1 diff)
• lib/graphics/text_engine/limited_width_text.h (modified) (1 diff)
• lib/lang/base_object.cc (modified) (1 diff)
• lib/lang/base_object.h (modified) (1 diff)
• world_entities/spectator.cc (modified) (3 diffs)

branches/network/src/lib/graphics/importer/md2/md2Model.cc

@@ -268 +268 @@
 /**
  * @brief draws the model: interface for all other classes out in the world
- * @todo make it const and virtual
- * FIXME
  */
 void MD2Model::draw() const

branches/network/src/lib/graphics/text_engine/limited_width_text.cc

@@ -34 +34 @@
 }
 
-
-
-/**
- * copy constructor
- * @param lwt create copy of this instance
- */
-LimitedWidthText::LimitedWidthText( const LimitedWidthText & lwt )
-{
-  this->registerObject(this, LimitedWidthText::_objectList);
-  
-  this->_dotedText = lwt._dotedText;
-  this->_lineWidth = lwt._lineWidth;
-  this->_lineEnds = lwt._lineEnds;
-}
 
 /**

branches/network/src/lib/graphics/text_engine/limited_width_text.h

@@ -23 +23 @@
 
   public:
-    LimitedWidthText( const LimitedWidthText& lwt );
     LimitedWidthText(const std::string& fontFile = "", unsigned int fontSize = TEXT_DEFAULT_SIZE, float lineWidth = 100.0, DotsPosition dotsPosition = Begin);
 

branches/network/src/lib/lang/base_object.cc

@@ -34 +34 @@
   this->registerObject(this, BaseObject::_objectList);
 }
+
+/** 
+ * copyconstructor
+ * @param bo instance to copy
+ */
+BaseObject::BaseObject( const BaseObject& bo )
+{
+  this->className = "BaseObject";
+  this->objectName = "";
+  this->xmlElem = NULL;
+  this->registerObject( this, BaseObject::_objectList);
+}
+
 
 /**

branches/network/src/lib/lang/base_object.h

@@ -30 +30 @@
 public:
   BaseObject (const std::string& objectName = "");
+  BaseObject( const BaseObject& bo );
 
   virtual ~BaseObject ();

branches/network/src/world_entities/spectator.cc

@@ -21 +21 @@
 
 #include "shared_network_data.h"
+
+#include "src/world_entities/creatures/fps_player.h"
 
 #include "class_id_DEPRECATED.h"
@@ -79 +81 @@
   registerEvent(KeyMapper::PEV_RIGHT);
   registerEvent(KeyMapper::PEV_FIRE1);
+  registerEvent(KeyMapper::PEV_JUMP);
   registerEvent(EV_MOUSE_MOTION);
 
@@ -229 +232 @@
     this->yMouse += event.yRel;
   }
-}
-
-
-
-
+  else if( event.type == KeyMapper::PEV_JUMP)
+  {
+    //FPSPlayer * fps = new FPSPlayer();
+    WorldEntity * fps = new WorldEntity();
+    
+    fps->setAbsCoor( this->getAbsCoorX(), this->getAbsCoorY(), this->getAbsCoorZ() );
+    fps->setAbsDir( this->getAbsDir() );
+    //fps->loadMD2Texture( "doom_guy.png" );
+    //fps->loadModel( "models/creatures/doom_guy.md2", 10.0f );
+    fps->loadModel( "models/ships/terran_cruizer.obj" );
+
+    //((Playable*)fps)->setPlayDirection(  0, 0, 1, 0 );
+  }
+}
+
+
+
+