v0.73.0

Author: caiiiycuk

package.json

@@ -1,6 +1,6 @@
 {
     "name": "emulators-ui",
-    "version": "0.72.9",
+    "version": "0.73.0",
     "description": "Emulators UI",
     "main": "dist/emulators-ui.js",
     "types": "dist/types/emulators-ui.d.ts",
@@ -45,14 +45,14 @@
         "@types/vinyl-source-stream": "0.0.30",
         "@typescript-eslint/eslint-plugin": "^4.33.0",
         "@typescript-eslint/parser": "^4.33.0",
-        "eslint-config-google": "^0.14.0",
         "babelify": "^10.0.0",
         "browserify": "^17.0.0",
         "core-js": "^3.19.1",
         "del": "^5.1.0",
         "element-resize-detector": "^1.2.1",
-        "emulators": "^0.72.0",
+        "emulators": "^0.73.0",
         "eslint": "^7.30.0",
+        "eslint-config-google": "^0.14.0",
         "git-repo-info": "^2.1.1",
         "gulp": "^4.0.2",
         "gulp-rename": "^2.0.0",

src/build.ts

@@ -4,7 +4,7 @@
 // gulpfile.ts/wasm.ts --> generateBuildInfo
 
 export const Build = {
-    short: "0.72.8",
-    version: "0.72.8 (c66a0cae039c95fbe9b493b296a2ca84)",
-    buildSeed: 1642744632714,
+    short: "0.72.9",
+    version: "0.72.9 (abdf90a98a4f9ed382c5b722a42cb87d)",
+    buildSeed: 1646465611403,
 };

src/graphics/_2d.ts

@@ -48,15 +48,25 @@ export function _2d(layers: Layers, ci: CommandInterface) {
         onResize();
     };
     ci.events().onFrameSize(onResizeFrame);
-    ci.events().onFrame((rgb) => {
-        let rgbOffset = 0;
+    ci.events().onFrame((frameRgb, frameRgba) => {
+        if (frameRgb === null && frameRgba === null) {
+            return;
+        }
+
+        const frame = (frameRgb !== null ? frameRgb : frameRgba) as Uint8Array;
+
+        let frameOffset = 0;
         let rgbaOffset = 0;
 
         while (rgbaOffset < rgba.length) {
-            rgba[rgbaOffset++] = rgb[rgbOffset++];
-            rgba[rgbaOffset++] = rgb[rgbOffset++];
-            rgba[rgbaOffset++] = rgb[rgbOffset++];
+            rgba[rgbaOffset++] = frame[frameOffset++];
+            rgba[rgbaOffset++] = frame[frameOffset++];
+            rgba[rgbaOffset++] = frame[frameOffset++];
             rgba[rgbaOffset++] = 255;
+
+            if (frame.length === rgba.length) {
+                frameOffset++;
+            }
         }
 
         context.putImageData(new ImageData(rgba, frameWidth, frameHeight), 0, 0);

src/graphics/webgl.ts

@@ -93,14 +93,29 @@ export function webGl(layers: Layers, ci: CommandInterface) {
         onResize();
     };
     ci.events().onFrameSize(onResizeFrame);
-    ci.events().onFrame((rgb) => {
-        gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGB,
-            frameWidth, frameHeight, 0, gl.RGB, gl.UNSIGNED_BYTE,
-            rgb);
-        gl.drawArrays(gl.TRIANGLES, 0, 6);
+    onResizeFrame(ci.width(), ci.height());
+
+    let requestAnimationFrameId: number | null = null;
+    let frame: Uint8Array | null = null;
+    let frameFormat: number = 0;
+
+    ci.events().onFrame((rgb, rgba) => {
+        frame = rgb != null ? rgb : rgba;
+        frameFormat = rgb != null ? gl.RGB : gl.RGBA;
+        if (requestAnimationFrameId === null) {
+            requestAnimationFrameId = requestAnimationFrame(updateTexture);
+        }
     });
 
-    onResizeFrame(ci.width(), ci.height());
+    const updateTexture = () => {
+        gl.texImage2D(gl.TEXTURE_2D, 0, frameFormat,
+            frameWidth, frameHeight, 0, frameFormat, gl.UNSIGNED_BYTE,
+            frame);
+        gl.drawArrays(gl.TRIANGLES, 0, 6);
+
+        requestAnimationFrameId = null;
+        frame = null;
+    };
 
     ci.events().onExit(() => {
         layers.removeOnResize(onResizeLayer);

src/sound/audio-node.ts

@@ -1,4 +1,4 @@
-import { CommandInterface } from "emulators";
+import { CommandInterface, DirectSound } from "emulators";
 
 class SamplesQueue {
     private samplesQueue: Float32Array[] = [];
@@ -81,7 +81,54 @@ export function audioNode(ci: CommandInterface) {
 
     const audioNode = audioContext.createScriptProcessor(bufferSize, 0, channels);
     let started = false;
-    audioNode.onaudioprocess = (event) => {
+
+    let active = 0;
+    const directSound = ci.directSound as DirectSound;
+    const onDirectProcess = (event: AudioProcessingEvent) => {
+        if (!started) {
+            const buffer = directSound.buffer[0];
+            started = Math.ceil(buffer[buffer.length - 1]) > 0;
+        }
+
+        if (!started) {
+            return;
+        }
+
+        let offset = 0;
+        let numFrames = event.outputBuffer.length;
+        const numChannels = event.outputBuffer.numberOfChannels;
+
+        let numSamples;
+        let buffer = directSound.buffer[active];
+        while (numFrames > 0 && (numSamples = Math.ceil(buffer[buffer.length - 1])) > 0) {
+            if (numFrames >= numSamples) {
+                const source = buffer.subarray(0, numSamples);
+                for (let channel = 0; channel < numChannels; ++channel) {
+                    const channelData = event.outputBuffer.getChannelData(channel);
+                    channelData.set(source, offset);
+                }
+
+                offset += numSamples;
+                numFrames -= numSamples;
+
+                buffer[buffer.length - 1] = 0;
+                active = (active + 1) % directSound.ringSize;
+                buffer = directSound.buffer[active];
+            } else {
+                const source = buffer.subarray(0, numFrames);
+                for (let channel = 0; channel < numChannels; ++channel) {
+                    const channelData = event.outputBuffer.getChannelData(channel);
+                    channelData.set(source, offset);
+                }
+
+                buffer[buffer.length - 1] = numSamples - numFrames;
+                buffer.set(buffer.subarray(numFrames, numFrames + buffer[buffer.length - 1]));
+                numFrames = 0;
+            }
+        }
+    };
+
+    const onQueueProcess = (event: AudioProcessingEvent) => {
         const numFrames = event.outputBuffer.length;
         const numChannels = event.outputBuffer.numberOfChannels;
         const samplesCount = samplesQueue.length();
@@ -100,6 +147,7 @@ export function audioNode(ci: CommandInterface) {
         }
     };
 
+    audioNode.onaudioprocess = ci.directSound !== undefined ? onDirectProcess : onQueueProcess;
     audioNode.connect(audioContext.destination);
 
     const resumeWebAudio = () => {

yarn.lock

@@ -2457,10 +2457,10 @@ emoji-regex@^8.0.0:
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
   integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
 
-emulators@^0.72.0:
-  version "0.72.0"
-  resolved "https://registry.yarnpkg.com/emulators/-/emulators-0.72.0.tgz#86f301421e0ca9aaa43a9e14d73e0ee61ebde35d"
-  integrity sha512-tTln9/LbHQqRD+0PPYapazZK8eqm0OhSRJ/zg7kXgugS/xVTMFnRX+Rc7RacRobFohecRLOufcV7HhpNPLHDbQ==
+emulators@^0.73.0:
+  version "0.73.0"
+  resolved "https://registry.yarnpkg.com/emulators/-/emulators-0.73.0.tgz#e3cef51700aaac1495a7656ab02009749c84bf17"
+  integrity sha512-gxUtw1KkgNZOXoPdt5dVDQZMakxC+iBZ2pgrGjZYa10kph08Yn4A7+6IdB69HNn2UxiPwr1JZ516viUIdCjGUw==
 
 end-of-stream@^1.0.0, end-of-stream@^1.1.0:
   version "1.4.4"