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

Tidy up object count handling

Browse source
This commit is contained in:
schmelczerandras 2020-10-12 14:21:43 +02:00
parent 63a1772afa
commit c158f8655b
7 changed files with 30 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/graphics/graphics-library/program/uniform-array-autoscaling-program.ts
View file

@ -75,7 +75,8 @@ export class UniformArrayAutoScalingProgram implements IProgram {
return 0;
}
const uniformName = uniformNames[1];
return uniforms[uniformName] ? uniforms[uniformName].length : 0;
const scaler = d.objectCountScaler === undefined ? 1 : d.objectCountScaler;
return uniforms[uniformName] ? scaler * uniforms[uniformName].length : 0;
});
const closest = this.programs.find((p) => p.values.every((v, i) => v >= values[i]));
@ -91,7 +92,11 @@ export class UniformArrayAutoScalingProgram implements IProgram {
this.descriptors!.map((d, i) => {
const difference = closest.values[i] - values[i];
for (let i = 0; i < difference; i++) {
d.empty.serializeToUniforms(uniforms, mat2d.create(), 0);
d.empty.serializeToUniforms(
uniforms,
mat2d.fromTranslation(mat2d.create(), vec2.fromValues(-10000, -10000)),
0
);
}
});
}
@ -171,12 +176,12 @@ export class UniformArrayAutoScalingProgram implements IProgram {
}(position, objectColor);
color = mix(
objectColor / {paletteSize},
color,
objectColor / {paletteSize},
color,
${
descriptors[i].sdf?.isInverted
? `step(-distanceNdcPixelSize, -objectMinDistance)`
: `step(1.0 * distanceNdcPixelSize, objectMinDistance)`
: `step(distanceNdcPixelSize, objectMinDistance)`
}
);