Site changes [skip-ci]

Author: defold-services

_includes/examples/render/screen_to_world/bee_script.md

@@ -1,6 +1,3 @@
-local DISPLAY_WIDTH = sys.get_config_int("display.width")
-local DISPLAY_HEIGHT = sys.get_config_int("display.height")
-
 -- function to convert screen (mouse/touch) coordinates to
 -- world coordinates given a camera component
 -- this function will use the camera view and projection to
@@ -9,11 +6,13 @@ local function screen_to_world(x, y, z, camera_id)
 	local projection = camera.get_projection(camera_id)
 	local view = camera.get_view(camera_id)
 	local w, h = window.get_size()
+
 	-- The window.get_size() function will return the scaled window size,
 	-- ie taking into account display scaling (Retina screens on macOS for
 	-- instance). We need to adjust for display scaling in our calculation.
-	w = w / (w / DISPLAY_WIDTH)
-	h = h / (h / DISPLAY_HEIGHT)
+	local scale = window.get_display_scale()
+	w = w / scale
+	h = h / scale
 
 	-- https://defold.com/manuals/camera/#converting-mouse-to-world-coordinates
 	local inv = vmath.inv(projection * view)

examples/animation/basic_tween/Defoldexamples.wasm

@@ -1 +1 @@
-{"content":[{"name":"game.projectc","size":4103,"pieces":[{"name":"game0.projectc","offset":0}]},{"name":"game.arci","size":1408,"pieces":[{"name":"game0.arci","offset":0}]},{"name":"game.arcd","size":38692,"pieces":[{"name":"game0.arcd","offset":0}]},{"name":"game.dmanifest","size":1585,"pieces":[{"name":"game0.dmanifest","offset":0}]},{"name":"game.public.der","size":162,"pieces":[{"name":"game0.public.der","offset":0}]}],"total_size":45950}
+{"content":[{"name":"game.projectc","size":4138,"pieces":[{"name":"game0.projectc","offset":0}]},{"name":"game.arci","size":1408,"pieces":[{"name":"game0.arci","offset":0}]},{"name":"game.arcd","size":38692,"pieces":[{"name":"game0.arcd","offset":0}]},{"name":"game.dmanifest","size":1585,"pieces":[{"name":"game0.dmanifest","offset":0}]},{"name":"game.public.der","size":162,"pieces":[{"name":"game0.public.der","offset":0}]}],"total_size":45985}

examples/animation/basic_tween/Defoldexamples_asmjs.js

@@ -71,6 +71,7 @@ output_spirv = 0
 
 [sound]
 gain = 1
+use_linear_gain = 1
 max_sound_data = 128
 max_sound_buffers = 32
 max_sound_sources = 16
@@ -201,6 +202,7 @@ subpixels = 1
 
 [profiler]
 track_cpu = 0
+enabled = true
 sleep_between_server_updates = 0
 
 [liveupdate]

examples/animation/basic_tween/Defoldexamples_pthread.wasm

