- Timestamp:
- Oct 26, 2009, 11:01:39 PM (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/steering/src/orxonox/controllers/NewHumanController.cc
r5981 r5993 46 46 namespace orxonox 47 47 { 48 SetConsoleCommand(NewHumanController, moveFrontBack, true).setAsInputCommand();49 SetConsoleCommand(NewHumanController, moveRightLeft, true).setAsInputCommand();50 SetConsoleCommand(NewHumanController, moveUpDown, true).setAsInputCommand();51 SetConsoleCommand(NewHumanController, rotateYaw, true).setAsInputCommand();52 SetConsoleCommand(NewHumanController, rotatePitch, true).setAsInputCommand();53 SetConsoleCommand(NewHumanController, rotateRoll, true).setAsInputCommand();54 SetConsoleCommand(NewHumanController, fire, true).keybindMode(KeybindMode::OnHold);55 SetConsoleCommand(NewHumanController, reload, true);56 SetConsoleCommand(NewHumanController, boost, true).keybindMode(KeybindMode::OnHold);57 SetConsoleCommand(NewHumanController, greet, true);58 SetConsoleCommand(NewHumanController, switchCamera, true);59 SetConsoleCommand(NewHumanController, mouseLook, true);60 SetConsoleCommand(NewHumanController, suicide, true);61 SetConsoleCommand(NewHumanController, addBots, true).defaultValues(1);62 SetConsoleCommand(NewHumanController, killBots, true).defaultValues(0);63 SetConsoleCommand(NewHumanController, dropItems, true);64 SetConsoleCommand(NewHumanController, useItem, true);65 SetConsoleCommand(NewHumanController, cycleNavigationFocus, true);66 SetConsoleCommand(NewHumanController, releaseNavigationFocus, true);67 48 68 49 CreateUnloadableFactory(NewHumanController); 69 70 NewHumanController* NewHumanController::localController_s = 0;71 50 72 51 NewHumanController::NewHumanController(BaseObject* creator) : HumanController(creator) 73 52 { 74 53 RegisterObject(NewHumanController); 75 76 NewHumanController::localController_s = this;77 78 gameInputState_ = InputManager::getInstance().createInputState("humansteering", true, true);79 gameInputState_->setMouseHandler(this);80 gameInputState_->setMouseMode(MouseMode::Exclusive);81 54 } 82 55 83 56 NewHumanController::~NewHumanController() 84 57 { 85 NewHumanController::localController_s = 0;86 87 58 if( this->isInitialized() ) 88 59 { 89 gameInputState_->setHandler(0);90 InputManager::getInstance().destroyState("humansteering");91 60 } 92 61 } 93 62 94 void NewHumanController::tick(float dt)63 /*void NewHumanController::tick(float dt) 95 64 { 96 65 if (GameMode::playsSound() && NewHumanController::localController_s && NewHumanController::localController_s->controllableEntity_) … … 106 75 COUT(3) << "NewHumanController, Warning: Using a ControllableEntity without Camera" << std::endl; 107 76 } 77 }*/ 78 79 void NewHumanController::yaw(const Vector2& value) 80 { 81 // SUPER(NewHumanController, yaw, value); 82 HumanController::yaw(value); 83 84 this->currentYaw_ = value.x; 85 std::cout << "X: " << static_cast<float>(this->currentPitch_) << " Y: " << static_cast<float>(this->currentYaw_) << endl; 108 86 } 109 110 void NewHumanController::startControl() { 111 //gameInputState_->setHandler(KeyBinderManager::getInstance().getDefaultAsHandler()); 112 //KeyBinderManager::getInstance().setToDefault(); 113 114 InputManager::getInstance().enterState("humansteering"); 115 std::cout << "started control" << endl; 116 } 117 118 void NewHumanController::stopControl() { 119 InputManager::getInstance().leaveState("humansteering"); 120 std::cout << "stopped control" << endl; 121 } 122 123 void NewHumanController::mouseMoved(IntVector2 abs, IntVector2 rel, IntVector2 clippingSize) 87 void NewHumanController::pitch(const Vector2& value) 124 88 { 125 std::cout << "X: " << static_cast<float>(abs.x) << " Y: " << static_cast<float>(abs.y) << endl; 89 // SUPER(NewHumanController, pitch, value); 90 HumanController::pitch(value); 91 92 this->currentPitch_ = value.x; 93 std::cout << "X: " << static_cast<float>(this->currentPitch_) << " Y: " << static_cast<float>(this->currentYaw_) << endl; 126 94 } 127 95
Note: See TracChangeset
for help on using the changeset viewer.