@matboks/utilities 0.0.1 → 0.0.2

package/dist/shader-modules/modules/utils.js

@@ -1,115 +1,115 @@
-export const utilsDefinition = /*glsl*/ `
-
-import { EPS } from "@/constants";
-import { rotate } from "@/geometry";
-
-export {
-  aastep,
-  triangleWave,
-  lerp,
-  signed,
-  tile,
-  dot2,
-  smoothsteps,
-  triplanarTexture
-}
-
-float aastep(float threshold, float value) {
-  float d = length(vec2(dFdx(value), dFdy(value))) * 0.707;
-  return smoothstep(-d, d, value - threshold);
-}
-
-float triangleWave(float p) {
-  return 2.*abs(p - floor(p + .5));
-}
-
-float triangleWave(vec2 p) {
-  return triangleWave(p.x);
-}
-
-float triangleWave(vec2 p, float o) {
-  return triangleWave(rotate(p, o));
-}
-
-float lerp(float x, float a, float b) {
-  return clamp((x - a)/(b - a), 0.0, 1.0);
-}
-
-float signed(float t) {
-  return -1.0 + 2.0*t;
-}
-
-vec2 signed(vec2 t) {
-  return -1.0 + 2.0*t;
-}
-
-vec3 signed(vec3 t) {
-  return -1.0 + 2.0*t;
-}
-
-vec4 signed(vec4 t) {
-  return -1.0 + 2.0*t;
-}
-
-float tile(float p, float s) {
-  return mod(p, 2.0*s) - s;
-}
-
-vec2 tile(vec2 p, vec2 s) {
-  return mod(p, 2.0*s) - s;
-}
-
-vec2 tile(vec2 p, float s) {
-  return tile(p, vec2(s));
-}
-
-vec3 tile(vec3 p, vec3 s) {
-  return mod(p, 2.0*s) - s;
-}
-
-vec3 tile(vec3 p, float s) {
-  return tile(p, vec3(s));
-}
-
-vec4 tile(vec4 p, vec4 s) {
-  return mod(p, 2.0*s) - s;
-}
-
-vec4 tile(vec4 p, float s) {
-  return tile(p, vec4(s));
-}
-
-float dot2(vec2 v) {
-  return dot(v, v);
-}
-
-float dot2(vec3 v) {
-  return dot(v, v);
-}
-
-float dot2(vec4 v) {
-  return dot(v, v);
-}
-
-float smoothsteps(float t, int steps, float flatness) {
-  if (t < 0.0) return 0.0;
-  if (t > 1.0) return 1.0;
-
-  float sf = float(steps);
-  float value;
-  if (flatness == 1.0) {
-    value = floor(t*(sf + 1.0))/sf;
-  } else {
-    float l = 1.0/sf*(1.0 - flatness/(sf + 1.0));
-    value = (floor(t/l) + smoothstep(flatness, 1.0, fract(t/l)))/sf;
-  }
-  return clamp(value, 0.0, 1.0); 
-}
-
-float triplanarTexture(vec3 p, vec3 normal, float power, float texture(vec2)) {
-  vec3 w = pow(abs(normal), vec3(power));
-  vec3 v = vec3(texture(p.yz), texture(p.xz), texture(p.xy));
-  return dot(w, v) / dot(w, vec3(1));
-}
-
+export const utilsDefinition = /*glsl*/ `
+
+import { EPS } from "@/constants";
+import { rotate } from "@/geometry";
+
+export {
+  aastep,
+  triangleWave,
+  lerp,
+  signed,
+  tile,
+  dot2,
+  smoothsteps,
+  triplanarTexture
+}
+
+float aastep(float threshold, float value) {
+  float d = length(vec2(dFdx(value), dFdy(value))) * 0.707;
+  return smoothstep(-d, d, value - threshold);
+}
+
+float triangleWave(float p) {
+  return 2.*abs(p - floor(p + .5));
+}
+
+float triangleWave(vec2 p) {
+  return triangleWave(p.x);
+}
+
+float triangleWave(vec2 p, float o) {
+  return triangleWave(rotate(p, o));
+}
+
+float lerp(float x, float a, float b) {
+  return clamp((x - a)/(b - a), 0.0, 1.0);
+}
+
+float signed(float t) {
+  return -1.0 + 2.0*t;
+}
+
+vec2 signed(vec2 t) {
+  return -1.0 + 2.0*t;
+}
+
+vec3 signed(vec3 t) {
+  return -1.0 + 2.0*t;
+}
+
+vec4 signed(vec4 t) {
+  return -1.0 + 2.0*t;
+}
+
+float tile(float p, float s) {
+  return mod(p, 2.0*s) - s;
+}
+
+vec2 tile(vec2 p, vec2 s) {
+  return mod(p, 2.0*s) - s;
+}
+
+vec2 tile(vec2 p, float s) {
+  return tile(p, vec2(s));
+}
+
+vec3 tile(vec3 p, vec3 s) {
+  return mod(p, 2.0*s) - s;
+}
+
+vec3 tile(vec3 p, float s) {
+  return tile(p, vec3(s));
+}
+
+vec4 tile(vec4 p, vec4 s) {
+  return mod(p, 2.0*s) - s;
+}
+
+vec4 tile(vec4 p, float s) {
+  return tile(p, vec4(s));
+}
+
+float dot2(vec2 v) {
+  return dot(v, v);
+}
+
+float dot2(vec3 v) {
+  return dot(v, v);
+}
+
+float dot2(vec4 v) {
+  return dot(v, v);
+}
+
+float smoothsteps(float t, int steps, float flatness) {
+  if (t < 0.0) return 0.0;
+  if (t > 1.0) return 1.0;
+
+  float sf = float(steps);
+  float value;
+  if (flatness == 1.0) {
+    value = floor(t*(sf + 1.0))/sf;
+  } else {
+    float l = 1.0/sf*(1.0 - flatness/(sf + 1.0));
+    value = (floor(t/l) + smoothstep(flatness, 1.0, fract(t/l)))/sf;
+  }
+  return clamp(value, 0.0, 1.0); 
+}
+
+float triplanarTexture(vec3 p, vec3 normal, float power, float texture(vec2)) {
+  vec3 w = pow(abs(normal), vec3(power));
+  vec3 v = vec3(texture(p.yz), texture(p.xz), texture(p.xy));
+  return dot(w, v) / dot(w, vec3(1));
+}
+
 `;

package/dist/shader-modules/shaders.js

@@ -1,109 +1,109 @@
 import { glslRegistry } from "./registry.js";
-export const testFragmentShaderDefinition = glslRegistry.resolve(/*glsl*/ `
-#version 300 es
-
-import { meshSDF, sdfNormal, discoBall } from "glslkit/sdf";
-import { rayMarch, RayMarchResult as RMR, Ray } from "glslkit/ray-marching";
-import { orthographic } from "glslkit/camera";
-import { axisAngle, create2DBasisVectors, rotate } from "glslkit/geometry";
-import { PI } from "glslkit/constants";
-import { aastep, signed } from "glslkit/utils";
-import { perlinNoise, valueNoise } from "glslkit/noise";
-
-precision highp float;
-
-in vec2 uv;
-out vec4 color;
-
-struct Camera {
-  vec3 position;
-  vec3 lookAt;
-  float viewport;
-  float rotation;
-};
-
-uniform int u_id;
-uniform vec2 u_resolution;
-uniform float u_time;
-uniform sampler2D u_vertices;
-uniform int u_numVertices;
-uniform vec3 u_cameraPosition;
-uniform vec3 u_lookAt;
-uniform float u_viewport;
-uniform float u_rotation;
-uniform float u_values[10];
-
-void main() {
-  Camera;
-  float aspectRatio = u_resolution.x / u_resolution.y;
-  vec2 p = 2.0*vec2(aspectRatio, 1)*(uv - 0.5);
-  
-  Ray ray = orthographic({ 
-    uv, 
-    cameraPosition: u_cameraPosition,
-    lookAt: u_lookAt,
-    viewport: u_viewport,
-    aspectRatio,
-    rotation: u_rotation
-  });
-
-  // float sdf = (vec3 p) => length(p) - 0.5;
-
-  float sdf = (vec3 p) => {
-    // p += 0.01*signed(valueNoise(p, 100.0, 0.0));
-    // p = axisAngle(p, vec3(0, 1, 0), 0.);
-    float d0 = meshSDF(p, u_vertices, u_numVertices);
-    // float d0 = length(p) - 20.0;
-    // float d1 = length(p.xy) - 0.5;
-
-    // float d1 = min(min(length(p.xz), length(p.yz)), length(p.xy)) - 0.5;
-    float d1 = discoBall(p, vec3(0, 0, 1), 0.25, 8.0, 0.);
-    // float d1 = length(p - vec3(0, 0, 1)) - 1.;
-
-    float d = d0;
-    // d = max(d, -d1);
-    // d = min(d, d1);
-    // d = min(d, length(p) - 0.3);
-    // d = min(d, length(p.xy) - 0.25);
-    // d = d0;
-    return d;
-  };
-
-  RMR rmr = rayMarch(ray, sdf);
-
-  if (!rmr.hit) {
-    color = vec4(0, 0, 0, 0);
-    return;
-  }
-
-  vec3 position = rmr.position;
-
-  vec3 normal = sdfNormal(position + vec3(0, 0, 0.000), sdf, 0.0005);
-
-  mat2x3 basis2D = create2DBasisVectors(normal);
-  vec2 pn = position*basis2D;
-
-  vec3 lightDirection = normalize(vec3(1, -1, -1));
-  // vec3 lightDirection = ray.direction;
-  float light = clamp(-dot(normal, lightDirection), 0.0, 1.0);
-
-  // float value = smoothstep(0.45, 0.55, light);
-  float value;
-  
-  // value = light;
-  value = aastep(1.0 - (-0.1 + 1.2*light), 0.5 + 0.5*sin(20.0*2.*PI*pn.x));
-    // value = aastep(1.0 - light, perlinNoise(pn, 0.01, 0.0));
-  // if (p.y > 0.0) {
-  // } else {
-  // }
-
-  // vec3 c = vec3(value);
-  vec3 c = mix(vec3(0, 0, 0), vec3(1, 1, 1), value);
-
-  // c = texture(u_vertices, uv).rgb;
-
-  // color = vec4(1, 0, 0, 1);
-  color = vec4(c, 1);
-}
-
+export const testFragmentShaderDefinition = glslRegistry.resolve(/*glsl*/ `
+#version 300 es
+
+import { meshSDF, sdfNormal, discoBall } from "glslkit/sdf";
+import { rayMarch, RayMarchResult as RMR, Ray } from "glslkit/ray-marching";
+import { orthographic } from "glslkit/camera";
+import { axisAngle, create2DBasisVectors, rotate } from "glslkit/geometry";
+import { PI } from "glslkit/constants";
+import { aastep, signed } from "glslkit/utils";
+import { perlinNoise, valueNoise } from "glslkit/noise";
+
+precision highp float;
+
+in vec2 uv;
+out vec4 color;
+
+struct Camera {
+  vec3 position;
+  vec3 lookAt;
+  float viewport;
+  float rotation;
+};
+
+uniform int u_id;
+uniform vec2 u_resolution;
+uniform float u_time;
+uniform sampler2D u_vertices;
+uniform int u_numVertices;
+uniform vec3 u_cameraPosition;
+uniform vec3 u_lookAt;
+uniform float u_viewport;
+uniform float u_rotation;
+uniform float u_values[10];
+
+void main() {
+  Camera;
+  float aspectRatio = u_resolution.x / u_resolution.y;
+  vec2 p = 2.0*vec2(aspectRatio, 1)*(uv - 0.5);
+  
+  Ray ray = orthographic({ 
+    uv, 
+    cameraPosition: u_cameraPosition,
+    lookAt: u_lookAt,
+    viewport: u_viewport,
+    aspectRatio,
+    rotation: u_rotation
+  });
+
+  // float sdf = (vec3 p) => length(p) - 0.5;
+
+  float sdf = (vec3 p) => {
+    // p += 0.01*signed(valueNoise(p, 100.0, 0.0));
+    // p = axisAngle(p, vec3(0, 1, 0), 0.);
+    float d0 = meshSDF(p, u_vertices, u_numVertices);
+    // float d0 = length(p) - 20.0;
+    // float d1 = length(p.xy) - 0.5;
+
+    // float d1 = min(min(length(p.xz), length(p.yz)), length(p.xy)) - 0.5;
+    float d1 = discoBall(p, vec3(0, 0, 1), 0.25, 8.0, 0.);
+    // float d1 = length(p - vec3(0, 0, 1)) - 1.;
+
+    float d = d0;
+    // d = max(d, -d1);
+    // d = min(d, d1);
+    // d = min(d, length(p) - 0.3);
+    // d = min(d, length(p.xy) - 0.25);
+    // d = d0;
+    return d;
+  };
+
+  RMR rmr = rayMarch(ray, sdf);
+
+  if (!rmr.hit) {
+    color = vec4(0, 0, 0, 0);
+    return;
+  }
+
+  vec3 position = rmr.position;
+
+  vec3 normal = sdfNormal(position + vec3(0, 0, 0.000), sdf, 0.0005);
+
+  mat2x3 basis2D = create2DBasisVectors(normal);
+  vec2 pn = position*basis2D;
+
+  vec3 lightDirection = normalize(vec3(1, -1, -1));
+  // vec3 lightDirection = ray.direction;
+  float light = clamp(-dot(normal, lightDirection), 0.0, 1.0);
+
+  // float value = smoothstep(0.45, 0.55, light);
+  float value;
+  
+  // value = light;
+  value = aastep(1.0 - (-0.1 + 1.2*light), 0.5 + 0.5*sin(20.0*2.*PI*pn.x));
+    // value = aastep(1.0 - light, perlinNoise(pn, 0.01, 0.0));
+  // if (p.y > 0.0) {
+  // } else {
+  // }
+
+  // vec3 c = vec3(value);
+  vec3 c = mix(vec3(0, 0, 0), vec3(1, 1, 1), value);
+
+  // c = texture(u_vertices, uv).rgb;
+
+  // color = vec4(1, 0, 0, 1);
+  color = vec4(c, 1);
+}
+
 `.trim());

