Changeset 1268 for code/branches/merge/src/core

Timestamp:

May 13, 2008, 10:13:17 PM (17 years ago)

Author:

rgrieder

Message:

• removed some debug output

Location:

code/branches/merge/src/core

Files:

• InputHandler.cc (modified) (15 diffs)
• InputManager.cc (modified) (1 diff)

code/branches/merge/src/core/InputHandler.cc

@@ -55 +55 @@
     std::string keyNames[] = {
     "UNASSIGNED",
-                "ESCAPE",
-                "1",
-                "2",
-                "3",
-                "4",
-                "5",
-                "6",
-                "7",
-                "8",
-                "9",
-                "0",
-                "MINUS",
-                "EQUALS",
-                "BACK",
-                "TAB",
-                "Q",
-                "W",
-                "E",
-                "R",
-                "T",
-                "Y",
-                "U",
-                "I",
-                "O",
-                "P",
-                "LBRACKET",
-                "RBRACKET",
-                "RETURN",
-                "LCONTROL",
-                "A",
-                "S",
-                "D",
-                "F",
-                "G",
-                "H",
-                "J",
-                "K",
-                "L",
-                "SEMICOLON",
-                "APOSTROPHE",
-                "GRAVE",
-                "LSHIFT",
-                "BACKSLASH",
-                "Z",
-                "X",
-                "C",
-                "V",
-                "B",
-                "N",
-                "M",
-                "COMMA",
-                "PERIOD",
-                "SLASH",
-                "RSHIFT",
-                "MULTIPLY",
-                "LMENU",
-                "SPACE",
-                "CAPITAL",
-                "F1",
-                "F2",
-                "F3",
-                "F4",
-                "F5",
-                "F6",
-                "F7",
-                "F8",
-                "F9",
-                "F10",
-                "NUMLOCK",
-                "SCROLL",
-                "NUMPAD7",
-                "NUMPAD8",
-                "NUMPAD9",
-                "SUBTRACT",
-                "NUMPAD4",
-                "NUMPAD5",
-                "NUMPAD6",
-                "ADD",
-                "NUMPAD1",
-                "NUMPAD2",
-                "NUMPAD3",
-                "NUMPAD0",
-                "DECIMAL",
+    "ESCAPE",
+    "1",
+    "2",
+    "3",
+    "4",
+    "5",
+    "6",
+    "7",
+    "8",
+    "9",
+    "0",
+    "MINUS",
+    "EQUALS",
+    "BACK",
+    "TAB",
+    "Q",
+    "W",
+    "E",
+    "R",
+    "T",
+    "Y",
+    "U",
+    "I",
+    "O",
+    "P",
+    "LBRACKET",
+    "RBRACKET",
+    "RETURN",
+    "LCONTROL",
+    "A",
+    "S",
+    "D",
+    "F",
+    "G",
+    "H",
+    "J",
+    "K",
+    "L",
+    "SEMICOLON",
+    "APOSTROPHE",
+    "GRAVE",
+    "LSHIFT",
+    "BACKSLASH",
+    "Z",
+    "X",
+    "C",
+    "V",
+    "B",
+    "N",
+    "M",
+    "COMMA",
+    "PERIOD",
+    "SLASH",
+    "RSHIFT",
+    "MULTIPLY",
+    "LMENU",
+    "SPACE",
+    "CAPITAL",
+    "F1",
+    "F2",
+    "F3",
+    "F4",
+    "F5",
+    "F6",
+    "F7",
+    "F8",
+    "F9",
+    "F10",
+    "NUMLOCK",
+    "SCROLL",
+    "NUMPAD7",
+    "NUMPAD8",
+    "NUMPAD9",
+    "SUBTRACT",
+    "NUMPAD4",
+    "NUMPAD5",
+    "NUMPAD6",
+    "ADD",
+    "NUMPAD1",
+    "NUMPAD2",
+    "NUMPAD3",
+    "NUMPAD0",
+    "DECIMAL",
     "","",
-                "OEM_102",
-                "F11",
-                "F12",
+    "OEM_102",
+    "F11",
+    "F12",
     "","","","","","","","","","","",
-                "F13",
-                "F14",
-                "F15",
+    "F13",
+    "F14",
+    "F15",
     "","","","","","","","","","",
-                "KANA",
+    "KANA",
     "","",
-                "ABNT_C1",
+    "ABNT_C1",
     "","","","","",
-                "CONVERT",
-    "",
-                "NOCONVERT",
-    "",
-                "YEN",
-                "ABNT_C2",
+    "CONVERT",
+    "",
+    "NOCONVERT",
+    "",
+    "YEN",
+    "ABNT_C2",
     "","","","","","","","","","","","","","",
-                "NUMPADEQUALS",
+    "NUMPADEQUALS",
     "","",
-                "PREVTRACK",
-                "AT",
-                "COLON",
-                "UNDERLINE",
-                "KANJI",
-                "STOP",
-                "AX",
-                "UNLABELED",
-                "NEXTTRACK",
+    "PREVTRACK",
+    "AT",
+    "COLON",
+    "UNDERLINE",
+    "KANJI",
+    "STOP",
+    "AX",
+    "UNLABELED",
+    "NEXTTRACK",
     "","",
-                "NUMPADENTER",
-                "RCONTROL",
+    "NUMPADENTER",
+    "RCONTROL",
     "","",
-                "MUTE",
-                "CALCULATOR",
-                "PLAYPAUSE",
-    "",
-                "MEDIASTOP",
+    "MUTE",
+    "CALCULATOR",
+    "PLAYPAUSE",
+    "",
+    "MEDIASTOP",
     "","","","","","","","","",
-                "VOLUMEDOWN",
-    "",
-                "VOLUMEUP",
-    "",
-                "WEBHOME",
-                "NUMPADCOMMA",
-    "",
-                "DIVIDE",
-    "",
-                "SYSRQ",
-                "RMENU",
+    "VOLUMEDOWN",
+    "",
+    "VOLUMEUP",
+    "",
+    "WEBHOME",
+    "NUMPADCOMMA",
+    "",
+    "DIVIDE",
+    "",
+    "SYSRQ",
+    "RMENU",
     "","","","","","","","","","","","",
-                "PAUSE",
-    "",
-                "HOME",
-                "UP",
-                "PGUP",
-    "",
-                "LEFT",
-    "",
-                "RIGHT",
-    "",
-                "END",
-                "DOWN",
-                "PGDOWN",
-                "INSERT",
-                "DELETE",
+    "PAUSE",
+    "",
+    "HOME",
+    "UP",
+    "PGUP",
+    "",
+    "LEFT",
+    "",
+    "RIGHT",
+    "",
+    "END",
+    "DOWN",
+    "PGDOWN",
+    "INSERT",
+    "DELETE",
     "","","","","","","",
-                "LWIN",
-                "RWIN",
-                "APPS",
-                "POWER",
-                "SLEEP",
+    "LWIN",
+    "RWIN",
+    "APPS",
+    "POWER",
+    "SLEEP",
     "","","",
-                "WAKE",
-    "",
-                "WEBSEARCH",
-                "WEBFAVORITES",
-                "WEBREFRESH",
-                "WEBSTOP",
-                "WEBFORWARD",
-                "WEBBACK",
-                "MYCOMPUTER",
-                "MAIL",
-                "MEDIASELECT"
+    "WAKE",
+    "",
+    "WEBSEARCH",
+    "WEBFAVORITES",
+    "WEBREFRESH",
+    "WEBSTOP",
+    "WEBFORWARD",
+    "WEBBACK",
+    "MYCOMPUTER",
+    "MAIL",
+    "MEDIASELECT"
     };
     for (int i = 0; i < numberOfKeys_s; i++)
