Changeset 5886 in orxonox.OLD for branches

Timestamp:

Dec 3, 2005, 2:54:27 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/spaceshipcontroll: events need to include less

Location:

branches/spaceshipcontrol/src

Files:

• lib/event/key_mapper.cc (modified) (2 diffs)
• lib/event/key_mapper.h (modified) (2 diffs)
• story_entities/world.cc (modified) (2 diffs)
• world_entities/playable.h (modified) (1 diff)

branches/spaceshipcontrol/src/lib/event/key_mapper.cc

@@ -21 +21 @@
 #include "key_mapper.h"
 
+#include "event_def.h"
+
 #include "globals.h"
 #include "ini_parser.h"
 #include "key_names.h"
 #include "debug.h"
+
 
 using namespace std;
@@ -191 +194 @@
       {
         if( index[0] == 0)
-        {
+        {
           *map[i].pValue = index[1];
           PRINTF(4)("Mapping %s to '%s' (id %i)\n", name, SDLKToKeyname(index[1]), index[1]);
           break;
-        }
-        else { 
+        }
+        else {
           *map[i].pValue = index[1];
           PRINTF(4)("Mapping %s to '%s' (id %i)\n", name, SDLBToButtonname(index[1]), index[1]);
           break;
-        }
+        }
       }
     }

branches/spaceshipcontrol/src/lib/event/key_mapper.h

@@ -10 +10 @@
 
 #include "base_object.h"
-#include "event_def.h"
+//#include "event_def.h"
 
 class IniParser;
@@ -66 +66 @@
 
  private:
-  Sint32     coord[2];              //!< temp place to save variables in nameToIndex() function
+  int         coord[2];              //!< temp place to save variables in nameToIndex() function
 };
 

branches/spaceshipcontrol/src/story_entities/world.cc

@@ -362 +362 @@
   // Create a Player
   this->localPlayer = new Player();
+  Playable* playable;
   list<BaseObject*>* playableList = ClassList::getList(CL_PLAYABLE);
   if (playableList != NULL)
   {
-    Playable* playable = dynamic_cast<Playable*>(playableList->front());
+    playable = dynamic_cast<Playable*>(playableList->front());
     if (playable != NULL)
       this->localPlayer->setControllable(playable);
@@ -381 +382 @@
 
   // bind camera
-  //this->localCamera->bind (localPlayer);
- // this->localPlayer->addChild (this->localCamera);
+  playable->addChild (this->localCamera);
 
 
   //        TrackManager::getInstance()->setBindSlave(env);
-//  PNode* tn = TrackManager::getInstance()->getTrackNode();
-//  tn->addChild(this->localPlayer);
-
-  //localCamera->setParent(TrackNode::getInstance());
+  PNode* tn = TrackManager::getInstance()->getTrackNode();
+  tn->addChild(playable);
+
+//   //localCamera->setParent(TrackNode::getInstance());
 //  tn->addChild(this->localCamera);
-//  localCamera->lookAt(tn);
-  localCamera->setClipRegion(1, 10000.0);
+  localCamera->lookAt(tn);
+  localCamera->setClipRegion(1, 1000.0);
 //  this->localPlayer->setParentMode(PNODE_ALL);
   TrackManager::getInstance()->condition(1, LEFTRIGHT, this->localPlayer);

branches/spaceshipcontrol/src/world_entities/playable.h

@@ -43 +43 @@
     WeaponManager*        weaponMan;          //!< the weapon manager: managing a list of weapon to wepaon-slot mapping
     std::list<int>        events;
+
+    Player*               currentPlayer;
     //todo: add a event to id mapping list
-
-
 };