BuboBubo/topos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Hydra canvas order

Browse Source
This commit is contained in:
Raphaël Forment
2024-01-17 10:48:48 +01:00
parent 70b4ce714c
commit f451b81ea7
3 changed files with 55 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
index.html
View File

@@ -31,6 +31,18 @@
transition: background-color 0.05s ease-in-out; transition: background-color 0.05s ease-in-out;
} }
.hydracanvas {
position: fixed; /* ignore margins */
top: 0px;
left: 0px;
width: 100%; /* fill screen */
height: 100%;
background-size: cover;
overflow-y: hidden;
z-index: -5; /* place behind everything else */
display: block;
}
.fullscreencanvas { .fullscreencanvas {
position: fixed; /* ignore margins */ position: fixed; /* ignore margins */
top: 0px; top: 0px;
@@ -560,9 +572,9 @@
<!-- Here comes the editor itself --> <!-- Here comes the editor itself -->
<div id="editor" class="relative flex flex-row h-screen overflow-y-hidden"> <div id="editor" class="relative flex flex-row h-screen overflow-y-hidden">
<canvas id="scope" class="fullscreencanvas"></canvas> <canvas id="scope" class="fullscreencanvas"></canvas>
<canvas id="hydra-bg" class="fullscreencanvas"></canvas>
<canvas id="feedback" class="fullscreencanvas"></canvas> <canvas id="feedback" class="fullscreencanvas"></canvas>
<canvas id="drawings" class="fullscreencanvas"></canvas> <canvas id="drawings" class="fullscreencanvas"></canvas>
<canvas id="hydra-bg" class="hydracanvas"></canvas>
</div> </div>
<p id="error_line" class="hidden w-screen bg-background font-mono absolute bottom-0 pl-2 py-2">Hello kids</p> <p id="error_line" class="hidden w-screen bg-background font-mono absolute bottom-0 pl-2 py-2">Hello kids</p>
</div> </div>

1
src/extensions/NumberExtensions.ts
View File

@@ -4,6 +4,7 @@ import { Player } from "../classes/ZPlayer";
import { SoundEvent } from "../classes/SoundEvent"; import { SoundEvent } from "../classes/SoundEvent";
import { SkipEvent } from "../classes/SkipEvent"; import { SkipEvent } from "../classes/SkipEvent";
declare global { declare global {
interface Number { interface Number {
z(): Player; z(): Player;

3
src/main.ts
View File

@@ -578,12 +578,13 @@ export class Editor {
// @ts-ignore // @ts-ignore
this.hydra_backend = new Hydra({ this.hydra_backend = new Hydra({
canvas: this.interface.hydra_canvas as HTMLCanvasElement, canvas: this.interface.hydra_canvas as HTMLCanvasElement,
width: 1280,
height: 768,
detectAudio: false, detectAudio: false,
enableStreamCapture: false, enableStreamCapture: false,
}); });
this.hydra = this.hydra_backend.synth; this.hydra = this.hydra_backend.synth;
(globalThis as any).hydra = this.hydra; (globalThis as any).hydra = this.hydra;
this.hydra.setResolution(1024, 768);
} }
private setCanvas(canvas: HTMLCanvasElement): void { private setCanvas(canvas: HTMLCanvasElement): void {