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

Make lights more intuitive

Browse source
This commit is contained in:
schmelczerandras 2020-09-17 15:47:46 +02:00
parent 7bbb5f2d96
commit adbd933955
4 changed files with 24 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -8,16 +8,11 @@ export class CircleLight extends Drawable {
uniformName: 'circleLights',
uniformCountMacroName: 'CIRCLE_LIGHT_COUNT',
shaderCombinationSteps: [0, 1, 2, 4],
empty: new CircleLight(vec2.fromValues(0, 0), 0, vec3.fromValues(0, 0, 0), 0),
empty: new CircleLight(vec2.fromValues(0, 0), vec3.fromValues(0, 0, 0), 0),
};
}
constructor(
public center: vec2,
public lightDrop: number,
public color: vec3,
public lightness: number
) {
constructor(public center: vec2, public color: vec3, public intensity: number) {
super();
}
@ -28,16 +23,8 @@ export class CircleLight extends Drawable {
protected getObjectToSerialize(transform2d: mat2d, transform1d: number): any {
return {
center: vec2.transformMat2d(vec2.create(), this.center, transform2d),
lightDrop: this.lightDrop,
value: this.value,
color: this.color,
intensity: this.intensity,
};
}
public get value(): vec3 {
return vec3.scale(
vec3.create(),
vec3.normalize(this.color, this.color),
this.lightness
);
}
}

12
src/drawables/lights/flashlight.ts
View file

@ -11,7 +11,6 @@ export class Flashlight extends Drawable {
empty: new Flashlight(
vec2.fromValues(0, 0),
vec2.fromValues(0, 0),
0,
vec3.fromValues(0, 0, 0),
0
),
@ -21,9 +20,8 @@ export class Flashlight extends Drawable {
public constructor(
public center: vec2,
public direction: vec2,
public lightDrop: number,
public color: vec3,
public lightness: number
public intensity: number
) {
super();
}
@ -36,12 +34,8 @@ export class Flashlight extends Drawable {
return {
center: vec2.transformMat2d(vec2.create(), this.center, transform2d),
direction: this.direction,
lightDrop: this.lightDrop,
value: this.value,
intensity: this.intensity,
color: this.color,
};
}
public get value(): vec3 {
return vec3.scale(vec3.create(), this.color, this.lightness);
}
}