shader cleanup

Author: thomasyuill-livekit

components/livekit/audio-visualizer/audio-oscilloscope-visualizer/audio-oscilloscope-visualizer.tsx

@@ -17,7 +17,7 @@ import {
   useTrackVolume,
 } from '@livekit/components-react';
 import { cn } from '@/lib/utils';
-import { OscilliscopeShaders, type OscilliscopeShadersProps } from './oscilliscope-shaders';
+import { OscilliscopeShader, type OscilliscopeShaderProps } from './shader';
 
 const DEFAULT_SPEED = 5;
 const DEFAULT_AMPLITUDE = 0.025;
@@ -71,7 +71,7 @@ export function AudioOscilloscopeVisualizer({
   audioTrack,
   className,
 }: AudioOscilloscopeVisualizerProps &
-  OscilliscopeShadersProps &
+  OscilliscopeShaderProps &
   VariantProps<typeof audioOscilloscopeVisualizerVariants>) {
   const [speed, setSpeed] = useState(DEFAULT_SPEED);
   const { value: amplitude, animate: animateAmplitude } = useAnimatedValue(DEFAULT_AMPLITUDE);
@@ -144,7 +144,7 @@ export function AudioOscilloscopeVisualizer({
   }, [state, volume, animateAmplitude, animateFrequency]);
 
   return (
-    <OscilliscopeShaders
+    <OscilliscopeShader
       speed={speed}
       amplitude={amplitude}
       frequency={frequency}

components/livekit/audio-visualizer/audio-oscilloscope-visualizer/oscilliscope-shaders.tsx renamed to components/livekit/audio-visualizer/audio-oscilloscope-visualizer/shader.tsx

@@ -3,7 +3,7 @@
 import React, { forwardRef } from 'react';
 import { Shader } from '@/components/livekit/react-shader/react-shader';
 
-const oscilliscopeShaderSource = `
+const shaderSource = `
 const float TAU = 6.28318530718;
 
 // Noise for dithering
@@ -94,7 +94,7 @@ void mainImage(out vec4 fragColor, in vec2 fragCoord) {
   fragColor = vec4(color * uMix, alpha);
 }`;
 
-export interface OscilliscopeShadersProps extends React.HTMLAttributes<HTMLDivElement> {
+export interface OscilliscopeShaderProps extends React.HTMLAttributes<HTMLDivElement> {
   /**
    * Class name
    * @default ''
@@ -137,7 +137,7 @@ export interface OscilliscopeShadersProps extends React.HTMLAttributes<HTMLDivEl
   smoothing?: number;
 }
 
-export const OscilliscopeShaders = forwardRef<HTMLDivElement, OscilliscopeShadersProps>(
+export const OscilliscopeShader = forwardRef<HTMLDivElement, OscilliscopeShaderProps>(
   (
     {
       className,
@@ -157,7 +157,7 @@ export const OscilliscopeShaders = forwardRef<HTMLDivElement, OscilliscopeShader
     return (
       <div ref={ref} className={className} {...props}>
         <Shader
-          fs={oscilliscopeShaderSource}
+          fs={shaderSource}
           devicePixelRatio={globalThis.devicePixelRatio ?? 1}
           uniforms={{
             uSpeed: { type: '1f', value: speed },
@@ -181,6 +181,6 @@ export const OscilliscopeShaders = forwardRef<HTMLDivElement, OscilliscopeShader
   }
 );
 
-OscilliscopeShaders.displayName = 'OscilliscopeShaders';
+OscilliscopeShader.displayName = 'OscilliscopeShader';
 
-export default OscilliscopeShaders;
+export default OscilliscopeShader;

components/livekit/audio-visualizer/audio-shader-visualizer/audio-shader-visualizer.tsx

@@ -18,7 +18,7 @@ import {
   useTrackVolume,
 } from '@livekit/components-react';
 import { cn } from '@/lib/utils';
-import { AuroraShaders, type AuroraShadersProps } from './aurora-shaders';
+import { AuroraShaders, type AuroraShadersProps } from './shader';
 
 const DEFAULT_SPEED = 10;
 const DEFAULT_AMPLITUDE = 2;

components/livekit/audio-visualizer/audio-shader-visualizer/aurora-shaders.tsx renamed to components/livekit/audio-visualizer/audio-shader-visualizer/shader.tsx

@@ -3,7 +3,7 @@
 import React, { forwardRef } from 'react';
 import { Shader } from '@/components/livekit/react-shader/react-shader';
 
-const auroraShaderSource = `
+const shaderSource = `
 const float TAU = 6.28318530718;
 
 // Noise for dithering
@@ -254,7 +254,7 @@ export const AuroraShaders = forwardRef<HTMLDivElement, AuroraShadersProps>(
     return (
       <div ref={ref} className={className} {...props}>
         <Shader
-          fs={auroraShaderSource}
+          fs={shaderSource}
           devicePixelRatio={globalThis.devicePixelRatio ?? 1}
           uniforms={{
             // Aurora wave speed