activate webgl builds

Source/Atomic/CMakeLists.txt

@@ -55,10 +55,10 @@ set (SOURCE_FILES ${CONTAINER_SOURCE} ${CORE_SOURCE} ${ENGINE_SOURCE} ${INPUT_SO
                   ${ATOMIC2D_SOURCE} ${ENVIRONMENT_SOURCE}
                   ${SCENE_SOURCE} ${UI_SOURCE} ${SYSTEM_UI_SOURCE}
                   ${WEB_SOURCE} ${SCRIPT_SOURCE} ${METRICS_SOURCE}
-                  ${PLATFORM_SOURCE} ${DATABASE_SOURCE} ${IK_SOURCE})
+                  ${PLATFORM_SOURCE} ${DATABASE_SOURCE} ${IK_SOURCE} ${NAVIGATION_SOURCE})
 
 if (NOT WEB)
-  set (SOURCE_FILES ${SOURCE_FILES} ${NETWORK_SOURCE} ${NAVIGATION_SOURCE})
+  set (SOURCE_FILES ${SOURCE_FILES} ${NETWORK_SOURCE})
 endif()
 
 GroupSources("Atomic2D")

Source/Atomic/IO/FileSystem.cpp

@@ -721,25 +721,9 @@ String FileSystem::GetProgramDir() const
     readlink(link.CString(), exeName, MAX_PATH);
     return GetPath(String(exeName));
 #else
-// ATOMIC BEGIN
-
-    // Disabling this on Mac as a possible source of resource issues with app bundles
-    // https://github.com/AtomicGameEngine/AtomicGameEngine/issues/1209
-
-#ifndef ATOMIC_PLATFORM_OSX
-
-    // If the executable directory does not contain CoreData & Data directories, but the current working directory does, use the
-    // current working directory instead
-    /// \todo Should not rely on such fixed convention
-    String currentDir = GetCurrentDir();
-    if (!DirExists(programDir_ + "CoreData") && !DirExists(programDir_ + "Data") &&
-        (DirExists(currentDir + "CoreData") || DirExists(currentDir + "Data")))
-        programDir_ = currentDir;
-
-#endif
-// ATOMIC END
     return GetCurrentDir();
 #endif
+
 }
 
 String FileSystem::GetUserDocumentsDir() const

Source/Atomic/Input/Input.cpp

@@ -784,10 +784,11 @@ void Input::SetMouseModeEmscriptenFinal(MouseMode mode, bool suppressEvent)
         {
             SetMouseVisibleEmscripten(true, suppressEvent);
         }
-
-        UI* const ui = GetSubsystem<UI>();
-        Cursor* const cursor = ui->GetCursor();
-        SetMouseGrabbed(!(mouseVisible_ || (cursor && cursor->IsVisible())), suppressEvent);
+//ATOMIC BEGIN
+//        UI* const ui = GetSubsystem<UI>();
+//        Cursor* const cursor = ui->GetCursor();
+//ATOMIC END
+        SetMouseGrabbed(!(mouseVisible_), suppressEvent);
     }
     else if (mode == MM_RELATIVE && emscriptenPointerLock_)
     {
@@ -817,10 +818,10 @@ void Input::SetMouseModeEmscripten(MouseMode mode, bool suppressEvent)
 
     const MouseMode previousMode = mouseMode_;
     mouseMode_ = mode;
-
-    UI* const ui = GetSubsystem<UI>();
-    Cursor* const cursor = ui->GetCursor();
-
+//ATOMIC BEGIN
+//    UI* const ui = GetSubsystem<UI>();
+//    Cursor* const cursor = ui->GetCursor();
+//ATOMIC END
     // Handle changing from previous mode
     if (previousMode == MM_RELATIVE)
         ResetMouseVisible();
@@ -830,7 +831,7 @@ void Input::SetMouseModeEmscripten(MouseMode mode, bool suppressEvent)
     {
         // Attempt to cancel pending pointer-lock requests
         emscriptenInput_->ExitPointerLock(suppressEvent);
-        SetMouseGrabbed(!(mouseVisible_ || (cursor && cursor->IsVisible())), suppressEvent);
+        SetMouseGrabbed(!(mouseVisible_), suppressEvent);
     }
     else if (mode == MM_ABSOLUTE)
     {
@@ -842,14 +843,14 @@ void Input::SetMouseModeEmscripten(MouseMode mode, bool suppressEvent)
             }
             else
             {
-                if (!cursor)
+                if (! mouseVisible_ )
                     SetMouseVisible(true, suppressEvent);
                 // Deferred mouse mode change to pointer-lock callback
                 mouseMode_ = previousMode;
                 emscriptenInput_->RequestPointerLock(MM_ABSOLUTE, suppressEvent);
             }
 
-            SetMouseGrabbed(!(mouseVisible_ || (cursor && cursor->IsVisible())), suppressEvent);
+            SetMouseGrabbed(!(mouseVisible_), suppressEvent);
         }
     }
     else if (mode == MM_RELATIVE)
@@ -857,7 +858,7 @@ void Input::SetMouseModeEmscripten(MouseMode mode, bool suppressEvent)
         if (emscriptenPointerLock_)
         {
             SetMouseVisibleEmscripten(false, true);
-            SetMouseGrabbed(!(cursor && cursor->IsVisible()), suppressEvent);
+            SetMouseGrabbed(!mouseVisible_, suppressEvent);
         }
         else
         {