andras/sdf-2d
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix lights

Browse source
This commit is contained in:
schmelczerandras 2020-09-21 15:45:03 +02:00
parent 7250d164a8
commit 3725f56c78
6 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -1,6 +1,6 @@
{ {
"name": "sdf-2d", "name": "sdf-2d",
"version": "0.1.0-alpha", "version": "0.1.1-alpha",
"description": "Graphics framework for efficiently rendering 2D signed distance fields.", "description": "Graphics framework for efficiently rendering 2D signed distance fields.",
"keywords": [ "keywords": [
"webgl", "webgl",

2
src/drawables/lights/circle-light.ts
View file

@ -6,7 +6,7 @@ export class CircleLight extends LightDrawable {
public static readonly descriptor: DrawableDescriptor = { public static readonly descriptor: DrawableDescriptor = {
uniformName: 'circleLights', uniformName: 'circleLights',
uniformCountMacroName: 'CIRCLE_LIGHT_COUNT', uniformCountMacroName: 'CIRCLE_LIGHT_COUNT',
shaderCombinationSteps: [0, 1, 2, 4], shaderCombinationSteps: [0, 1, 2, 4, 8],
empty: new CircleLight(vec2.fromValues(0, 0), vec3.fromValues(0, 0, 0), 0), empty: new CircleLight(vec2.fromValues(0, 0), vec3.fromValues(0, 0, 0), 0),
}; };

2
src/drawables/lights/light-drawable.ts
View file

@ -20,7 +20,7 @@ export class LightDrawable extends Drawable {
return { return {
center: vec2.transformMat2d(vec2.create(), this.center, transform2d), center: vec2.transformMat2d(vec2.create(), this.center, transform2d),
color: this.color, color: this.color,
intensity: this.intensity * this.lightnessRatio, intensity: this.intensity * this.lightnessRatio * transform1d * 1500,
}; };
} }
} }

6
src/graphics/rendering/render-pass/lights-render-pass.ts
View file

@ -5,7 +5,7 @@ import { Insights } from '../insights';
import { RenderPass } from './render-pass'; import { RenderPass } from './render-pass';
export class LightsRenderPass extends RenderPass { export class LightsRenderPass extends RenderPass {
public lightPhaseOutLength = 400; public lightCutoffDistance = 400;
private drawables: Array<LightDrawable> = []; private drawables: Array<LightDrawable> = [];
public addDrawable(drawable: LightDrawable) { public addDrawable(drawable: LightDrawable) {
@ -33,9 +33,9 @@ export class LightsRenderPass extends RenderPass {
const distance = const distance =
vec2.length([Math.max(d.x, 0), Math.max(d.y, 0)]) + vec2.length([Math.max(d.x, 0), Math.max(d.y, 0)]) +
Math.min(Math.max(d.x, d.y), 0.0); Math.min(Math.max(d.x, d.y), 0.0);
l.setLightnessRatio(clamp01(1 - distance / this.lightPhaseOutLength)); l.setLightnessRatio(clamp01(1 - distance / this.lightCutoffDistance));
return distance < this.lightPhaseOutLength; return distance < this.lightCutoffDistance;
}); });
drawablesNearTile.forEach((p) => drawablesNearTile.forEach((p) =>

1
src/graphics/rendering/settings/runtime-settings.ts
View file

@ -5,5 +5,6 @@ export interface RuntimeSettings {
tileMultiplier: number; tileMultiplier: number;
isWorldInverted: boolean; isWorldInverted: boolean;
shadowLength: number; shadowLength: number;
lightCutoffDistance: number;
ambientLight: vec3; ambientLight: vec3;
} }

3
src/graphics/rendering/webgl2-renderer.ts
View file

@ -50,6 +50,9 @@ export class WebGl2Renderer implements Renderer {
ambientLight: (v) => { ambientLight: (v) => {
this.uniformsProvider.ambientLight = v; this.uniformsProvider.ambientLight = v;
}, },
lightCutoffDistance: (v) => {
this.lightsPass.lightCutoffDistance = v;
},
}; };
private static defaultStartupSettings: StartupSettings = { private static defaultStartupSettings: StartupSettings = {