avatar_motion-->GameControl translation and flycam

2 files changed, 34 insertions, 11 deletions

diff --git a/indra/newview/tests/llgamecontrol_stub.cpp b/indra/newview/tests/llgamecontrol_stub.cpp
index 0872f647d7..b06a7fd132 100644
--- a/indra/newview/tests/llgamecontrol_stub.cpp
+++ b/indra/newview/tests/llgamecontrol_stub.cpp
@@ -24,53 +24,76 @@
  * $/LicenseInfo$
  */
 
+#pragma once
+
 #include "llgamecontrol.h"
 
 #include "SDL2/SDL_events.h"
 
+LLGameControl::State g_state;
 
-void LLGameControl::addKeyButtonMap(U16 key, U8 button)
+// static
+bool LLGameControl::isInitialized()
 {
+    return false;
 }
 
-void LLGameControl::removeKeyButtonMap(U16 key)
+// static
+void LLGameControl::init()
 {
 }
 
-void LLGameControl::addKeyAxisMap(U16 key, U8 axis, bool positive)
+// static
+void LLGameControl::terminate()
 {
 }
 
-void LLGameControl::removeKeyAxisMap(U16 key)
+// static
+bool LLGameControl::computeFinalStateAndCheckForChanges()
 {
+    return false;
 }
 
-void LLGameControl::onKeyDown(U16 key, U32 mask)
+// static
+void LLGameControl::clearAllState()
 {
 }
 
-void LLGameControl::onKeyUp(U16 key, U32 mask)
+// static
+void LLGameControl::processEvents(bool app_has_focus)
 {
 }
 
 // static
-bool LLGameControl::isInitialized()
+const LLGameControl::State& LLGameControl::getState()
+{
+    return g_state;
+}
+
+// static
+void LLGameControl::setIncludeKeyboard(bool include)
+{
+}
+
+// static
+bool LLGameControl::getIncludeKeyboard()
 {
     return false;
 }
 
 // static
-void LLGameControl::init()
+LLGameControl::InputChannel LLGameControl::getChannelByActionName(const std::string& name)
 {
+    return LLGameControl::InputChannel();
 }
 
 // static
-void LLGameControl::terminate()
+void LLGameControl::addActionMapping(const std::string& name, LLGameControl::InputChannel channel)
 {
 }
 
 // static
-void LLGameControl::processEvents(bool app_has_focus)
+void LLGameControl::setActionFlags(U32 action_flags)
 {
 }
 
diff --git a/indra/newview/tests/llversioninfo_test.cpp b/indra/newview/tests/llversioninfo_test.cpp
index 9eb5146f2b..b07800cdcd 100644
--- a/indra/newview/tests/llversioninfo_test.cpp
+++ b/indra/newview/tests/llversioninfo_test.cpp
@@ -31,7 +31,7 @@
 
 #include <iostream>
 
-#include "llgamecontrol_stub.cpp"
+//#include "llgamecontrol_stub.cpp"
 
 
 // LL_VIEWER_CHANNEL is a macro defined on the compiler command line. The