caiiiycuk/js-dos#262

Author: caiiiycuk

package.json

@@ -1,6 +1,6 @@
 {
     "name": "emulators-ui",
-    "version": "0.73.7",
+    "version": "0.73.8",
     "description": "Emulators UI",
     "main": "dist/emulators-ui.js",
     "types": "dist/types/emulators-ui.d.ts",
@@ -66,5 +66,6 @@
         "typescript": "^4.7.4",
         "vinyl-buffer": "^1.0.1",
         "vinyl-source-stream": "^2.0.0"
-    }
+    },
+    "dependencies": {}
 }

src/build.ts

@@ -4,7 +4,7 @@
 // gulpfile.ts/wasm.ts --> generateBuildInfo
 
 export const Build = {
-    short: "0.73.6",
-    version: "0.73.6 (56358274d9c94c50e01e40c6e3b92c6e)",
-    buildSeed: 1658134329704,
+    short: "0.73.8",
+    version: "0.73.8 (3f45c09550da147bae83e339cc00d649)",
+    buildSeed: 1673509074063,
 };

src/graphics/_2d.ts

@@ -1,7 +1,7 @@
 import { Layers } from "../dom/layers";
 import { CommandInterface } from "emulators";
 
-export function _2d(layers: Layers, ci: CommandInterface) {
+export function _2d(layers: Layers, ci: CommandInterface, forceAspect?: number) {
     const canvas = layers.canvas;
     const context = canvas.getContext("2d");
     if (context === null) {
@@ -14,7 +14,7 @@ export function _2d(layers: Layers, ci: CommandInterface) {
     let frameHeight = 0;
 
     const onResize = () => {
-        const aspect = frameWidth / frameHeight;
+        const aspect = forceAspect ?? frameWidth / frameHeight;
 
         let width = containerWidth;
         let height = containerWidth / aspect;

src/graphics/webgl.ts

@@ -24,7 +24,7 @@ void main(void) {
 }
 `;
 
-export function webGl(layers: Layers, ci: CommandInterface) {
+export function webGl(layers: Layers, ci: CommandInterface, forceAspect?: number) {
     const canvas = layers.canvas;
     const gl = canvas.getContext("webgl");
     if (gl === null) {
@@ -60,7 +60,7 @@ export function webGl(layers: Layers, ci: CommandInterface) {
     let frameHeight = 0;
 
     const onResize = () => {
-        const aspect = frameWidth / frameHeight;
+        const aspect = forceAspect ?? (frameWidth / frameHeight);
 
         let width = containerWidth;
         let height = containerWidth / aspect;

src/js-dos.ts

@@ -16,6 +16,7 @@ declare const emulators: Emulators;
 export type EmulatorFunction = "dosboxWorker" | "dosboxDirect" | "dosboxNode" | "janus" | "backend";
 
 export interface DosOptions {
+    aspect?: number;
     noWebGL?: boolean;
     emulatorFunction?: EmulatorFunction;
     clickToStart?: boolean;
@@ -113,11 +114,11 @@ export class DosInstance {
                 if (this.options.noWebGL === true) {
                     throw new Error("WebGL is disabled by options");
                 }
-                emulatorsUi.graphics.webGl(this.layers, ci);
+                emulatorsUi.graphics.webGl(this.layers, ci, this.options.aspect);
             } catch (e) {
                 // eslint-disable-next-line
                 console.error("Unable to create webgl canvas, fallback to 2d rendering");
-                emulatorsUi.graphics._2d(this.layers, ci);
+                emulatorsUi.graphics._2d(this.layers, ci, this.options.aspect);
             }
             this.setVolumeImplFn = emulatorsUi.sound.audioNode(ci);
             this.setVolumeImplFn(this.volume);

yarn.lock

@@ -2085,15 +2085,10 @@ camelcase@^3.0.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"
   integrity sha1-MvxLn82vhF/N9+c7uXysImHwqwo=
 
-caniuse-lite@^1.0.30001317:
-  version "1.0.30001332"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001332.tgz#39476d3aa8d83ea76359c70302eafdd4a1d727dd"
-  integrity sha512-10T30NYOEQtN6C11YGg411yebhvpnC6Z102+B95eAsN0oB6KUs01ivE8u+G6FMIRtIrVlYXhL+LUwQ3/hXwDWw==
-
-caniuse-lite@^1.0.30001332:
-  version "1.0.30001346"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001346.tgz#e895551b46b9cc9cc9de852facd42f04839a8fbe"
-  integrity sha512-q6ibZUO2t88QCIPayP/euuDREq+aMAxFE5S70PkrLh0iTDj/zEhgvJRKC2+CvXY6EWc6oQwUR48lL5vCW6jiXQ==
+caniuse-lite@^1.0.30001317, caniuse-lite@^1.0.30001332:
+  version "1.0.30001443"
+  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001443.tgz"
+  integrity sha512-jUo8svymO8+Mkj3qbUbVjR8zv8LUGpGkUM/jKvc9SO2BvjCI980dp9fQbf/dyLs6RascPzgR4nhAKFA4OHeSaA==
 
 chalk@^2.0.0:
   version "2.4.2"