Complet the rebase to master branch.

CMake/Toolchains/emscripten.toolchain.cmake

@@ -83,7 +83,7 @@ endif()
 
 if ("${CMAKE_AR}" STREQUAL "")
 #	set(CMAKE_AR "${EMSCRIPTEN_ROOT_PATH}/emar${EMCC_SUFFIX}" CACHE FILEPATH "Emscripten ar")
-	set(CMAKE_AR "/usr/bin/ar" CACHE FILEPATH "Emscripten ar")
+	set(CMAKE_AR "ar" CACHE FILEPATH "Emscripten ar")
 endif()
 
 if ("${CMAKE_RANLIB}" STREQUAL "")

Source/Samples/17_SceneReplication/SceneReplication.cpp

@@ -26,7 +26,7 @@
 #include <Urho3D/Graphics/Camera.h>
 #include <Urho3D/Physics/CollisionShape.h>
 #include <Urho3D/Network/Connection.h>
-#include <Urho3D/Network/Controls.h>
+#include <Urho3D/Input/Controls.h>
 #include <Urho3D/Core/CoreEvents.h>
 #include <Urho3D/UI/Cursor.h>
 #include <Urho3D/Engine/Engine.h>

Source/Samples/18_CharacterDemo/Character.h

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include <Urho3D/Network/Controls.h>
+#include <Urho3D/Input/Controls.h>
 #include <Urho3D/Scene/LogicComponent.h>
 
 using namespace Urho3D;

Source/Samples/18_CharacterDemo/CharacterDemo.cpp

@@ -26,7 +26,7 @@
 #include <Urho3D/Graphics/AnimationController.h>
 #include <Urho3D/Graphics/Camera.h>
 #include <Urho3D/Physics/CollisionShape.h>
-#include <Urho3D/Network/Controls.h>
+#include <Urho3D/Input/Controls.h>
 #include <Urho3D/Core/CoreEvents.h>
 #include <Urho3D/Engine/Engine.h>
 #include <Urho3D/IO/FileSystem.h>

Source/Samples/18_CharacterDemo/Touch.cpp

@@ -22,7 +22,7 @@
 
 #include <Urho3D/Urho3D.h>
 
-#include <Urho3D/Network/Controls.h>
+#include <Urho3D/Input/Controls.h>
 #include <Urho3D/Graphics/Graphics.h>
 #include <Urho3D/Input/Input.h>
 #include <Urho3D/Graphics/Renderer.h>

Source/Samples/19_VehicleDemo/Vehicle.h

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include <Urho3D/Network/Controls.h>
+#include <Urho3D/Input/Controls.h>
 #include <Urho3D/Scene/LogicComponent.h>
 
 namespace Urho3D

Source/Urho3D/Core/ProcessUtils.cpp

@@ -33,7 +33,7 @@
 
 #if defined(IOS)
 #include <mach/mach_host.h>
-#elif !defined(ANDROID) && !defined(RPI)
+#elif !defined(ANDROID) && !defined(RPI) && !defined(EMSCRIPTEN)
 #include <LibCpuId/libcpuid.h>
 #endif
 

Source/Urho3D/Input/Controls.cpp

@@ -20,7 +20,7 @@
 // THE SOFTWARE.
 //
 
-#include "../Network/Controls.h"
+#include "../Input/Controls.h"
 
 #include "../DebugNew.h"
 

Source/Urho3D/Input/Input.cpp

@@ -1260,7 +1260,7 @@ void Input::HandleSDLEvent(void* sdlEvent)
     case SDL_KEYDOWN:
         // Convert to uppercase to match Win32 virtual key codes
 #if defined (EMSCRIPTEN)
-        SetKey(ConvertSDLKeyCode(evt.key.keysym.sym, evt.key.keysym.scancode), evt.key.keysym.scancode, 0, true);
+        SetKey(ConvertSDLKeyCode(evt.key.keysym.sym, evt.key.keysym.scancode), evt.key.keysym.scancode, evt.key.keysym.unknown, true);
 #else
         SetKey(ConvertSDLKeyCode(evt.key.keysym.sym, evt.key.keysym.scancode), evt.key.keysym.scancode, evt.key.keysym.raw, true);
 #endif
