Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion Apps/Playground/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ set(BABYLON_SCRIPTS
"../node_modules/babylonjs-loaders/babylonjs.loaders.js"
"../node_modules/babylonjs/babylon.max.js"
"../node_modules/babylonjs-materials/babylonjs.materials.js"
"../node_modules/babylonjs-gui/babylon.gui.js")
"../node_modules/babylonjs-gui/babylon.gui.js"
"../node_modules/babylonjs-serializers/babylonjs.serializers.js")
# TODO: Update babylonjs-serializers package version after https://github.com/BabylonJS/Babylon.js/pull/17365 is in

set(DEPENDENCIES
"../Dependencies/ammo.js"
Expand Down Expand Up @@ -138,6 +140,8 @@ target_link_libraries(Playground
PRIVATE Window
PRIVATE XMLHttpRequest
PRIVATE TestUtils
PRIVATE NativeEncoding
PRIVATE Blob
${ADDITIONAL_LIBRARIES}
${BABYLON_NATIVE_PLAYGROUND_EXTENSION_LIBRARIES})

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions Apps/Playground/Scripts/config.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
{
"root": "https://cdn.babylonjs.com",
"tests": [
{
"title": "GLTF Serializer multimaterial with raw texture",
"playgroundId": "#KU72PX",
"referenceImage": "glTFSerializerMultimaterial.png"
},
{
"title": "Native Canvas",
"playgroundId": "#TKVFSA#2",
Expand Down
7 changes: 7 additions & 0 deletions Apps/Playground/Win32/App.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,13 @@
#include <Babylon/Plugins/NativeOptimizations.h>
#include <Babylon/Plugins/NativeCamera.h>
#include <Babylon/Plugins/NativeInput.h>
#include <Babylon/Plugins/NativeEncoding.h>
#include <Babylon/Plugins/TestUtils.h>
#include <Babylon/Polyfills/Console.h>
#include <Babylon/Polyfills/Window.h>
#include <Babylon/Polyfills/XMLHttpRequest.h>
#include <Babylon/Polyfills/Canvas.h>
#include <Babylon/Polyfills/Blob.h>
#include <Babylon/ShaderCache.h>
#include <Babylon/DebugTrace.h>

Expand Down Expand Up @@ -182,6 +184,8 @@ namespace

nativeCanvas.emplace(Babylon::Polyfills::Canvas::Initialize(env));

Babylon::Polyfills::Blob::Initialize(env);

Babylon::Plugins::NativeEngine::Initialize(env);

Babylon::Plugins::NativeOptimizations::Initialize(env);
Expand All @@ -192,6 +196,8 @@ namespace

nativeInput = &Babylon::Plugins::NativeInput::CreateForJavaScript(env);

Babylon::Plugins::NativeEncoding::Initialize(env);

Babylon::Plugins::TestUtils::Initialize(env, hWnd);
});

Expand All @@ -204,6 +210,7 @@ namespace
loader.LoadScript("app:///Scripts/babylonjs.materials.js");
loader.LoadScript("app:///Scripts/babylon.gui.js");
loader.LoadScript("app:///Scripts/meshwriter.min.js");
loader.LoadScript("app:///Scripts/babylonjs.serializers.js");

std::vector<std::string> scripts = GetCommandLineArguments();
if (scripts.empty())
Expand Down
23 changes: 17 additions & 6 deletions Apps/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Apps/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"babylonjs-gui": "^8.28.2",
"babylonjs-loaders": "^8.28.2",
"babylonjs-materials": "^8.28.2",
"babylonjs-serializers": "^8.28.2",
"jsc-android": "^241213.1.0",
"v8-android": "^7.8.2"
}
Expand Down
Loading