Merge remote-tracking branch 'origin/master' into async-fixes

Author: bghgary

.clang-format

@@ -1,21 +1,36 @@
-# https://releases.llvm.org/8.0.0/tools/clang/docs/ClangFormatStyleOptions.html
----
-BasedOnStyle: LLVM
 ---
 Language: Cpp
+# BasedOnStyle: LLVM
 
 AccessModifierOffset: -4
 AlignAfterOpenBracket: DontAlign
-AlignOperands: false
-AlwaysBreakTemplateDeclarations: true
-BreakBeforeBraces: Allman
+AlignEscapedNewlines: Left
+BraceWrapping:
+  AfterCaseLabel: true
+  AfterClass: true
+  AfterControlStatement: Always
+  AfterEnum: true
+  AfterFunction: true
+  AfterNamespace: true
+  AfterObjCDeclaration: true
+  AfterStruct: true
+  AfterUnion: true
+  AfterExternBlock: true
+  BeforeCatch: true
+  BeforeElse: true
+  BeforeWhile: true
+BreakBeforeBraces: Custom
 BreakConstructorInitializers: BeforeComma
+BreakStringLiterals: false
 ColumnLimit: 0
 FixNamespaceComments: false
 IndentCaseLabels: true
 IndentWidth: 4
+KeepEmptyLinesAtTheStartOfBlocks: false
 NamespaceIndentation: All
+ReflowComments: false
+PackConstructorInitializers: Never
 PointerAlignment: Left
-SortIncludes: false
+SortIncludes: Never
+SortUsingDeclarations: false
 SpaceAfterTemplateKeyword: false
----

.github/jobs/linux.yml

@@ -4,13 +4,13 @@ parameters:
   CC: ''
   CXX: ''
   JSEngine: ''
-  
+
 jobs:
   - job: ${{ parameters.name }}
     timeoutInMinutes: 30
     pool:
       vmImage: ${{ parameters.vmImage }}
-  
+
     variables:
       CC: ${{ parameters.CC }}
       CXX: ${{ parameters.CXX }}
@@ -32,13 +32,13 @@ jobs:
 
     - script: |
         sudo apt-get update
-        sudo apt-get install libjavascriptcoregtk-4.0-dev libgl1-mesa-dev libcurl4-openssl-dev ${{ parameters.CC }} libc++-9-dev libc++abi-9-dev libnode-dev
+        sudo apt-get install libjavascriptcoregtk-4.0-dev libgl1-mesa-dev libcurl4-openssl-dev
       displayName: 'Install packages'
 
     - script: |
         mkdir build
         cd build
-        cmake .. -GNinja -DJSCORE_LIBRARY=/usr/lib/x86_64-linux-gnu/libjavascriptcoregtk-4.0.so -DNAPI_JAVASCRIPT_ENGINE=${{ parameters.JSEngine }} -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBGFX_CONFIG_MEMORY_TRACKING=ON -DBGFX_CONFIG_DEBUG=ON -DCMAKE_UNITY_BUILD=${UNITY_BUILD}
+        cmake .. -GNinja -DJSCORE_LIBRARY=/usr/lib/x86_64-linux-gnu/libjavascriptcoregtk-4.0.so -DNAPI_JAVASCRIPT_ENGINE=${{ parameters.JSEngine }} -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBGFX_CONFIG_DEBUG=ON -DCMAKE_UNITY_BUILD=${UNITY_BUILD}
         ninja
       displayName: 'Build X11'
     

.github/jobs/win32.yml

@@ -43,7 +43,7 @@ jobs:
       - script: |
           mkdir build${{ variables.solutionName }}
           cd build${{ variables.solutionName }}