@@ -217,13 +217,17 @@ var FileLoader = {
 
 
 var EngineLoader = {
-    
-    
-    wasm_size: 3062145,
-    
-    wasmjs_size: 264303,
-    
-    asmjs_size: 6013906,
+    arc_sha1: "",
+    wasm_sha1: "",
+    wasm_size: 3077401,
+    wasmjs_sha1: "",
+    wasmjs_size: 273435,
+    wasm_pthread_sha1: "",
+    wasm_pthread_size: 3097270,
+    wasmjs_pthread_sha1: "",
+    wasmjs_pthread_size: 262080,
+    asmjs_sha1: "",
+    asmjs_size: 6043095,
     wasm_instantiate_progress: 0,
 
     stream_wasm: "false" === "true",
@@ -232,6 +236,42 @@ var EngineLoader = {
         EngineLoader.wasm_instantiate_progress = totalDownloadedSize * 0.1;
     },
 
+    getWasmSize: function() {
+        if (Module['isWASMPthreadSupported'])
+            return EngineLoader.wasm_pthread_size;
+        return EngineLoader.wasm_size;
+    },
+
+    getWasmJSSize: function() {
+        if (Module['isWASMPthreadSupported'])
+            return EngineLoader.wasmjs_pthread_size;
+        return EngineLoader.wasmjs_size;
+    },
+
+    getWasmSha1: function() {
+        if (Module['isWASMPthreadSupported'])
+            return EngineLoader.wasm_pthread_sha1;
+        return EngineLoader.wasm_sha1;
+    },
+
+    getWasmJSSha1: function() {
+        if (Module['isWASMPthreadSupported'])
+            return EngineLoader.wasmjs_pthread_sha1;
+        return EngineLoader.wasmjs_sha1;
+    },
+
+    getWasmName: function(exeName) {
+        if (Module['isWASMPthreadSupported'])
+            return exeName + '_pthread.wasm';
+        return exeName + '.wasm';
+    },
+
+    getWasmJSName: function(exeName) {
+        if (Module['isWASMPthreadSupported'])
+            return exeName + '_pthread_wasm.js';
+        return exeName + '_wasm.js';
+    },
+
     // load and instantiate .wasm file using XMLHttpRequest
     loadAndInstantiateWasmAsync: function(src, imports, successCallback) {
         FileLoader.load(src, "arraybuffer",
@@ -240,14 +280,14 @@ var EngineLoader = {
             },
             function(error) { throw error; },
             async function(wasm) {
-                if (wasm.byteLength != EngineLoader.wasm_size) {
-                   console.warn("Unexpected wasm size: " + wasm.byteLength + ", expected: " + EngineLoader.wasm_size);
+                if (wasm.byteLength != EngineLoader.getWasmSize()) {
+                   console.warn("Unexpected wasm size: " + wasm.byteLength + ", expected: " + EngineLoader.getWasmSize());
                 }
-                if (EngineLoader.wasm_sha1) {
+                if (EngineLoader.getWasmSha1()) {
                     const digest = await window.crypto.subtle.digest("SHA-1", wasm);
                     const sha1 = Array.from(new Uint8Array(digest)).map(b => b.toString(16).padStart(2, '0')).join('');
-                    if (sha1 != EngineLoader.wasm_sha1) {
-                        const error = new Error("Unexpected wasm sha1: " + sha1 + ", expected: " + EngineLoader.wasm_sha1);
+                    if (sha1 != EngineLoader.getWasmSha1()) {
+                        const error = new Error("Unexpected wasm sha1: " + sha1 + ", expected: " + EngineLoader.getWasmSha1());
                         if (typeof CUSTOM_PARAMETERS["start_error"] === "function") {
                            CUSTOM_PARAMETERS["start_error"](error);
                         }
@@ -256,7 +296,7 @@ var EngineLoader = {
                 }
                 var wasmInstantiate = WebAssembly.instantiate(new Uint8Array(wasm), imports).then(function(output) {
                     Module.instance = output.instance;
-                    successCallback(output.instance);
+                    successCallback(output.instance, output.module);
                 }).catch(function(e) {
                     console.log('wasm instantiation failed! ' + e);
                     if (typeof CUSTOM_PARAMETERS["start_error"] === "function") {
@@ -296,7 +336,7 @@ var EngineLoader = {
         WebAssembly.instantiateStreaming(fetchFn(src), imports).then(function(output) {
             ProgressUpdater.updateCurrent(EngineLoader.wasm_instantiate_progress);
             Module.instance = output.instance;
-            successCallback(output.instance);
+            successCallback(output.instance, output.module);
         }).catch(function(e) {
             console.log('wasm streaming instantiation failed! ' + e);
             console.log('Fallback to wasm loading');
@@ -321,14 +361,15 @@ var EngineLoader = {
                 callback(imports);
             }
             if (EngineLoader.stream_wasm && (typeof WebAssembly.instantiateStreaming === "function")) {
-                EngineLoader.streamAndInstantiateWasmAsync(exeName + ".wasm", imports, successCallback);
+                EngineLoader.streamAndInstantiateWasmAsync(EngineLoader.getWasmName(exeName), imports, successCallback);
             }
             else {
-                EngineLoader.loadAndInstantiateWasmAsync(exeName + ".wasm", imports, successCallback);
+                EngineLoader.loadAndInstantiateWasmAsync(EngineLoader.getWasmName(exeName), imports, successCallback);
             }
             return {}; // Compiling asynchronously, no exports.
         };
-        EngineLoader.loadAndRunScriptAsync(exeName + '_wasm.js', EngineLoader.wasmjs_size, EngineLoader.wasmjs_sha1);
+
+        EngineLoader.loadAndRunScriptAsync(EngineLoader.getWasmJSName(exeName), EngineLoader.getWasmJSSize(), EngineLoader.getWasmJSSha1());
     },
 
     loadAsmJsAsync: function(exeName) {
@@ -358,9 +399,12 @@ var EngineLoader = {
                         }
                     }
                 }
-           var tag = document.createElement("script");
-                tag.text = response;
-                document.body.appendChild(tag);
+                Module["mainScriptUrlOrBlob"] = src;
+
+                const script = document.createElement('script');
+                script.src = src;
+                script.type = "text/javascript";
+                document.body.appendChild(script);
             },
             function(loadedDelta, currentAttempt){
                 ProgressUpdater.updateCurrent(-loadedDelta);
@@ -515,7 +559,7 @@ var GameArchiveLoader = {
         var isWASMSupported = Module['isWASMSupported'];
         if (isWASMSupported) {
             EngineLoader.loadWasmAsync(exeName);
-            totalSize += EngineLoader.wasm_size + EngineLoader.wasmjs_size;
+            totalSize += EngineLoader.getWasmSize() + EngineLoader.getWasmJSSize();
         } else {
             EngineLoader.loadAsmJsAsync(exeName);
             totalSize += EngineLoader.asmjs_size;
@@ -841,8 +885,8 @@ var Progress = {
 /* ********************************************************************* */
 
 var Module = {
-    engineVersion: "1.10.1",
-    engineSdkSha1: "d8e6e73a8efac6b9a72783027867e547b6a363e4",
+    engineVersion: "1.10.2",
+    engineSdkSha1: "7a0e23b3fcab4c5db82f2b32f5d8ac5df9467c9d",
     noInitialRun: true,
 
     _filesToPreload: [],
@@ -1219,12 +1263,20 @@ Module['onRuntimeInitialized'] = function() {
     Module.runApp("canvas");
 };
 
+Module["isWASMPthreadSupported"] = true 
+    && ((typeof window === 'undefined') || window.isSecureContext && window.crossOriginIsolated)
+    && typeof SharedArrayBuffer !== 'undefined';
+
 Module["locateFile"] = function(path, scriptDirectory)
 {
     // dmengine*.wasm is hardcoded in the built JS loader for WASM,
     // we need to replace it here with the correct project name.
     if (path == "dmengine.wasm" || path == "dmengine_release.wasm" || path == "dmengine_headless.wasm") {
-        path = "Defoldexamples.wasm";
+        if (Module['isWASMPthreadSupported']) {
+            path = "Defoldexamples_pthread.wasm";
+        } else {
+            path = "Defoldexamples.wasm";
+        }
     }
     return scriptDirectory + path;
 };