Changeset 1268
- Timestamp:
- May 13, 2008, 10:13:17 PM (17 years ago)
- Location:
- code/branches/merge/src
- Files:
-
- 4 edited
-
core/InputHandler.cc (modified) (15 diffs)
-
core/InputManager.cc (modified) (1 diff)
-
orxonox/GraphicsEngine.cc (modified) (4 diffs)
-
orxonox/Orxonox.cc (modified) (7 diffs)
Legend:
- Unmodified
- Added
- Removed
-
code/branches/merge/src/core/InputHandler.cc
r1219 r1268 55 55 std::string keyNames[] = { 56 56 "UNASSIGNED", 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 57 "ESCAPE", 58 "1", 59 "2", 60 "3", 61 "4", 62 "5", 63 "6", 64 "7", 65 "8", 66 "9", 67 "0", 68 "MINUS", 69 "EQUALS", 70 "BACK", 71 "TAB", 72 "Q", 73 "W", 74 "E", 75 "R", 76 "T", 77 "Y", 78 "U", 79 "I", 80 "O", 81 "P", 82 "LBRACKET", 83 "RBRACKET", 84 "RETURN", 85 "LCONTROL", 86 "A", 87 "S", 88 "D", 89 "F", 90 "G", 91 "H", 92 "J", 93 "K", 94 "L", 95 "SEMICOLON", 96 "APOSTROPHE", 97 "GRAVE", 98 "LSHIFT", 99 "BACKSLASH", 100 "Z", 101 "X", 102 "C", 103 "V", 104 "B", 105 "N", 106 "M", 107 "COMMA", 108 "PERIOD", 109 "SLASH", 110 "RSHIFT", 111 "MULTIPLY", 112 "LMENU", 113 "SPACE", 114 "CAPITAL", 115 "F1", 116 "F2", 117 "F3", 118 "F4", 119 "F5", 120 "F6", 121 "F7", 122 "F8", 123 "F9", 124 "F10", 125 "NUMLOCK", 126 "SCROLL", 127 "NUMPAD7", 128 "NUMPAD8", 129 "NUMPAD9", 130 "SUBTRACT", 131 "NUMPAD4", 132 "NUMPAD5", 133 "NUMPAD6", 134 "ADD", 135 "NUMPAD1", 136 "NUMPAD2", 137 "NUMPAD3", 138 "NUMPAD0", 139 "DECIMAL", 140 140 "","", 141 142 143 141 "OEM_102", 142 "F11", 143 "F12", 144 144 "","","","","","","","","","","", 145 146 147 145 "F13", 146 "F14", 147 "F15", 148 148 "","","","","","","","","","", 149 149 "KANA", 150 150 "","", 151 151 "ABNT_C1", 152 152 "","","","","", 153 154 "", 155 156 "", 157 158 153 "CONVERT", 154 "", 155 "NOCONVERT", 156 "", 157 "YEN", 158 "ABNT_C2", 159 159 "","","","","","","","","","","","","","", 160 160 "NUMPADEQUALS", 161 161 "","", 162 163 164 165 166 167 168 169 170 162 "PREVTRACK", 163 "AT", 164 "COLON", 165 "UNDERLINE", 166 "KANJI", 167 "STOP", 168 "AX", 169 "UNLABELED", 170 "NEXTTRACK", 171 171 "","", 172 173 172 "NUMPADENTER", 173 "RCONTROL", 174 174 "","", 175 176 177 178 "", 179 175 "MUTE", 176 "CALCULATOR", 177 "PLAYPAUSE", 178 "", 179 "MEDIASTOP", 180 180 "","","","","","","","","", 181 182 "", 183 184 "", 185 186 187 "", 188 189 "", 190 191 181 "VOLUMEDOWN", 182 "", 183 "VOLUMEUP", 184 "", 185 "WEBHOME", 186 "NUMPADCOMMA", 187 "", 188 "DIVIDE", 189 "", 190 "SYSRQ", 191 "RMENU", 192 192 "","","","","","","","","","","","", 193 194 "", 195 196 197 198 "", 199 200 "", 201 202 "", 203 204 205 206 207 193 "PAUSE", 194 "", 195 "HOME", 196 "UP", 197 "PGUP", 198 "", 199 "LEFT", 200 "", 201 "RIGHT", 202 "", 203 "END", 204 "DOWN", 205 "PGDOWN", 206 "INSERT", 207 "DELETE", 208 208 "","","","","","","", 209 210 211 212 213 209 "LWIN", 210 "RWIN", 211 "APPS", 212 "POWER", 213 "SLEEP", 214 214 "","","", 215 216 "", 217 218 219 220 221 222 223 224 225 215 "WAKE", 216 "", 217 "WEBSEARCH", 218 "WEBFAVORITES", 219 "WEBREFRESH", 220 "WEBSTOP", 221 "WEBFORWARD", 222 "WEBBACK", 223 "MYCOMPUTER", 224 "MAIL", 225 "MEDIASELECT" 226 226 }; 227 227 for (int i = 0; i < numberOfKeys_s; i++) … … 229 229 230 230 std::string mouseButtonNames[] = { 231 "MouseLeft", "MouseRight", "MouseMiddle",232 "MouseButton3", "MouseButton4", "MouseButton5",233 "MouseButton6", "MouseButton7" };231 "MouseLeft", "MouseRight", "MouseMiddle", 232 "MouseButton3", "MouseButton4", "MouseButton5", 233 "MouseButton6", "MouseButton7" }; 234 234 for (int i = 0; i < numberOfMouseButtons_s; i++) 235 235 mouseButtonNames_[i] = mouseButtonNames[i]; … … 393 393 // binding.commandStr = binding.evaluation.getCommandString(); 394 394 //} 395 COUT( 3) << "Executing command: " << binding.commandStr << std::endl;395 COUT(ORX_DEBUG) << "Keybinding: Executing command: " << binding.commandStr << std::endl; 396 396 CommandExecutor::execute(binding.commandStr); 397 397 } … … 407 407 bool KeyBinder::keyPressed(const OIS::KeyEvent &e) 408 408 { 409 COUT(3) << "Key: " << e.key << std::endl;409 //COUT(ORX_DEBUG) << "Key: " << e.key << std::endl; 410 410 // find the appropriate key binding 411 411 executeBinding(bindingsKeyPress_[int(e.key)]); … … 459 459 { 460 460 CommandExecutor::execute(cmdStr); 461 COUT(3) << "Executing command: " << cmdStr << std::endl;461 //COUT(3) << "Executing command: " << cmdStr << std::endl; 462 462 } 463 463 … … 477 477 { 478 478 CommandExecutor::execute(cmdStr); 479 COUT(3) << "Executing command: " << cmdStr << std::endl;479 //COUT(3) << "Executing command: " << cmdStr << std::endl; 480 480 } 481 481 … … 495 495 { 496 496 CommandExecutor::execute(cmdStr); 497 COUT(3) << "Executing command: " << cmdStr << std::endl;497 //COUT(3) << "Executing command: " << cmdStr << std::endl; 498 498 } 499 499 … … 508 508 { 509 509 CommandExecutor::execute(cmdStr); 510 COUT(3) << "Executing command: " << cmdStr << std::endl;510 //COUT(3) << "Executing command: " << cmdStr << std::endl; 511 511 } 512 512 … … 521 521 { 522 522 CommandExecutor::execute(cmdStr); 523 COUT(3) << "Executing command: " << cmdStr << std::endl;523 //COUT(3) << "Executing command: " << cmdStr << std::endl; 524 524 } 525 525 … … 534 534 { 535 535 CommandExecutor::execute(cmdStr); 536 COUT(3) << "Executing command: " << cmdStr << std::endl;536 //COUT(3) << "Executing command: " << cmdStr << std::endl; 537 537 } 538 538 … … 586 586 //bool GUIInputHandler::keyPressed(const OIS::KeyEvent &e) 587 587 //{ 588 589 588 ////CEGUI::System::getSingleton().injectKeyDown( arg.key ); 589 ////CEGUI::System::getSingleton().injectChar( arg.text ); 590 590 // return true; 591 591 //} … … 597 597 //bool GUIInputHandler::keyReleased(const OIS::KeyEvent &e) 598 598 //{ 599 599 ////CEGUI::System::getSingleton().injectKeyUp( arg.key ); 600 600 // return true; 601 601 //} … … 607 607 //bool GUIInputHandler::mouseMoved(const OIS::MouseEvent &e) 608 608 //{ 609 609 ////CEGUI::System::getSingleton().injectMouseMove( arg.state.X.rel, arg.state.Y.rel ); 610 610 // return true; 611 611 //} … … 618 618 //bool GUIInputHandler::mousePressed(const OIS::MouseEvent &e, OIS::MouseButtonID id) 619 619 //{ 620 620 ////CEGUI::System::getSingleton().injectMouseButtonDown(convertOISMouseButtonToCegui(id)); 621 621 // return true; 622 622 //} … … 629 629 //bool GUIInputHandler::mouseReleased(const OIS::MouseEvent &e, OIS::MouseButtonID id) 630 630 //{ 631 631 ////CEGUI::System::getSingleton().injectMouseButtonUp(convertOISMouseButtonToCegui(id)); 632 632 // return true; 633 633 //} -
code/branches/merge/src/core/InputManager.cc
r1219 r1268 92 92 if (state_ == IS_UNINIT) 93 93 { 94 CCOUT(3) << "Initialising Input System..." << std::endl; 94 95 CCOUT(ORX_DEBUG) << "Initialising OIS components..." << std::endl; 95 96 -
code/branches/merge/src/orxonox/GraphicsEngine.cc
r1263 r1268 99 99 void GraphicsEngine::destroy() 100 100 { 101 C OUT(4) << "Destroying objects..." << std::endl;101 CCOUT(4) << "Destroying objects..." << std::endl; 102 102 Ogre::WindowEventUtilities::removeWindowEventListener(this->renderWindow_, this); 103 103 if (this->root_) … … 113 113 delete Ogre::LogManager::getSingletonPtr(); 114 114 } 115 C OUT(4) << "Destroying objects done" << std::endl;115 CCOUT(4) << "Destroying objects done" << std::endl; 116 116 } 117 117 … … 139 139 // create a logManager 140 140 Ogre::LogManager *logger; 141 if (Ogre::LogManager::getSingletonPtr() == 0) 142 logger = new Ogre::LogManager(); 143 else 144 logger = Ogre::LogManager::getSingletonPtr(); 141 //if (Ogre::LogManager::getSingletonPtr() == 0) 142 // note: If there's already a logManager, Ogre will complain by a failed assertation. 143 // but that shouldn't happen, since this is the first time to create a logManager.. 144 logger = new Ogre::LogManager(); 145 //else 146 // logger = Ogre::LogManager::getSingletonPtr(); 145 147 CCOUT(4) << "Ogre LogManager created/assigned" << std::endl; 146 148 … … 151 153 else 152 154 myLog = logger->createLog(this->ogreLogfile_, true, false, false); 153 C OUT(4) << "*** GraphicsEngine:Ogre Log created" << std::endl;155 CCOUT(4) << "Ogre Log created" << std::endl; 154 156 155 157 myLog->setLogDetail(Ogre::LL_BOREME); -
code/branches/merge/src/orxonox/Orxonox.cc
r1266 r1268 201 201 void Orxonox::abortRequest() 202 202 { 203 COUT(3) << " ***Orxonox: Abort requested." << std::endl;203 COUT(3) << "Orxonox: Abort requested." << std::endl; 204 204 bAbort_ = true; 205 205 } … … 246 246 return false; 247 247 248 COUT(3) << "*** Orxonox: Mode is " << mode << "." << std::endl;249 248 if (mode == "client") 250 249 mode_ = CLIENT; … … 252 251 mode_ = SERVER; 253 252 else 253 { 254 mode = "standalone"; 254 255 mode_ = STANDALONE; 256 } 257 COUT(3) << "Orxonox: Mode is " << mode << "." << std::endl; 255 258 256 259 //if (mode_ == DEDICATED) … … 343 346 344 347 // Load the HUD 345 COUT(3) << " ***Orxonox: Loading HUD..." << std::endl;348 COUT(3) << "Orxonox: Loading HUD..." << std::endl; 346 349 Ogre::Overlay* hudOverlay = Ogre::OverlayManager::getSingleton().getByName("Orxonox/HUD1.2"); 347 350 orxonoxHUD_ = new HUD(); … … 350 353 hudOverlay->show(); 351 354 352 COUT(3) << " ***Orxonox: Loading Console..." << std::endl;355 COUT(3) << "Orxonox: Loading Console..." << std::endl; 353 356 InputBuffer* ib = dynamic_cast<InputBuffer*>(InputManager::getKeyHandler("buffer")); 354 357 /* … … 445 448 if (Ogre::Root::getSingletonPtr() == 0) 446 449 { 447 COUT(2) << " ***Orxonox Error: Could not start rendering. No Ogre root object found" << std::endl;450 COUT(2) << "Orxonox Error: Could not start rendering. No Ogre root object found" << std::endl; 448 451 return false; 449 452 } … … 466 469 timer_->reset(); 467 470 468 COUT(3) << " ***Orxonox: Starting the main loop." << std::endl;471 COUT(3) << "Orxonox: Starting the main loop." << std::endl; 469 472 while (!bAbort_) 470 473 {
Note: See TracChangeset
for help on using the changeset viewer.