-          cmake -G "Visual Studio 16 2019" -A ${{ parameters.platform }} ${{ variables.jsEngineDefine }} -DBGFX_CONFIG_MEMORY_TRACKING=ON -DBGFX_CONFIG_DEBUG=ON -DGRAPHICS_API=${{ parameters.graphics_api }} -DCMAKE_UNITY_BUILD=${UNITY_BUILD} ..
+          cmake -G "Visual Studio 16 2019" -A ${{ parameters.platform }} ${{ variables.jsEngineDefine }} -DBGFX_CONFIG_DEBUG=ON -DGRAPHICS_API=${{ parameters.graphics_api }} -DCMAKE_UNITY_BUILD=${UNITY_BUILD} ..
         displayName: 'Generate ${{ variables.solutionName }} solution'
     
       - task: MSBuild@1

.github/workflows/nightly.yml

@@ -14,32 +14,18 @@ jobs:
       uses: actions/checkout@master
       with:
         submodules: 'recursive'
-    - name: Download babylon.max.js
-      run: curl.exe -o Apps/node_modules/babylonjs/babylon.max.js --create-dirs https://preview.babylonjs.com/babylon.max.js
-    - name: Download babylon.max.js.map
-      run: curl.exe -o Apps/node_modules/babylonjs/babylon.max.js.map --create-dirs https://preview.babylonjs.com/babylon.max.js.map
-    - name: Download babylonjs.materials.js
-      run: curl.exe -o Apps/node_modules/babylonjs-materials/babylonjs.materials.js --create-dirs https://preview.babylonjs.com/materialsLibrary/babylonjs.materials.js
-    - name: Download babylonjs.materials.js.map
-      run: curl.exe -o Apps/node_modules/babylonjs-materials/babylonjs.materials.js.map --create-dirs https://preview.babylonjs.com/materialsLibrary/babylonjs.materials.js.map
-    - name: Download babylon.loaders.js
-      run: curl.exe -o Apps/node_modules/babylonjs-loaders/babylonjs.loaders.js --create-dirs https://preview.babylonjs.com/loaders/babylonjs.loaders.js
-    - name: Download babylon.loaders.js.map
-      run: curl.exe -o Apps/node_modules/babylonjs-loaders/babylonjs.loaders.js.map --create-dirs https://preview.babylonjs.com/loaders/babylonjs.loaders.js.map
-    - name: Download babylon.gui.js
-      run: curl.exe -o Apps/node_modules/babylonjs-gui/babylon.gui.js --create-dirs https://preview.babylonjs.com/gui/babylon.gui.js
-    - name: Download babylon.gui.js.map
-      run: curl.exe -o Apps/node_modules/babylonjs-gui/babylon.gui.js.map --create-dirs https://preview.babylonjs.com/gui/babylon.gui.js.map
-    - name: Download chai.js
-      run: curl.exe -o Apps/node_modules/chai/chai.js --create-dirs https://unpkg.com/chai/chai.js
-    - name: Download mocha.js
-      run: curl.exe -o Apps/node_modules/mocha/mocha.js --create-dirs https://unpkg.com/mocha/mocha.js
+    - name: NPM Install
+      run: npm install
+      working-directory: ./Apps
+    - name: NPM download nightly
+      run: npm run getNightly
+      working-directory: ./Apps
     - name: View Apps\node_modules content
       run: Get-ChildItem -Path .\Apps\node_modules -Recurse
     - name: Make Solution
       run: mkdir buildWin32_x64 && 
         cd buildWin32_x64 &&
-        cmake -G "Visual Studio 16 2019" -A x64 -DBGFX_CONFIG_MEMORY_TRACKING=ON -DBGFX_CONFIG_DEBUG=ON ..
+        cmake -G "Visual Studio 16 2019" -A x64 -DBGFX_CONFIG_DEBUG=ON ..
     - name: Add msbuild to PATH
       uses: microsoft/[email protected]
     - name: Build Win32

Apps/Playground/Android/app/build.gradle

