Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5886 in orxonox.OLD for branches


Ignore:
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:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/spaceshipcontrol/src/lib/event/key_mapper.cc

    r5474 r5886  
    2121#include "key_mapper.h"
    2222
     23#include "event_def.h"
     24
    2325#include "globals.h"
    2426#include "ini_parser.h"
    2527#include "key_names.h"
    2628#include "debug.h"
     29
    2730
    2831using namespace std;
     
    191194      {
    192195        if( index[0] == 0)
    193         {
     196        {
    194197          *map[i].pValue = index[1];
    195198          PRINTF(4)("Mapping %s to '%s' (id %i)\n", name, SDLKToKeyname(index[1]), index[1]);
    196199          break;
    197         }
    198         else {
     200        }
     201        else {
    199202          *map[i].pValue = index[1];
    200203          PRINTF(4)("Mapping %s to '%s' (id %i)\n", name, SDLBToButtonname(index[1]), index[1]);
    201204          break;
    202         }
     205        }
    203206      }
    204207    }
  • branches/spaceshipcontrol/src/lib/event/key_mapper.h

    r5819 r5886  
    1010
    1111#include "base_object.h"
    12 #include "event_def.h"
     12//#include "event_def.h"
    1313
    1414class IniParser;
     
    6666
    6767 private:
    68   Sint32     coord[2];              //!< temp place to save variables in nameToIndex() function
     68  int         coord[2];              //!< temp place to save variables in nameToIndex() function
    6969};
    7070
  • branches/spaceshipcontrol/src/story_entities/world.cc

    r5881 r5886  
    362362  // Create a Player
    363363  this->localPlayer = new Player();
     364  Playable* playable;
    364365  list<BaseObject*>* playableList = ClassList::getList(CL_PLAYABLE);
    365366  if (playableList != NULL)
    366367  {
    367     Playable* playable = dynamic_cast<Playable*>(playableList->front());
     368    playable = dynamic_cast<Playable*>(playableList->front());
    368369    if (playable != NULL)
    369370      this->localPlayer->setControllable(playable);
     
    381382
    382383  // bind camera
    383   //this->localCamera->bind (localPlayer);
    384  // this->localPlayer->addChild (this->localCamera);
     384  playable->addChild (this->localCamera);
    385385
    386386
    387387  //        TrackManager::getInstance()->setBindSlave(env);
    388 //  PNode* tn = TrackManager::getInstance()->getTrackNode();
    389 //  tn->addChild(this->localPlayer);
    390 
    391   //localCamera->setParent(TrackNode::getInstance());
     388  PNode* tn = TrackManager::getInstance()->getTrackNode();
     389  tn->addChild(playable);
     390
     391//   //localCamera->setParent(TrackNode::getInstance());
    392392//  tn->addChild(this->localCamera);
    393 //  localCamera->lookAt(tn);
    394   localCamera->setClipRegion(1, 10000.0);
     393  localCamera->lookAt(tn);
     394  localCamera->setClipRegion(1, 1000.0);
    395395//  this->localPlayer->setParentMode(PNODE_ALL);
    396396  TrackManager::getInstance()->condition(1, LEFTRIGHT, this->localPlayer);
  • branches/spaceshipcontrol/src/world_entities/playable.h

    r5878 r5886  
    4343    WeaponManager*        weaponMan;          //!< the weapon manager: managing a list of weapon to wepaon-slot mapping
    4444    std::list<int>        events;
     45
     46    Player*               currentPlayer;
    4547    //todo: add a event to id mapping list
    46 
    47 
    4848};
    4949
Note: See TracChangeset for help on using the changeset viewer.