kmcom-nuxt-layers 2.2.5 → 2.2.8

package/layers/shader/app/components/Pipeline/SkyAtmosphere.client.vue

@@ -2,6 +2,8 @@
   import { Color, Vector3 } from 'three'
   import { clamp, dot, float, mix, pow, uniform, vec4 } from 'three/tsl'
 
+  import { hexToVec3Uniform } from '../../utils/tsl/color'
+
   const {
     zenith = '#1a3a8a',
     horizon = '#7ab0d8',
@@ -26,15 +28,10 @@
     order?: number
   }>()
 
-  function toVec3Node(hex: string) {
-    const c = new Color(hex)
-    return uniform(new Vector3(c.r, c.g, c.b))
-  }
-
-  const zenithNode = toVec3Node(zenith)
-  const horizonNode = toVec3Node(horizon)
-  const groundNode = toVec3Node(ground)
-  const sunColorNode = toVec3Node(sunColor)
+  const zenithNode = hexToVec3Uniform(zenith)
+  const horizonNode = hexToVec3Uniform(horizon)
+  const groundNode = hexToVec3Uniform(ground)
+  const sunColorNode = hexToVec3Uniform(sunColor)
   const sunPowerNode = uniform(sunPower)
 
   const sunDir = new Vector3(...sunDirection).normalize()

package/layers/shader/app/components/Pipeline/SoftLightBlend.client.vue

@@ -1,9 +1,5 @@
 <script setup lang="ts">
-  import { Color } from 'three'
-  import { mix, uniform, vec4 } from 'three/tsl'
-
   import { blendSoftLight } from '../../shaders/common/blend'
-  import type { TSLNode } from '../../shaders/types'
 
   const {
     color = '#808080',
@@ -15,23 +11,10 @@
     order?: number
   }>()
 
