diff options
Diffstat (limited to 'src/renderer/runtime/view/renderer')
| -rw-r--r-- | src/renderer/runtime/view/renderer/renderer.ts | 14 | ||||
| -rw-r--r-- | src/renderer/runtime/view/renderer/shaders.ts | 12 |
2 files changed, 10 insertions, 16 deletions
diff --git a/src/renderer/runtime/view/renderer/renderer.ts b/src/renderer/runtime/view/renderer/renderer.ts index 90583a6..1e5b699 100644 --- a/src/renderer/runtime/view/renderer/renderer.ts +++ b/src/renderer/runtime/view/renderer/renderer.ts @@ -28,8 +28,7 @@ export class Renderer { public createBuffer(): WebGLBuffer { const ret = this.gl.createBuffer(); - if (!ret) - throw new Error('unable to create buffer'); + if (!ret) throw new Error('unable to create buffer'); return ret; } @@ -50,11 +49,11 @@ export class Renderer { return this.shaders.samplerLoc; } - public setCenter(v: vec2|number[]) { + public setCenter(v: vec2 | number[]): void { this.snapToGrid(this.center, v); } - public setTranslation(v: vec2|number[]) { + public setTranslation(v: vec2 | number[]): void { vec2.sub(this.translation, v, this.center); this.snapToGrid(this.translation, this.translation); this.gl.uniform2fv(this.shaders.translateLoc, this.translation); @@ -66,7 +65,7 @@ export class Renderer { this.setTranslation([0, 0]); } - public snapToGrid(out: vec2, a: vec2|number[]): void { + public snapToGrid(out: vec2, a: vec2 | number[]): void { vec2.scale(out, a, this.coordScale); vec2.round(out, out); vec2.scale(out, out, 1 / this.coordScale); @@ -84,14 +83,13 @@ export class Renderer { const scale = this.viewScale * this.coordScale; mat4.identity(this.viewport); - mat4.scale(this.viewport, this.viewport, [2 * scale / ws, -2 * scale / hs, 1.0]); + mat4.scale(this.viewport, this.viewport, [(2 * scale) / ws, (-2 * scale) / hs, 1.0]); this.gl.uniformMatrix4fv(this.shaders.viewportLoc, false, this.viewport); } private mkContext(): WebGLRenderingContext { const gl = this.canvas.getContext('webgl'); - if (!gl) - throw new Error('unable to initialize WebGL context'); + if (!gl) throw new Error('unable to initialize WebGL context'); return gl; } diff --git a/src/renderer/runtime/view/renderer/shaders.ts b/src/renderer/runtime/view/renderer/shaders.ts index 8fd1fda..c00568e 100644 --- a/src/renderer/runtime/view/renderer/shaders.ts +++ b/src/renderer/runtime/view/renderer/shaders.ts @@ -11,8 +11,7 @@ export class Shaders { constructor(private readonly gl: WebGLRenderingContext) { const shaderProgram = this.gl.createProgram(); - if (!shaderProgram) - throw new Error('Unable to create shader program'); + if (!shaderProgram) throw new Error('Unable to create shader program'); const vertexShader = this.compileShader(this.gl.VERTEX_SHADER, vertexShaderSrc); const fragmentShader = this.compileShader(this.gl.FRAGMENT_SHADER, fragmentShaderSrc); @@ -46,8 +45,7 @@ export class Shaders { private compileShader(type: number, src: string): WebGLShader { const shader = this.gl.createShader(type); - if (!shader) - throw new Error('Unable to create shader'); + if (!shader) throw new Error('Unable to create shader'); this.gl.shaderSource(shader, src); this.gl.compileShader(shader); @@ -63,16 +61,14 @@ export class Shaders { private getAttribLocation(program: WebGLProgram, name: string): number { const ret = this.gl.getAttribLocation(program, name); - if (ret < 0) - throw new Error("unable to get location of attribute '" + name + "'"); + if (ret < 0) throw new Error("unable to get location of attribute '" + name + "'"); return ret; } private getUniformLocation(program: WebGLProgram, name: string): WebGLUniformLocation { const ret = this.gl.getUniformLocation(program, name); - if (!ret) - throw new Error("unable to get location of uniform '" + name + "'"); + if (!ret) throw new Error("unable to get location of uniform '" + name + "'"); return ret; } |