@@ -1268,7 +1268,7 @@ void Input::HandleSDLEvent(void* sdlEvent)
 
     case SDL_KEYUP:
 #if defined(EMSCRIPTEN)
-        SetKey(ConvertSDLKeyCode(evt.key.keysym.sym, evt.key.keysym.scancode), evt.key.keysym.scancode, 0, false);
+        SetKey(ConvertSDLKeyCode(evt.key.keysym.sym, evt.key.keysym.scancode), evt.key.keysym.scancode, evt.key.keysym.unknown, false);
 #else
         SetKey(ConvertSDLKeyCode(evt.key.keysym.sym, evt.key.keysym.scancode), evt.key.keysym.scancode, evt.key.keysym.raw, false);
 #endif

Source/Urho3D/LuaScript/pkgs/Network/Controls.pkg → Source/Urho3D/LuaScript/pkgs/Input/Controls.pkg

@@ -1,4 +1,4 @@
-$#include "Network/Controls.h"
+$#include "Input/Controls.h"
 
 class Controls
 {

Source/Urho3D/LuaScript/pkgs/InputLuaAPI.pkg

@@ -1,3 +1,4 @@
+$pfile "Input/Controls.pkg"
 $pfile "Input/Input.pkg"
 $pfile "Input/InputEvents.pkg"
 

Source/Urho3D/LuaScript/pkgs/NetworkLuaAPI.pkg

@@ -1,5 +1,4 @@
 $pfile "Network/Connection.pkg"
-$pfile "Network/Controls.pkg"
 $pfile "Network/HttpRequest.pkg"
 $pfile "Network/Network.pkg"
 $pfile "Network/NetworkPriority.pkg"

Source/Urho3D/Network/Connection.h

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include "../Network/Controls.h"
+#include "../Input/Controls.h"
 #include "../Container/HashSet.h"
 #include "../Core/Object.h"
 #include "../Scene/ReplicationState.h"

Source/Urho3D/Script/InputAPI.cpp

@@ -21,6 +21,7 @@
 //
 
 #include "../Script/APITemplates.h"
+#include "../Input/Controls.h"
 #include "../Input/Input.h"
 
 namespace Urho3D
@@ -29,6 +30,38 @@ namespace Urho3D
 void FakeAddRef(void* ptr);
 void FakeReleaseRef(void* ptr);
 
+static void ConstructControls(Controls* ptr)
+{
+    new(ptr)Controls();
+}
+
+static void ConstructControlsCopy(const Controls& controls, Controls* ptr)
+{
+    new(ptr)Controls(controls);
+}
+
+static void DestructControls(Controls* ptr)
+{
+    ptr->~Controls();
+}
+
+static void RegisterControls(asIScriptEngine* engine)
+{
+    engine->RegisterObjectType("Controls", sizeof(Controls), asOBJ_VALUE | asOBJ_APP_CLASS_CDK);
+    engine->RegisterObjectBehaviour("Controls", asBEHAVE_CONSTRUCT, "void f()", asFUNCTION(ConstructControls), asCALL_CDECL_OBJLAST);
+    engine->RegisterObjectBehaviour("Controls", asBEHAVE_CONSTRUCT, "void f(const Controls&in)", asFUNCTION(ConstructControlsCopy), asCALL_CDECL_OBJLAST);
+    engine->RegisterObjectBehaviour("Controls", asBEHAVE_DESTRUCT, "void f()", asFUNCTION(DestructControls), asCALL_CDECL_OBJLAST);
+    engine->RegisterObjectMethod("Controls", "Controls& opAssign(const Controls&in)", asMETHOD(Controls, operator =), asCALL_THISCALL);
+    engine->RegisterObjectMethod("Controls", "void Reset()", asMETHOD(Controls, Reset), asCALL_THISCALL);
+    engine->RegisterObjectMethod("Controls", "void Set(uint, bool)", asMETHOD(Controls, Set), asCALL_THISCALL);
+    engine->RegisterObjectMethod("Controls", "bool IsDown(uint) const", asMETHOD(Controls, IsDown), asCALL_THISCALL);
+    engine->RegisterObjectMethod("Controls", "bool IsPressed(uint, const Controls&in) const", asMETHOD(Controls, IsPressed), asCALL_THISCALL);
+    engine->RegisterObjectProperty("Controls", "uint buttons", offsetof(Controls, buttons_));
+    engine->RegisterObjectProperty("Controls", "float yaw", offsetof(Controls, yaw_));
+    engine->RegisterObjectProperty("Controls", "float pitch", offsetof(Controls, pitch_));
+    engine->RegisterObjectProperty("Controls", "VariantMap extraData", offsetof(Controls, extraData_));
+}
+
 static void RegisterInputConstants(asIScriptEngine* engine)
 {
     engine->RegisterGlobalProperty("const int MOUSEB_LEFT", (void*)&MOUSEB_LEFT);
@@ -553,6 +586,7 @@ static void RegisterInput(asIScriptEngine* engine)
 
 void RegisterInputAPI(asIScriptEngine* engine)
 {
+    RegisterControls(engine);
     RegisterInputConstants(engine);
     RegisterInput(engine);
 }

Source/Urho3D/Script/NetworkAPI.cpp

@@ -22,7 +22,6 @@
 
 #ifdef URHO3D_NETWORK
 #include "../Script/APITemplates.h"
-#include "../Network/Controls.h"
 #include "../Network/HttpRequest.h"
 #include "../Network/Network.h"
 #include "../Network/NetworkPriority.h"
@@ -31,38 +30,6 @@
 namespace Urho3D
 {
 
-static void ConstructControls(Controls* ptr)
-{
-    new(ptr) Controls();
-}
-
-static void ConstructControlsCopy(const Controls& controls, Controls* ptr)
-{
-    new(ptr) Controls(controls);
-}
-
-static void DestructControls(Controls* ptr)
-{
-    ptr->~Controls();
-}
-
-static void RegisterControls(asIScriptEngine* engine)
-{
-    engine->RegisterObjectType("Controls", sizeof(Controls), asOBJ_VALUE | asOBJ_APP_CLASS_CDK);
-    engine->RegisterObjectBehaviour("Controls", asBEHAVE_CONSTRUCT, "void f()", asFUNCTION(ConstructControls), asCALL_CDECL_OBJLAST);
-    engine->RegisterObjectBehaviour("Controls", asBEHAVE_CONSTRUCT, "void f(const Controls&in)", asFUNCTION(ConstructControlsCopy), asCALL_CDECL_OBJLAST);
-    engine->RegisterObjectBehaviour("Controls", asBEHAVE_DESTRUCT, "void f()", asFUNCTION(DestructControls), asCALL_CDECL_OBJLAST);
-    engine->RegisterObjectMethod("Controls", "Controls& opAssign(const Controls&in)", asMETHOD(Controls, operator =), asCALL_THISCALL);
-    engine->RegisterObjectMethod("Controls", "void Reset()", asMETHOD(Controls, Reset), asCALL_THISCALL);
-    engine->RegisterObjectMethod("Controls", "void Set(uint, bool)", asMETHOD(Controls, Set), asCALL_THISCALL);
-    engine->RegisterObjectMethod("Controls", "bool IsDown(uint) const", asMETHOD(Controls, IsDown), asCALL_THISCALL);
-    engine->RegisterObjectMethod("Controls", "bool IsPressed(uint, const Controls&in) const", asMETHOD(Controls, IsPressed), asCALL_THISCALL);
-    engine->RegisterObjectProperty("Controls", "uint buttons", offsetof(Controls, buttons_));
-    engine->RegisterObjectProperty("Controls", "float yaw", offsetof(Controls, yaw_));
-    engine->RegisterObjectProperty("Controls", "float pitch", offsetof(Controls, pitch_));
-    engine->RegisterObjectProperty("Controls", "VariantMap extraData", offsetof(Controls, extraData_));
-}
-
 static void RegisterNetworkPriority(asIScriptEngine* engine)
 {
     RegisterComponent<NetworkPriority>(engine, "NetworkPriority");
@@ -218,7 +185,6 @@ void RegisterNetwork(asIScriptEngine* engine)
 
 void RegisterNetworkAPI(asIScriptEngine* engine)
 {
-    RegisterControls(engine);
     RegisterNetworkPriority(engine);
     RegisterConnection(engine);
     RegisterHttpRequest(engine);