-  const colorNode: TSLNode = uniform(new Color(color))
-  const opacityNode = uniform(opacity)
-  watch(
+  useShaderMixBlend(
+    blendSoftLight,
     () => color,
-    (v) => {
-      colorNode.value.set(v)
-    }
-  )
-  watch(
     () => opacity,
-    (v) => {
-      opacityNode.value = v
-    }
-  )
-
-  useShaderStage(
-    (prev) => vec4(mix(prev.xyz, blendSoftLight(prev.xyz, colorNode), opacityNode), prev.w),
     order
   )
 </script>

package/layers/shader/app/components/Pipeline/SplitTone.client.vue

@@ -1,8 +1,9 @@
 <script setup lang="ts">
-  import { Color, Vector3 } from 'three'
+  import { Color } from 'three'
   import { float, smoothstep, uniform, vec4 } from 'three/tsl'
 
   import { luminance } from '../../shaders/common/blend'
+  import { hexToVec3Uniform } from '../../utils/tsl/color'
 
   const {
     shadowColor = '#1a2a5a',
@@ -22,13 +23,8 @@
     order?: number
   }>()
 
-  function toVec3Node(hex: string) {
-    const c = new Color(hex)
-    return uniform(new Vector3(c.r, c.g, c.b))
-  }
-
-  const shadowNode = toVec3Node(shadowColor)
-  const highlightNode = toVec3Node(highlightColor)
+  const shadowNode = hexToVec3Uniform(shadowColor)
+  const highlightNode = hexToVec3Uniform(highlightColor)
   const balanceNode = uniform(balance)
   const opacityNode = uniform(opacity)
   watch(

package/layers/shader/app/components/Pipeline/Star.client.vue

@@ -1,8 +1,9 @@
 <script setup lang="ts">
-  import { Color, Vector3 } from 'three'
+  import { Color } from 'three'
   import { float, mix, uniform, vec4 } from 'three/tsl'
 
   import { star } from '../../shaders/common/shapes'
+  import { hexToVec3Uniform } from '../../utils/tsl/color'
 
   const {
     colorA = '#000000',
@@ -24,13 +25,8 @@
     order?: number
   }>()
 
-  function toVec3Node(hex: string) {
-    const c = new Color(hex)
-    return uniform(new Vector3(c.r, c.g, c.b))
-  }
-
-  const colorANode = toVec3Node(colorA)
-  const colorBNode = toVec3Node(colorB)
+  const colorANode = hexToVec3Uniform(colorA)
+  const colorBNode = hexToVec3Uniform(colorB)
   const radiusNode = uniform(radius)
   const innerNode = uniform(innerRatio)
   const softnessNode = uniform(softness)

package/layers/shader/app/components/Pipeline/Stripes.client.vue

@@ -1,8 +1,9 @@
 <script setup lang="ts">
-  import { Color, Vector3 } from 'three'
+  import { Color } from 'three'
   import { float, mix, uniform, vec4 } from 'three/tsl'
 
   import { stripes } from '../../shaders/common/shapes'
+  import { hexToVec3Uniform } from '../../utils/tsl/color'
 
   const {
     colorA = '#000000',
@@ -22,13 +23,8 @@
     order?: number
   }>()
 
-  function toVec3Node(hex: string) {
-    const c = new Color(hex)
-    return uniform(new Vector3(c.r, c.g, c.b))
-  }
-
-  const colorANode = toVec3Node(colorA)
-  const colorBNode = toVec3Node(colorB)
+  const colorANode = hexToVec3Uniform(colorA)
+  const colorBNode = hexToVec3Uniform(colorB)
   const freqNode = uniform(frequency)
   const thickNode = uniform(thickness)
   const angleNode = uniform((angle * Math.PI) / 180)

package/layers/shader/app/components/Pipeline/Tint.client.vue

@@ -1,7 +1,9 @@
 <script setup lang="ts">
-  import { Color, Vector3 } from 'three'
+  import { Color } from 'three'
   import { uniform, vec4 } from 'three/tsl'
 
+  import { hexToVec3Uniform } from '../../utils/tsl/color'
+
   const {
     color = '#ff8844',
     opacity = 1,
@@ -14,12 +16,7 @@
     order?: number
   }>()
 
-  function toVec3Node(hex: string) {
-    const c = new Color(hex)
-    return uniform(new Vector3(c.r, c.g, c.b))
-  }
-
-  const colorNode = toVec3Node(color)
+  const colorNode = hexToVec3Uniform(color)
   const opacityNode = uniform(opacity)
   watch(
     () => color,

package/layers/shader/app/components/Pipeline/Triangle.client.vue

@@ -1,8 +1,9 @@
 <script setup lang="ts">
-  import { Color, Vector3 } from 'three'
+  import { Color } from 'three'
   import { float, mix, smoothstep, uniform, vec4 } from 'three/tsl'
 
   import { sdEquilateralTriangle } from '../../shaders/common/sdf'
+  import { hexToVec3Uniform } from '../../utils/tsl/color'
 
   const {
     colorA = '#000000',
@@ -18,13 +19,8 @@
     order?: number
   }>()
 
-  function toVec3Node(hex: string) {
-    const c = new Color(hex)
-    return uniform(new Vector3(c.r, c.g, c.b))
-  }
-
-  const colorANode = toVec3Node(colorA)
-  const colorBNode = toVec3Node(colorB)
+  const colorANode = hexToVec3Uniform(colorA)
+  const colorBNode = hexToVec3Uniform(colorB)
   const sizeNode = uniform(size)
   const softnessNode = uniform(softness)
   watch(

package/layers/shader/app/components/Pipeline/ValueNoise.client.vue

@@ -1,8 +1,9 @@
 <script setup lang="ts">
-  import { Color, Vector3 } from 'three'
+  import { Color } from 'three'
   import { float, mix, time, uniform, vec4 } from 'three/tsl'
 
   import { valueNoise2D } from '../../shaders/common/noise'
+  import { hexToVec3Uniform } from '../../utils/tsl/color'
 
   const {
     colorA = '#000000',
@@ -18,13 +19,8 @@
     order?: number
   }>()
 
-  function toVec3Node(hex: string) {
-    const c = new Color(hex)
-    return uniform(new Vector3(c.r, c.g, c.b))
-  }
-
-  const colorANode = toVec3Node(colorA)
-  const colorBNode = toVec3Node(colorB)
+  const colorANode = hexToVec3Uniform(colorA)
+  const colorBNode = hexToVec3Uniform(colorB)
   const scaleNode = uniform(scale)
   const speedNode = uniform(speed)
   watch(

package/layers/shader/app/components/Pipeline/VoronoiEdges.client.vue

@@ -1,8 +1,9 @@
 <script setup lang="ts">
-  import { Color, Vector3 } from 'three'
+  import { Color } from 'three'
   import { float, mix, smoothstep, time, uniform, vec4 } from 'three/tsl'
 
   import { voronoi2D } from '../../shaders/common/noise'
+  import { hexToVec3Uniform } from '../../utils/tsl/color'
 
   /** Voronoi cell edge lines only — the cell boundaries as thin lines. */
   const {
@@ -24,13 +25,8 @@
     order?: number
   }>()
 
-  function toVec3Node(hex: string) {
-    const c = new Color(hex)
-    return uniform(new Vector3(c.r, c.g, c.b))
-  }
-
-  const colorANode = toVec3Node(colorA)
-  const colorBNode = toVec3Node(colorB)
+  const colorANode = hexToVec3Uniform(colorA)
+  const colorBNode = hexToVec3Uniform(colorB)
   const scaleNode = uniform(scale)
   const edgeNode = uniform(edgeWidth)
   const speedNode = uniform(speed)

package/layers/shader/app/components/Pipeline/Water.client.vue

@@ -1,7 +1,9 @@
 <script setup lang="ts">
-  import { Color, Vector3 } from 'three'
+  import { Color } from 'three'
   import { float, mix, sin, time, uniform, vec4 } from 'three/tsl'
 
+  import { hexToVec3Uniform } from '../../utils/tsl/color'
+
   const {
     colorDeep = '#003366',
     colorShallow = '#66ccff',
@@ -23,13 +25,8 @@
     order?: number
   }>()
 
-  function toVec3Node(hex: string) {
-    const c = new Color(hex)
-    return uniform(new Vector3(c.r, c.g, c.b))
-  }
-
-  const colorDeepNode = toVec3Node(colorDeep)
-  const colorShallowNode = toVec3Node(colorShallow)
+  const colorDeepNode = hexToVec3Uniform(colorDeep)
+  const colorShallowNode = hexToVec3Uniform(colorShallow)
   const freqNode = uniform(frequency)
   const ampNode = uniform(amplitude)
   const speedNode = uniform(speed)

package/layers/shader/app/components/Pipeline/WaveBendLayer.client.vue

@@ -1,7 +1,9 @@
 <script setup lang="ts">
-  import { Color, Vector3 } from 'three'
+  import { Color } from 'three'
   import { mix, sin, time, uniform, vec2, vec4 } from 'three/tsl'
 
+  import { hexToVec3Uniform } from '../../utils/tsl/color'
+
   const {
     color = '#4488ff',
     opacity = 0.8,
@@ -18,12 +20,7 @@
     order?: number
   }>()
 
-  function toVec3Node(hex: string) {
-    const c = new Color(hex)
-    return uniform(new Vector3(c.r, c.g, c.b))
-  }
-
-  const colorNode = toVec3Node(color)
+  const colorNode = hexToVec3Uniform(color)
   const opacityNode = uniform(opacity)
   const freqNode = uniform(frequency)
   const speedNode = uniform(speed)

package/layers/shader/app/components/Pipeline/WaveColourLayer.client.vue

@@ -1,8 +1,9 @@
 <script setup lang="ts">
-  import { Color, Vector3 } from 'three'
+  import { Color } from 'three'
   import { mix, smoothstep, time, uniform, vec4 } from 'three/tsl'
 
   import { simplexNoise2D } from '../../shaders/common/noise'
+  import { hexToVec3Uniform } from '../../utils/tsl/color'
 
   const {
     color = '#ffffff',
@@ -28,12 +29,7 @@
     order?: number
   }>()
 
-  function toVec3Node(hex: string) {
-    const c = new Color(hex)
-    return uniform(new Vector3(c.r, c.g, c.b))
-  }
-
-  const colorNode = toVec3Node(color)
+  const colorNode = hexToVec3Uniform(color)
   const opacityNode = uniform(opacity)
   const scaleNode = uniform(scale)
   const edge0Node = uniform(edge0)

package/layers/shader/app/components/Pipeline/Wood.client.vue

@@ -1,8 +1,9 @@
 <script setup lang="ts">
-  import { Color, Vector3 } from 'three'
+  import { Color } from 'three'
   import { float, mix, sin, time, uniform, vec4 } from 'three/tsl'
 
   import { fbm2D } from '../../shaders/common/noise'
+  import { hexToVec3Uniform } from '../../utils/tsl/color'
 
   const {
     colorA = '#8b5e3c',
@@ -26,13 +27,8 @@
     order?: number
   }>()
 
-  function toVec3Node(hex: string) {
-    const c = new Color(hex)
-    return uniform(new Vector3(c.r, c.g, c.b))
-  }
-
-  const colorANode = toVec3Node(colorA)
-  const colorBNode = toVec3Node(colorB)
+  const colorANode = hexToVec3Uniform(colorA)
+  const colorBNode = hexToVec3Uniform(colorB)
   const ringFreqNode = uniform(ringFrequency)
   const noiseScaleNode = uniform(noiseScale)
   const noiseStrNode = uniform(noiseStrength)

package/layers/shader/app/components/Preset/Aurora.client.vue

@@ -3,30 +3,24 @@
     createAmbientUniforms,
     createAuroraColorNode,
   } from '#layers/shader/app/composables/useAmbientMaterials'
+  import type { TSLNode } from '#layers/shader/app/types/tsl'
 
-  const props = withDefaults(
-    defineProps<{
-      speed?: number
-      intensity?: number
-      mouseInteraction?: boolean
-    }>(),
-    {
-      speed: 1.0,
-      intensity: 1.0,
-      mouseInteraction: true,
-    }
-  )
+  const {
+    speed = 1.0,
+    intensity = 1.0,
+    mouseInteraction = true,
+  } = defineProps<{
+    speed?: number
+    intensity?: number
+    mouseInteraction?: boolean
+  }>()
 
   const emit = defineEmits<{
-    node: [colorNode: any]
+    node: [colorNode: TSLNode]
   }>()
 
   // Create uniforms once
-  const uniforms = createAmbientUniforms({
-    speed: props.speed,
-    intensity: props.intensity,
-    mouseInteraction: props.mouseInteraction,
-  })
+  const uniforms = createAmbientUniforms({ speed, intensity, mouseInteraction })
 
   // Build the TSL color node (references uniforms by pointer)
   const colorNode = createAuroraColorNode(uniforms)
@@ -48,19 +42,19 @@
 
   // Watch props to update uniforms (no recompilation)
   watch(
-    () => props.speed,
+    () => speed,
     (v) => {
       uniforms.speed.value = v
     }
   )
   watch(
-    () => props.intensity,
+    () => intensity,
     (v) => {
       uniforms.intensity.value = v
     }
   )
   watch(
-    () => props.mouseInteraction,
+    () => mouseInteraction,
     (v) => {
       uniforms.mouseStrength.value = v ? 0.5 : 0
     }

package/layers/shader/app/components/Preset/Flow.client.vue

@@ -3,6 +3,7 @@
     createAmbientUniforms,
     createFlowColorNode,
   } from '#layers/shader/app/composables/useAmbientMaterials'
+  import type { TSLNode } from '#layers/shader/app/types/tsl'
 
   const {
     speed = 1.0,
@@ -15,7 +16,7 @@
   }>()
 
   const emit = defineEmits<{
-    node: [colorNode: any]
+    node: [colorNode: TSLNode]
   }>()
 
   const uniforms = createAmbientUniforms({

package/layers/shader/app/components/Preset/GradientMesh.client.vue

@@ -3,6 +3,7 @@
     createAmbientUniforms,
     createGradientMeshColorNode,
   } from '#layers/shader/app/composables/useAmbientMaterials'
+  import type { TSLNode } from '#layers/shader/app/types/tsl'
 
   const {
     speed = 1.0,
@@ -15,7 +16,7 @@
   }>()
 
   const emit = defineEmits<{
-    node: [colorNode: any]
+    node: [colorNode: TSLNode]
   }>()
 
   const uniforms = createAmbientUniforms({

package/layers/shader/app/components/Preset/Nebula.client.vue

@@ -3,6 +3,7 @@
     createAmbientUniforms,
     createNebulaColorNode,
   } from '#layers/shader/app/composables/useAmbientMaterials'
+  import type { TSLNode } from '#layers/shader/app/types/tsl'
 
   const {
     speed = 1.0,
@@ -15,7 +16,7 @@
   }>()
 
   const emit = defineEmits<{
-    node: [colorNode: any]
+    node: [colorNode: TSLNode]
   }>()
 
   const uniforms = createAmbientUniforms({

package/layers/shader/app/components/Preset/Ocean.client.vue

@@ -3,6 +3,7 @@
     createAmbientUniforms,
     createOceanColorNode,
   } from '#layers/shader/app/composables/useAmbientMaterials'
+  import type { TSLNode } from '#layers/shader/app/types/tsl'
 
   const {
     speed = 1.0,
@@ -15,7 +16,7 @@
   }>()
 
   const emit = defineEmits<{
-    node: [colorNode: any]
+    node: [colorNode: TSLNode]
   }>()
 
   const uniforms = createAmbientUniforms({

package/layers/shader/app/components/Preset/ThemeAurora.client.vue

@@ -1,8 +1,7 @@
 <script setup lang="ts">
-  import {
-    createAmbientUniforms,
-    createThemeAuroraColorNode,
-  } from '#layers/shader/app/composables/useAmbientMaterials'
+  import { createThemeAuroraColorNode } from '#layers/shader/app/composables/useAmbientMaterials'
+  import { type ThemePresetProps } from '#layers/shader/app/composables/useThemePreset'
+  import type { TSLNode } from '#layers/shader/app/types/tsl'
 
   const {
     speed = 1.0,
@@ -13,98 +12,39 @@
     color2 = '#6366f1',
     color3 = '#a78bfa',
     color4 = '#38bdf8',
-  } = defineProps<{
-    speed?: number
-    intensity?: number
-    mouseInteraction?: boolean
-    mouseStrength?: number
-    color1?: string
-    color2?: string
-    color3?: string
-    color4?: string
-  }>()
+  } = defineProps<ThemePresetProps>()
 
   const emit = defineEmits<{
-    node: [colorNode: any]
+    node: [colorNode: TSLNode]
   }>()
 
-  const uniforms = createAmbientUniforms({
-    speed: speed,
-    intensity: intensity,
-    mouseInteraction: mouseInteraction,
-  })
-  if (mouseInteraction) {
-    uniforms.mouseStrength.value = mouseStrength
-  }
-
-  const c1 = useShaderColor(color1)
-  const c2 = useShaderColor(color2)
-  const c3 = useShaderColor(color3)
-  const c4 = useShaderColor(color4)
-
-  const colorNode = createThemeAuroraColorNode(uniforms, {
-    color1: c1.node,
-    color2: c2.node,
-    color3: c3.node,
-    color4: c4.node,
+  const { uniforms, colorNode } = useThemePreset(createThemeAuroraColorNode, {
+    get speed() {
+      return speed
+    },
+    get intensity() {
+      return intensity
+    },
+    get mouseInteraction() {
+      return mouseInteraction
+    },
+    get mouseStrength() {
+      return mouseStrength
+    },
+    get color1() {
+      return color1
+    },
+    get color2() {
+      return color2
+    },
+    get color3() {
+      return color3
+    },
+    get color4() {
+      return color4
+    },
   })
 
-  watch(
-    () => color1,
-    (hex) => c1.tweenTo(hex, 0.8)
-  )
-  watch(
-    () => color2,
-    (hex) => c2.tweenTo(hex, 0.8)
-  )
-  watch(
-    () => color3,
-    (hex) => c3.tweenTo(hex, 0.8)
-  )
-  watch(
-    () => color4,
-    (hex) => c4.tweenTo(hex, 0.8)
-  )
-
-  try {
-    const runtime = useShaderRuntimeContext()
-    watch(
-      () => [runtime.mouse.mouseX.value, runtime.mouse.mouseY.value],
-      ([mx, my]) => {
-        uniforms.mouseX.value = mx
-        uniforms.mouseY.value = my
-      },
-      { immediate: true }
-    )
-  } catch {
-    // No runtime context
-  }
-
-  watch(
-    () => speed,
-    (v) => {
-      uniforms.speed.value = v
-    }
-  )
-  watch(
-    () => intensity,
-    (v) => {
-      uniforms.intensity.value = v
-    }
-  )
-  watch(
-    () => mouseInteraction,
-    (v) => {
-      uniforms.mouseStrength.value = v ? mouseStrength : 0
-    }
-  )
-  watch(
-    () => mouseStrength,
-    (v) => {
-      if (mouseInteraction) uniforms.mouseStrength.value = v
-    }
-  )
-
   emit('node', colorNode)
   defineExpose({ uniforms, colorNode })
 </script>