@@ -42,6 +42,11 @@ android {
         applicationId "com.android.babylonnative.playground"
         minSdkVersion "${platformVersion}"
         targetSdkVersion 28
+        ndkVersion "23.1.7779620"
+        if (project.hasProperty("NDK_VERSION")) {
+            def NDKVersion = project.property("NDK_VERSION")
+            ndkVersion  "${NDK_VERSION}"
+        }
         externalNativeBuild {
             cmake {
                 abiFilters "arm64-v8a", "armeabi-v7a", "x86", "x86_64"
@@ -61,10 +66,6 @@ android {
             } else {
                 abiFilters "arm64-v8a", "armeabi-v7a", "x86"
             }
-            if (project.hasProperty("NDK_VERSION")) {
-                def NDKVersion = project.property("NDK_VERSION")
-                ndkVersion  "${NDK_VERSION}"
-            }
         }
     }
 

Apps/Playground/Android/app/src/main/cpp/BabylonNativeJNI.cpp

@@ -119,7 +119,7 @@ extern "C"
 
                 g_nativeInput = &Babylon::Plugins::NativeInput::CreateForJavaScript(env);
 
-                Babylon::Plugins::Camera::Initialize(env);
+                Babylon::Plugins::NativeCamera::Initialize(env);
                 Babylon::Polyfills::Window::Initialize(env);
 
                 Babylon::Polyfills::XMLHttpRequest::Initialize(env);

Apps/Playground/Android/build.gradle

@@ -4,6 +4,7 @@ buildscript {
 
     repositories {
         google()
+        mavenCentral()
         jcenter()
     }
     dependencies {
@@ -17,6 +18,7 @@ buildscript {
 allprojects {
     repositories {
         google()
+        mavenCentral()
         jcenter()
     }
 }

Apps/Playground/UWP/App.cpp

@@ -10,11 +10,25 @@
 #include <Babylon/Polyfills/XMLHttpRequest.h>
 #include <Babylon/Polyfills/Canvas.h>
 
-#include <pplawait.h>
-#include <winrt/Windows.ApplicationModel.h>
-
 #include <winrt/windows.ui.core.h>
 
+namespace
+{
+    template <typename T>
+    T from_cx(Platform::Object^ from)
+    {
+        T to{ nullptr };
+
+        if (from != nullptr)
+        {
+            winrt::check_hresult(reinterpret_cast<::IUnknown*>(from)
+                ->QueryInterface(winrt::guid_of<T>(), winrt::put_abi(to)));
+        }
+
+        return to;
+    }
+}
+
 using namespace Windows::ApplicationModel;
 using namespace Windows::ApplicationModel::Core;
 using namespace Windows::ApplicationModel::Activation;
@@ -348,7 +362,7 @@ void App::RestartRuntime(Windows::Foundation::Rect bounds)
     m_displayScale = static_cast<float>(displayInformation->RawPixelsPerViewPixel);
     size_t width = static_cast<size_t>(bounds.Width * m_displayScale);
     size_t height = static_cast<size_t>(bounds.Height * m_displayScale);
-    auto* window = reinterpret_cast<winrt::Windows::UI::Core::ICoreWindow*>(CoreWindow::GetForCurrentThread());
+    auto window = from_cx<winrt::Windows::Foundation::IInspectable>(CoreWindow::GetForCurrentThread());
 
     Babylon::Graphics::WindowConfiguration graphicsConfig{};
     graphicsConfig.Window = window;

Apps/Playground/Win32/App.cpp

@@ -142,7 +142,7 @@ namespace
             Babylon::Plugins::NativeCapture::Initialize(env);
 
             // Initialize Camera 
-            Babylon::Plugins::Camera::Initialize(env);
+            Babylon::Plugins::NativeCamera::Initialize(env);
 
             // Initialize NativeXr plugin.
             Babylon::Plugins::NativeXr::Initialize(env);

Apps/Playground/iOS/LibNativeBridge.mm

@@ -76,7 +76,7 @@ - (void)init:(MTKView*)view width:(int)inWidth height:(int)inHeight xrView:(void
         g_nativeXr->SetSessionStateChangedCallback([](bool isXrActive){ g_isXrActive = isXrActive; });
 
         // Initialize Camera 
-        Babylon::Plugins::Camera::Initialize(env);
+        Babylon::Plugins::NativeCamera::Initialize(env);
 
         nativeInput = &Babylon::Plugins::NativeInput::CreateForJavaScript(env);
     });