@@ -229 +229 @@
 
     std::string mouseButtonNames[] = {
-    "MouseLeft", "MouseRight", "MouseMiddle",
-    "MouseButton3", "MouseButton4", "MouseButton5",
-    "MouseButton6", "MouseButton7" };
+      "MouseLeft", "MouseRight", "MouseMiddle",
+      "MouseButton3", "MouseButton4", "MouseButton5",
+      "MouseButton6", "MouseButton7" };
     for (int i = 0; i < numberOfMouseButtons_s; i++)
       mouseButtonNames_[i] = mouseButtonNames[i];
@@ -393 +393 @@
       //  binding.commandStr = binding.evaluation.getCommandString();
       //}
-      COUT(3) << "Executing command: " << binding.commandStr << std::endl;
+      COUT(ORX_DEBUG) << "Keybinding: Executing command: " << binding.commandStr << std::endl;
       CommandExecutor::execute(binding.commandStr);
     }
@@ -407 +407 @@
   bool KeyBinder::keyPressed(const OIS::KeyEvent &e)
   {
-    COUT(3) << "Key: " << e.key << std::endl;
+    //COUT(ORX_DEBUG) << "Key: " << e.key << std::endl;
     // find the appropriate key binding
     executeBinding(bindingsKeyPress_[int(e.key)]);
@@ -459 +459 @@
     {
       CommandExecutor::execute(cmdStr);
-      COUT(3) << "Executing command: " << cmdStr << std::endl;
+      //COUT(3) << "Executing command: " << cmdStr << std::endl;
     }
 
@@ -477 +477 @@
     {
       CommandExecutor::execute(cmdStr);
-      COUT(3) << "Executing command: " << cmdStr << std::endl;
+      //COUT(3) << "Executing command: " << cmdStr << std::endl;
     }
 
@@ -495 +495 @@
     {
       CommandExecutor::execute(cmdStr);
-      COUT(3) << "Executing command: " << cmdStr << std::endl;
+      //COUT(3) << "Executing command: " << cmdStr << std::endl;
     }
 
@@ -508 +508 @@
     {
       CommandExecutor::execute(cmdStr);
-      COUT(3) << "Executing command: " << cmdStr << std::endl;
+      //COUT(3) << "Executing command: " << cmdStr << std::endl;
     }
 
@@ -521 +521 @@
     {
       CommandExecutor::execute(cmdStr);
-      COUT(3) << "Executing command: " << cmdStr << std::endl;
+      //COUT(3) << "Executing command: " << cmdStr << std::endl;
     }
 
@@ -534 +534 @@
     {
       CommandExecutor::execute(cmdStr);
-      COUT(3) << "Executing command: " << cmdStr << std::endl;
+      //COUT(3) << "Executing command: " << cmdStr << std::endl;
     }
 
@@ -586 +586 @@
   //bool GUIInputHandler::keyPressed(const OIS::KeyEvent &e)
   //{
-                ////CEGUI::System::getSingleton().injectKeyDown( arg.key );
-                ////CEGUI::System::getSingleton().injectChar( arg.text );
+    ////CEGUI::System::getSingleton().injectKeyDown( arg.key );
+    ////CEGUI::System::getSingleton().injectChar( arg.text );
   //  return true;
   //}
@@ -597 +597 @@
   //bool GUIInputHandler::keyReleased(const OIS::KeyEvent &e)
   //{
-                ////CEGUI::System::getSingleton().injectKeyUp( arg.key );
+    ////CEGUI::System::getSingleton().injectKeyUp( arg.key );
   //  return true;
   //}
@@ -607 +607 @@
   //bool GUIInputHandler::mouseMoved(const OIS::MouseEvent &e)
   //{
-                ////CEGUI::System::getSingleton().injectMouseMove( arg.state.X.rel, arg.state.Y.rel );
+    ////CEGUI::System::getSingleton().injectMouseMove( arg.state.X.rel, arg.state.Y.rel );
   //  return true;
   //}
@@ -618 +618 @@
   //bool GUIInputHandler::mousePressed(const OIS::MouseEvent &e, OIS::MouseButtonID id)
   //{
-                ////CEGUI::System::getSingleton().injectMouseButtonDown(convertOISMouseButtonToCegui(id));
+    ////CEGUI::System::getSingleton().injectMouseButtonDown(convertOISMouseButtonToCegui(id));
   //  return true;
   //}
@@ -629 +629 @@
   //bool GUIInputHandler::mouseReleased(const OIS::MouseEvent &e, OIS::MouseButtonID id)
   //{
-                ////CEGUI::System::getSingleton().injectMouseButtonUp(convertOISMouseButtonToCegui(id));
+    ////CEGUI::System::getSingleton().injectMouseButtonUp(convertOISMouseButtonToCegui(id));
   //  return true;
   //}

code/branches/merge/src/core/InputManager.cc

@@ -92 +92 @@
     if (state_ == IS_UNINIT)
     {
+      CCOUT(3) << "Initialising Input System..." << std::endl;
       CCOUT(ORX_DEBUG) << "Initialising OIS components..." << std::endl;