From 59447f0b620f492870d813bf6241610cf277d237 Mon Sep 17 00:00:00 2001 From: Jordan Date: Mon, 8 Apr 2024 01:02:58 -0400 Subject: [PATCH] merge: from origin main --- src/js/jagex2/graphics/Canvas.ts | 3 +-- src/js/jagex2/graphics/GLBuffer.ts | 14 +++++++------- src/js/jagex2/graphics/RenderMode.ts | 4 ++-- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/js/jagex2/graphics/Canvas.ts b/src/js/jagex2/graphics/Canvas.ts index b2e5b4c1..9db628f0 100644 --- a/src/js/jagex2/graphics/Canvas.ts +++ b/src/js/jagex2/graphics/Canvas.ts @@ -5,5 +5,4 @@ export const jpegCanvas: HTMLCanvasElement = document.createElement('canvas'); export const jpegImg: HTMLImageElement = document.createElement('img'); export const jpeg2d: CanvasRenderingContext2D = jpegCanvas.getContext('2d', {willReadFrequently: true})!; export const glCanvas: HTMLCanvasElement = document.createElement('canvas'); -export const gl: WebGL2RenderingContext = - canvas.getContext('webgl2',{willReadFrequently: true})! as WebGL2RenderingContext; +export const gl: WebGL2RenderingContext = canvas.getContext('webgl2', {willReadFrequently: true})! as WebGL2RenderingContext; diff --git a/src/js/jagex2/graphics/GLBuffer.ts b/src/js/jagex2/graphics/GLBuffer.ts index 0e0f54b8..d1f65378 100644 --- a/src/js/jagex2/graphics/GLBuffer.ts +++ b/src/js/jagex2/graphics/GLBuffer.ts @@ -1,8 +1,8 @@ export default class GLBuffer { - name: string; - glBufferId: WebGLBuffer = -1; - size: number = -1; - constructor(name: string) { - this.name = name; - } -} \ No newline at end of file + name: string; + glBufferId: WebGLBuffer = -1; + size: number = -1; + constructor(name: string) { + this.name = name; + } +} diff --git a/src/js/jagex2/graphics/RenderMode.ts b/src/js/jagex2/graphics/RenderMode.ts index cb948861..230762dd 100644 --- a/src/js/jagex2/graphics/RenderMode.ts +++ b/src/js/jagex2/graphics/RenderMode.ts @@ -1,5 +1,5 @@ export enum RenderMode { CPU = 0, CPU_WF = 1, // wireframe - GPU = 2, -} \ No newline at end of file + GPU = 2 +}