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

Fix bugs

Browse source
This commit is contained in:
schmelczerandras 2020-09-22 17:57:24 +02:00
parent 1d4980ae28
commit e8cd979f53
3 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/drawables/shapes/circle.ts
View file

@ -7,7 +7,7 @@ export class Circle extends Drawable {
sdf: { sdf: {
shader: ` shader: `
uniform vec2 circleCenters[CIRCLE_COUNT]; uniform vec2 circleCenters[CIRCLE_COUNT];
uniform vec2 circleRadii[CIRCLE_COUNT]; uniform float circleRadii[CIRCLE_COUNT];
void circleMinDistance(inout float minDistance, inout float color) { void circleMinDistance(inout float minDistance, inout float color) {
float myMinDistance = maxMinDistance; float myMinDistance = maxMinDistance;

2
src/graphics/graphics-library/program/fragment-shader-only-program.ts
View file

@ -7,8 +7,10 @@ export class FragmentShaderOnlyProgram extends Program {
private vertexArrayExtension: any; private vertexArrayExtension: any;
constructor(gl: UniversalRenderingContext) { constructor(gl: UniversalRenderingContext) {
super(gl); super(gl);
if (!gl.isWebGL2) {
this.vertexArrayExtension = enableExtension(this.gl, 'OES_vertex_array_object'); this.vertexArrayExtension = enableExtension(this.gl, 'OES_vertex_array_object');
} }
}
public async initialize( public async initialize(
sources: [string, string], sources: [string, string],

8
src/graphics/rendering/shaders/shading-fs.glsl
View file

@ -18,7 +18,7 @@ in vec2 uvCoordinates;
uniform vec3 ambientLight; uniform vec3 ambientLight;
vec3[colorCount] colors = vec3[]( vec3[{colorCount}] colors = vec3[](
{palette} {palette}
); );
@ -36,7 +36,7 @@ float shadowTransparency(float startingDistance, float lightCenterDistance, vec2
float rayLength = startingDistance; float rayLength = startingDistance;
for (int j = 0; j < SHADOW_TRACE_COUNT; j++) { for (int j = 0; j < SHADOW_TRACE_COUNT; j++) {
rayLength += getDistance(uvCoordinates + direction * rayLength); rayLength += max(0.0, getDistance(uvCoordinates + direction * rayLength));
} }
return min( return min(
@ -57,7 +57,7 @@ float shadowTransparency(float startingDistance, float lightCenterDistance, vec2
in vec2[CIRCLE_LIGHT_COUNT] circleLightDirections; in vec2[CIRCLE_LIGHT_COUNT] circleLightDirections;
vec3 colorInPosition(int lightIndex, out float lightCenterDistance) { vec3 colorInPosition(int lightIndex, out float lightCenterDistance) {
lightCenterDistance = distance(circleLightCenters[lightIndex], position); lightCenterDistance = max(0.0, distance(circleLightCenters[lightIndex], position));
return circleLightColors[lightIndex] / pow( return circleLightColors[lightIndex] / pow(
lightCenterDistance / circleLightIntensities[lightIndex] + 1.0, 2.0 lightCenterDistance / circleLightIntensities[lightIndex] + 1.0, 2.0
); );
@ -98,7 +98,7 @@ float shadowTransparency(float startingDistance, float lightCenterDistance, vec2
return intensityInDirection(flashlightDirections[lightIndex], positionDirection) * return intensityInDirection(flashlightDirections[lightIndex], positionDirection) *
flashlightColors[lightIndex] / pow( flashlightColors[lightIndex] / pow(
lightCenterDistance / (flashlightIntensities[lightIndex] * INTENSITY_INSIDE_RATIO) + 1.0, 2.0 lightCenterDistance / (flashlightIntensities[lightIndex] * INTENSITY_INSIDE_RATIO) + 1.0, 2.0
); ));
} }
#endif #endif
#endif #endif