Commit 8db9ca61 authored by Matus Talcik's avatar Matus Talcik
Browse files

better distance map

parent 052c99a1

libs/graphics/src/shaders/2d/distance_map.wgsl

+25 −17
Original line number Diff line number Diff line
@@ -161,34 +161,42 @@ fn main_fragment( 
) -> FragmentOutput {

    var finalColor: vec3<f32> = vec3<f32>(0.0, 0.0, 0.0);



    var newWeight = weight * 2.0;

    newWeight = log2(newWeight + 1.0);

    var newWeight = weight;

    // newWeight = log2(newWeight + 1.0);



    // finalColor = mix(vec3<f32>(1.0, 0.4509803921568627, 0.4509803921568627), vec3<f32>(0.01, 0.6117647058823529, 1.0), newWeight);



    // let colors = array<vec3<f32>, 4>(

    //     vec3<f32>(0.0),

    //     vec3<f32>(1.0, 0.0, 0.0),

    //     vec3<f32>(1.0, 1.0, 0.0),

    //     vec3<f32>(1.0),

    // );

    // if (newWeight < 0.33) {

    //     finalColor = mix(colors[0], colors[1], newWeight / 0.33);

    // } else if (newWeight < 0.66) {

    //     finalColor = mix(colors[1], colors[2], (newWeight - 0.33) / 0.33);

    // } else {

    //     finalColor = mix(colors[2], colors[3], (newWeight - 0.66) / 0.33);

    // }



    let colors = array<vec3<f32>, 4>(

        vec3<f32>(0.0),

        vec3<f32>(1.0, 0.0, 0.0),

        vec3<f32>(1.0, 1.0, 0.0),

        vec3<f32>(0.17254901960784313725490196078431, 0.10980392156862745098039215686275, 0.30980392156862745098039215686275),

        vec3<f32>(1.0),

        vec3<f32>(0.4078431372549019607843137254902, 0.4078431372549019607843137254902, 0.31372549019607843137254901960784),

        vec3<f32>(0.15294117647058823529411764705882, 0.15294117647058823529411764705882, 0.0078431372549019607843137254902),

    );

    if (newWeight < 0.33) {

        finalColor = mix(colors[0], colors[1], newWeight / 0.33);

    } else if (newWeight < 0.66) {

        finalColor = mix(colors[1], colors[2], (newWeight - 0.33) / 0.33);

    if (newWeight < 0.50) {

        finalColor = mix(colors[0], colors[1], newWeight / 0.50);

    } else if (newWeight < 0.75) {

        finalColor = mix(colors[1], colors[2], (newWeight - 0.50) / 0.25);

    } else {

        finalColor = mix(colors[2], colors[3], (newWeight - 0.66) / 0.33);

        finalColor = mix(colors[2], colors[3], (newWeight - 0.75) / 0.25);

    }



    if (all(rightColor == vec3<f32>(1.0)) || all(leftColor == vec3<f32>(1.0))) {

    return FragmentOutput(

            vec4<f32>(finalColor, 1.0)

        );

    } else {

        return FragmentOutput(

            vec4<f32>(leftColor, 1.0)

        );

    }



    // if (all(leftColor == rightColor) && all(rightColor != vec3<f32>(1.0))) { 

    //     return FragmentOutput(

libs/graphics/src/viewports/distance_viewport.ts

+6 −2
Original line number Diff line number Diff line
@@ -93,7 +93,9 @@ export class DistanceViewport { 


    private _camera: Ortho2DCamera;



    private globals: Globals;

    public positionsCPU: Array<vec4> = [];



    public globals: Globals;

    private globalsGPU: GPUBuffer;



    private positions: GPUBuffer | null = null;
@@ -206,7 +208,7 @@ export class DistanceViewport { 
            colorAttachments: [

                {

                    view: textureView,

                    clearValue: { r: 0.5, g: 0.5, b: 0.5, a: 1.0 },

                    clearValue: { r: 1.0, g: 1.0, b: 1.0, a: 1.0 },

                    loadOp: 'clear',

                    storeOp: 'store',

                },
@@ -523,6 +525,8 @@ export class DistanceViewport { 
            this.globals.maxDistances[currentLoD] = Math.sqrt(maximumDistance);

        }



        this.positionsCPU = newPositions;



        // Copy to GPU

        const bufferSizeF32 = 4 * newPositions.length;

        const bufferSizeBytes = 4 * bufferSizeF32;

package-lock.json

0 → 100644
+6 −0
Original line number Diff line number Diff line 
{

  "name": "chromoskein",

  "lockfileVersion": 2,

  "requires": true,

  "packages": {}

}