Changeset 9921 in orxonox.OLD

Timestamp:

Nov 9, 2006, 2:46:12 PM (17 years ago)

Author:

rennerc

Message:

spectator spawns fpsplayer on space key

Location:

branches/network/src

Files:

• lib/graphics/importer/md2/md2Model.cc (modified) (2 diffs)
• lib/lang/base_object.cc (modified) (1 diff)
• world_entities/spectator.cc (modified) (1 diff)

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

@@ -99 +99 @@
 {
   this->init();
+  
+  this->scaleFactor = model.scaleFactor;
+  
   this->rebuildInfo();
 }
@@ -104 +107 @@
 MD2Model& MD2Model::operator=(const MD2Model& md2model)
 {
+  this->init();
+  this->scaleFactor = md2model.scaleFactor;
   this->data = md2model.data;
   this->rebuildInfo();

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

@@ -42 +42 @@
 {
   this->className = "BaseObject";
-  this->objectName = "";
-  this->xmlElem = NULL;
+  this->objectName = bo.objectName;
+  this->xmlElem = (bo.xmlElem)? bo.xmlElem->Clone() : NULL;
   this->registerObject( this, BaseObject::_objectList);
 }

branches/network/src/world_entities/spectator.cc

@@ -234 +234 @@
   else if( event.type == KeyMapper::PEV_JUMP)
   {
-    //FPSPlayer * fps = new FPSPlayer();
-    WorldEntity * fps = new WorldEntity();
+    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" );
+    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 );