package/dist/shader-renderer/pixel-vertex-shader.js

@@ -1,14 +1,14 @@
-export const pixelVertexShader = /*glsl*/ `
-#version 300 es
-
-precision highp float;
-
-in vec2 p;
-out vec2 uv;
-
-void main() {
-  uv = p;
-  gl_Position = vec4(-1.0 + 2.0*p, 0, 1);
-}
-
+export const pixelVertexShader = /*glsl*/ `
+#version 300 es
+
+precision highp float;
+
+in vec2 p;
+out vec2 uv;
+
+void main() {
+  uv = p;
+  gl_Position = vec4(-1.0 + 2.0*p, 0, 1);
+}
+
 `.trim();

package/dist/tilings/tiler.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/tilings/tiler.js

@@ -0,0 +1,4 @@
+// abstract class Tiler {
+export {};
+//   abstract tileSingleShape(shape: )
+// } 

package/dist/types 2.js

@@ -0,0 +1 @@
+export {};

package/dist/types 3.js

@@ -0,0 +1 @@
+export {};

package/dist/types.d 2.ts

@@ -0,0 +1 @@
+export {};

package/dist/types.d 3.ts

@@ -0,0 +1 @@
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@matboks/utilities",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "main": "./dist/index.js",
   "files": [
     "dist"
@@ -12,7 +12,7 @@
   "dependencies": {
     "d3-delaunay": "^6.0.4",
     "earcut": "^3.0.2",
-    "glsl-modules": "^0.5.0",
+    "glsl-modules": "^0.7.0",
     "marching-squares": "^1.0.0",
     "polyclip-ts": "^0.16.8"
   },