andras/decla-red
andras/decla-red
Watch
1
0
Fork
You've already forked decla-red
 0
Code Issues Pull requests 8 Projects Releases Packages 1 Wiki Activity Actions

Render in NDC

Browse source
This commit is contained in:
schmelczerandras 2020-08-18 22:36:30 +02:00
commit 05682dd2d5
5 changed files with 106 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

1
frontend/src/scripts/drawing/drawables/drawable-blob.ts
View file

@ -9,6 +9,7 @@ export class DrawableBlob extends Blob implements IDrawable {
uniformName: 'blobs',
countMacroName: 'blobCount',
shaderCombinationSteps: settings.shaderCombinations.blobSteps,
empty: new DrawableBlob(vec2.fromValues(0, 0)),
};
public serializeToUniforms(uniforms: any, scale: number, transform: mat2d): void {

3
frontend/src/scripts/drawing/drawables/drawable-tunnel.ts
View file

@ -9,6 +9,7 @@ export class DrawableTunnel extends TunnelShape implements IDrawable {
uniformName: 'lines',
countMacroName: 'lineCount',
shaderCombinationSteps: settings.shaderCombinations.lineSteps,
empty: new DrawableTunnel(vec2.fromValues(0, 0), vec2.fromValues(0, 0), 0, 0),
};
public serializeToUniforms(uniforms: any, scale: number, transform: mat2d): void {
@ -19,7 +20,7 @@ export class DrawableTunnel extends TunnelShape implements IDrawable {
uniforms[uniformName].push({
from: vec2.transformMat2d(vec2.create(), this.from, transform),
toFromDelta: vec2.transformMat2d(vec2.create(), this.toFromDelta, transform),
toFromDelta: vec2.scale(vec2.create(), this.toFromDelta, scale),
fromRadius: this.fromRadius * scale,
toRadius: this.toRadius * scale,
});

3
frontend/src/scripts/drawing/drawables/i-drawable-descriptor.ts
View file

@ -1,5 +1,8 @@
import { IDrawable } from './i-drawable';
export interface IDrawableDescriptor {
uniformName: string;
countMacroName: string;
shaderCombinationSteps: Array<number>;
readonly empty: IDrawable;
}

3
frontend/src/scripts/drawing/drawables/lights/circle-light.ts
View file

@ -8,6 +8,7 @@ export class CircleLight implements ILight {
uniformName: 'circleLights',
countMacroName: 'circleLightCount',
shaderCombinationSteps: settings.shaderCombinations.circleLightSteps,
empty: new CircleLight(vec2.fromValues(0, 0), 0, vec3.fromValues(0, 0, 0), 0),
};
constructor(
@ -17,7 +18,7 @@ export class CircleLight implements ILight {
public lightness: number
) {}
public distance(target: vec2): number {
public distance(_: vec2): number {
return 0;
}

1
frontend/src/scripts/drawing/drawables/lights/point-light.ts
View file

@ -8,6 +8,7 @@ export class PointLight implements ILight {
uniformName: 'pointLights',
countMacroName: 'pointLightCount',
shaderCombinationSteps: settings.shaderCombinations.pointLightSteps,
empty: new PointLight(vec2.fromValues(0, 0), 0, vec3.fromValues(0, 0, 0), 0),
};
public constructor(