mirror of
https://github.com/SamEyeBam/animate.git
synced 2025-11-23 15:52:29 +00:00
So much play
This commit is contained in:
Sam
24
react/.gitignore
vendored
Normal file
24
react/.gitignore
vendored
Normal file
@@ -0,0 +1,24 @@
|
||||
# Logs
|
||||
logs
|
||||
*.log
|
||||
npm-debug.log*
|
||||
yarn-debug.log*
|
||||
yarn-error.log*
|
||||
pnpm-debug.log*
|
||||
lerna-debug.log*
|
||||
|
||||
node_modules
|
||||
dist
|
||||
dist-ssr
|
||||
*.local
|
||||
|
||||
# Editor directories and files
|
||||
.vscode/*
|
||||
!.vscode/extensions.json
|
||||
.idea
|
||||
.DS_Store
|
||||
*.suo
|
||||
*.ntvs*
|
||||
*.njsproj
|
||||
*.sln
|
||||
*.sw?
|
||||
12
react/README.md
Normal file
12
react/README.md
Normal file
@@ -0,0 +1,12 @@
|
||||
# React + Vite
|
||||
|
||||
This template provides a minimal setup to get React working in Vite with HMR and some ESLint rules.
|
||||
|
||||
Currently, two official plugins are available:
|
||||
|
||||
- [@vitejs/plugin-react](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react) uses [Babel](https://babeljs.io/) for Fast Refresh
|
||||
- [@vitejs/plugin-react-swc](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react-swc) uses [SWC](https://swc.rs/) for Fast Refresh
|
||||
|
||||
## Expanding the ESLint configuration
|
||||
|
||||
If you are developing a production application, we recommend using TypeScript with type-aware lint rules enabled. Check out the [TS template](https://github.com/vitejs/vite/tree/main/packages/create-vite/template-react-ts) for information on how to integrate TypeScript and [`typescript-eslint`](https://typescript-eslint.io) in your project.
|
||||
33
react/eslint.config.js
Normal file
33
react/eslint.config.js
Normal file
@@ -0,0 +1,33 @@
|
||||
import js from '@eslint/js'
|
||||
import globals from 'globals'
|
||||
import reactHooks from 'eslint-plugin-react-hooks'
|
||||
import reactRefresh from 'eslint-plugin-react-refresh'
|
||||
|
||||
export default [
|
||||
{ ignores: ['dist'] },
|
||||
{
|
||||
files: ['**/*.{js,jsx}'],
|
||||
languageOptions: {
|
||||
ecmaVersion: 2020,
|
||||
globals: globals.browser,
|
||||
parserOptions: {
|
||||
ecmaVersion: 'latest',
|
||||
ecmaFeatures: { jsx: true },
|
||||
sourceType: 'module',
|
||||
},
|
||||
},
|
||||
plugins: {
|
||||
'react-hooks': reactHooks,
|
||||
'react-refresh': reactRefresh,
|
||||
},
|
||||
rules: {
|
||||
...js.configs.recommended.rules,
|
||||
...reactHooks.configs.recommended.rules,
|
||||
'no-unused-vars': ['error', { varsIgnorePattern: '^[A-Z_]' }],
|
||||
'react-refresh/only-export-components': [
|
||||
'warn',
|
||||
{ allowConstantExport: true },
|
||||
],
|
||||
},
|
||||
},
|
||||
]
|
||||
13
react/index.html
Normal file
13
react/index.html
Normal file
@@ -0,0 +1,13 @@
|
||||
<!doctype html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="UTF-8" />
|
||||
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
<title>Vite + React</title>
|
||||
</head>
|
||||
<body>
|
||||
<div id="root"></div>
|
||||
<script type="module" src="/src/main.jsx"></script>
|
||||
</body>
|
||||
</html>
|
||||
4160
react/package-lock.json
generated
Normal file
4160
react/package-lock.json
generated
Normal file
File diff suppressed because it is too large
Load Diff
31
react/package.json
Normal file
31
react/package.json
Normal file
@@ -0,0 +1,31 @@
|
||||
{
|
||||
"name": "react",
|
||||
"private": true,
|
||||
"version": "0.0.0",
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
"dev": "vite",
|
||||
"build": "vite build",
|
||||
"lint": "eslint .",
|
||||
"preview": "vite preview"
|
||||
},
|
||||
"dependencies": {
|
||||
"@react-three/drei": "^10.0.7",
|
||||
"@react-three/fiber": "^9.1.2",
|
||||
"leva": "^0.10.0",
|
||||
"react": "^19.0.0",
|
||||
"react-dom": "^19.0.0",
|
||||
"three": "^0.176.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@eslint/js": "^9.22.0",
|
||||
"@types/react": "^19.0.10",
|
||||
"@types/react-dom": "^19.0.4",
|
||||
"@vitejs/plugin-react": "^4.3.4",
|
||||
"eslint": "^9.22.0",
|
||||
"eslint-plugin-react-hooks": "^5.2.0",
|
||||
"eslint-plugin-react-refresh": "^0.4.19",
|
||||
"globals": "^16.0.0",
|
||||
"vite": "^6.3.1"
|
||||
}
|
||||
}
|
||||
1
react/public/vite.svg
Normal file
1
react/public/vite.svg
Normal file
@@ -0,0 +1 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="31.88" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257"><defs><linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%" y1="7.652%" y2="78.411%"><stop offset="0%" stop-color="#41D1FF"></stop><stop offset="100%" stop-color="#BD34FE"></stop></linearGradient><linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%" y1="2.242%" y2="89.03%"><stop offset="0%" stop-color="#FFEA83"></stop><stop offset="8.333%" stop-color="#FFDD35"></stop><stop offset="100%" stop-color="#FFA800"></stop></linearGradient></defs><path fill="url(#IconifyId1813088fe1fbc01fb466)" d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path><path fill="url(#IconifyId1813088fe1fbc01fb467)" d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path></svg>
|
||||
|
After Width: | Height: | Size: 1.5 KiB |
21
react/src/App.css
Normal file
21
react/src/App.css
Normal file
@@ -0,0 +1,21 @@
|
||||
/* Remove default App.css styles if they interfere */
|
||||
/* You might want to keep some or none depending on desired layout */
|
||||
|
||||
/* Example: Remove padding and max-width from #root if set here */
|
||||
/* #root {
|
||||
max-width: 100%;
|
||||
padding: 0;
|
||||
} */
|
||||
|
||||
/* Remove logo styles etc. */
|
||||
/* .logo { ... } */
|
||||
/* .logo:hover { ... } */
|
||||
/* ... etc ... */
|
||||
|
||||
/* @keyframes logo-spin { ... } */
|
||||
|
||||
/* @media (prefers-reduced-motion: no-preference) { ... } */
|
||||
|
||||
/* .card { ... } */
|
||||
|
||||
/* .read-the-docs { ... } */
|
||||
59
react/src/App.jsx
Normal file
59
react/src/App.jsx
Normal file
@@ -0,0 +1,59 @@
|
||||
import { Canvas } from '@react-three/fiber'
|
||||
import { OrbitControls } from '@react-three/drei'
|
||||
import { useControls, Leva } from 'leva' // Import leva
|
||||
import PhyllotaxisSystem from './PhyllotaxisSystem' // Import Phyllotaxis system
|
||||
// import PolyTwistSystem from './PolyTwistSystem' // Import PolyTwist system
|
||||
import './App.css'
|
||||
|
||||
// Define animation options
|
||||
const animationOptions = {
|
||||
Phyllotaxis: 'Phyllotaxis',
|
||||
PolyTwist: 'PolyTwist',
|
||||
// Add more animation names here as you implement them
|
||||
}
|
||||
|
||||
function App() {
|
||||
// Leva controls for animation selection and global settings
|
||||
const { selectedAnimation, speedMultiplier } = useControls({
|
||||
selectedAnimation: {
|
||||
options: animationOptions,
|
||||
value: animationOptions.Phyllotaxis, // Default selection
|
||||
label: 'Animation',
|
||||
},
|
||||
speedMultiplier: {
|
||||
value: 1.0, // Global speed multiplier
|
||||
min: 0.01,
|
||||
max: 5.0,
|
||||
step: 0.01,
|
||||
label: 'Global Speed',
|
||||
},
|
||||
})
|
||||
|
||||
// Function to render the selected animation component
|
||||
const renderSelectedAnimation = () => {
|
||||
switch (selectedAnimation) {
|
||||
case animationOptions.Phyllotaxis:
|
||||
return <PhyllotaxisSystem speedMultiplier={speedMultiplier} />
|
||||
// case animationOptions.PolyTwist:
|
||||
// return <PolyTwistSystem speedMultiplier={speedMultiplier} />
|
||||
// Add cases for other animations
|
||||
default:
|
||||
return null
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<>
|
||||
{/* Leva panel will be added here automatically */}
|
||||
<Leva /> {/* Add the Leva panel, initially collapsed */}
|
||||
<Canvas camera={{ position: [0, 0, 500], fov: 75 }}> {/* Adjusted camera Z */}
|
||||
<ambientLight intensity={0.8} /> {/* Increased ambient light */}
|
||||
<pointLight position={[100, 100, 100]} intensity={1.5} /> {/* Adjusted point light */}
|
||||
{renderSelectedAnimation()} {/* Render the chosen animation */}
|
||||
<OrbitControls />
|
||||
</Canvas>
|
||||
</>
|
||||
)
|
||||
}
|
||||
|
||||
export default App
|
||||
130
react/src/PhyllotaxisSystem.jsx
Normal file
130
react/src/PhyllotaxisSystem.jsx
Normal file
@@ -0,0 +1,130 @@
|
||||
import React, { useRef, useMemo } from 'react';
|
||||
import { useFrame } from '@react-three/fiber';
|
||||
import * as THREE from 'three';
|
||||
import { useControls, folder } from 'leva'; // Import leva controls
|
||||
|
||||
// Default values matching original config
|
||||
const DEFAULTS = {
|
||||
width: 24,
|
||||
nMax: 300,
|
||||
color1: '#2D81FC',
|
||||
color2: '#FC0362',
|
||||
pointSize: 5.0, // Added point size control
|
||||
};
|
||||
|
||||
function PhyllotaxisSystem({ speedMultiplier }) { // Accept global speed multiplier
|
||||
const pointsRef = useRef();
|
||||
const positionBufferRef = useRef();
|
||||
const colorBufferRef = useRef();
|
||||
|
||||
// Leva controls specific to Phyllotaxis
|
||||
const { width, nMax, color1, color2, pointSize } = useControls('Phyllotaxis', {
|
||||
// Group controls in a folder
|
||||
width: { value: DEFAULTS.width, min: 1, max: 50, step: 1, label: 'Width Factor' },
|
||||
nMax: { value: DEFAULTS.nMax, min: 10, max: 5000, step: 10, label: 'Particle Count' },
|
||||
pointSize: { value: DEFAULTS.pointSize, min: 0.1, max: 20, step: 0.1, label: 'Point Size' },
|
||||
Colors: folder({ // Sub-folder for colors
|
||||
color1: { value: DEFAULTS.color1, label: 'Color 1' },
|
||||
color2: { value: DEFAULTS.color2, label: 'Color 2' },
|
||||
})
|
||||
});
|
||||
|
||||
// Memoize particle data generation, recalculate if controls change
|
||||
const particles = useMemo(() => {
|
||||
const positions = new Float32Array(nMax * 3);
|
||||
const colors = new Float32Array(nMax * 3);
|
||||
const tempColor = new THREE.Color();
|
||||
const col1 = new THREE.Color(color1);
|
||||
const col2 = new THREE.Color(color2);
|
||||
|
||||
for (let i = 0; i < nMax; i++) {
|
||||
const n = i;
|
||||
const radius = width * Math.sqrt(n);
|
||||
const angle = 0; // Initial angle
|
||||
|
||||
positions[i * 3] = radius * Math.cos(angle);
|
||||
positions[i * 3 + 1] = radius * Math.sin(angle);
|
||||
positions[i * 3 + 2] = 0;
|
||||
|
||||
tempColor.copy(col1).lerp(col2, n / nMax);
|
||||
colors[i * 3] = tempColor.r;
|
||||
colors[i * 3 + 1] = tempColor.g;
|
||||
colors[i * 3 + 2] = tempColor.b;
|
||||
}
|
||||
return { positions, colors };
|
||||
// Dependencies: recalculate when these control values change
|
||||
}, [nMax, width, color1, color2]);
|
||||
|
||||
// Update positions in the animation loop
|
||||
useFrame((state) => {
|
||||
if (!positionBufferRef.current || !colorBufferRef.current) return;
|
||||
|
||||
// Use combined speed (global * local if needed, here just global)
|
||||
const time = state.clock.elapsedTime * speedMultiplier * 0.3; // Adjusted speed factor
|
||||
const positions = positionBufferRef.current.array;
|
||||
|
||||
for (let i = 0; i < nMax; i++) {
|
||||
const n = i;
|
||||
const radius = width * Math.sqrt(n);
|
||||
const angle = n * time; // Angle driven by time and index
|
||||
|
||||
positions[i * 3] = radius * Math.cos(angle);
|
||||
positions[i * 3 + 1] = radius * Math.sin(angle);
|
||||
// z remains 0
|
||||
}
|
||||
positionBufferRef.current.needsUpdate = true;
|
||||
|
||||
// Update point size if material exists
|
||||
if (pointsRef.current && pointsRef.current.material) {
|
||||
pointsRef.current.material.size = pointSize;
|
||||
}
|
||||
});
|
||||
|
||||
// Effect to update buffers when particles data changes (due to control changes)
|
||||
React.useEffect(() => {
|
||||
if (positionBufferRef.current) {
|
||||
positionBufferRef.current.array = particles.positions;
|
||||
positionBufferRef.current.needsUpdate = true;
|
||||
}
|
||||
if (colorBufferRef.current) {
|
||||
colorBufferRef.current.array = particles.colors;
|
||||
colorBufferRef.current.needsUpdate = true;
|
||||
}
|
||||
}, [particles]);
|
||||
|
||||
|
||||
return (
|
||||
<points ref={pointsRef}>
|
||||
<bufferGeometry>
|
||||
{/* Use keys to force re-creation if nMax changes drastically */}
|
||||
<bufferAttribute
|
||||
key={`pos-${nMax}`}
|
||||
ref={positionBufferRef}
|
||||
attach="attributes-position"
|
||||
count={particles.positions.length / 3} // Use actual length
|
||||
array={particles.positions}
|
||||
itemSize={3}
|
||||
usage={THREE.DynamicDrawUsage} // Mark as dynamic
|
||||
/>
|
||||
<bufferAttribute
|
||||
key={`col-${nMax}`}
|
||||
ref={colorBufferRef}
|
||||
attach="attributes-color"
|
||||
count={particles.colors.length / 3} // Use actual length
|
||||
array={particles.colors}
|
||||
itemSize={3}
|
||||
usage={THREE.DynamicDrawUsage} // Mark as dynamic
|
||||
/>
|
||||
</bufferGeometry>
|
||||
<pointsMaterial
|
||||
size={pointSize}
|
||||
vertexColors={true}
|
||||
sizeAttenuation={true}
|
||||
depthWrite={false} // Often good for particles
|
||||
blending={THREE.AdditiveBlending} // Example blending mode
|
||||
/>
|
||||
</points>
|
||||
);
|
||||
}
|
||||
|
||||
export default PhyllotaxisSystem;
|
||||
1
react/src/assets/react.svg
Normal file
1
react/src/assets/react.svg
Normal file
@@ -0,0 +1 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="35.93" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 228"><path fill="#00D8FF" d="M210.483 73.824a171.49 171.49 0 0 0-8.24-2.597c.465-1.9.893-3.777 1.273-5.621c6.238-30.281 2.16-54.676-11.769-62.708c-13.355-7.7-35.196.329-57.254 19.526a171.23 171.23 0 0 0-6.375 5.848a155.866 155.866 0 0 0-4.241-3.917C100.759 3.829 77.587-4.822 63.673 3.233C50.33 10.957 46.379 33.89 51.995 62.588a170.974 170.974 0 0 0 1.892 8.48c-3.28.932-6.445 1.924-9.474 2.98C17.309 83.498 0 98.307 0 113.668c0 15.865 18.582 31.778 46.812 41.427a145.52 145.52 0 0 0 6.921 2.165a167.467 167.467 0 0 0-2.01 9.138c-5.354 28.2-1.173 50.591 12.134 58.266c13.744 7.926 36.812-.22 59.273-19.855a145.567 145.567 0 0 0 5.342-4.923a168.064 168.064 0 0 0 6.92 6.314c21.758 18.722 43.246 26.282 56.54 18.586c13.731-7.949 18.194-32.003 12.4-61.268a145.016 145.016 0 0 0-1.535-6.842c1.62-.48 3.21-.974 4.76-1.488c29.348-9.723 48.443-25.443 48.443-41.52c0-15.417-17.868-30.326-45.517-39.844Zm-6.365 70.984c-1.4.463-2.836.91-4.3 1.345c-3.24-10.257-7.612-21.163-12.963-32.432c5.106-11 9.31-21.767 12.459-31.957c2.619.758 5.16 1.557 7.61 2.4c23.69 8.156 38.14 20.213 38.14 29.504c0 9.896-15.606 22.743-40.946 31.14Zm-10.514 20.834c2.562 12.94 2.927 24.64 1.23 33.787c-1.524 8.219-4.59 13.698-8.382 15.893c-8.067 4.67-25.32-1.4-43.927-17.412a156.726 156.726 0 0 1-6.437-5.87c7.214-7.889 14.423-17.06 21.459-27.246c12.376-1.098 24.068-2.894 34.671-5.345a134.17 134.17 0 0 1 1.386 6.193ZM87.276 214.515c-7.882 2.783-14.16 2.863-17.955.675c-8.075-4.657-11.432-22.636-6.853-46.752a156.923 156.923 0 0 1 1.869-8.499c10.486 2.32 22.093 3.988 34.498 4.994c7.084 9.967 14.501 19.128 21.976 27.15a134.668 134.668 0 0 1-4.877 4.492c-9.933 8.682-19.886 14.842-28.658 17.94ZM50.35 144.747c-12.483-4.267-22.792-9.812-29.858-15.863c-6.35-5.437-9.555-10.836-9.555-15.216c0-9.322 13.897-21.212 37.076-29.293c2.813-.98 5.757-1.905 8.812-2.773c3.204 10.42 7.406 21.315 12.477 32.332c-5.137 11.18-9.399 22.249-12.634 32.792a134.718 134.718 0 0 1-6.318-1.979Zm12.378-84.26c-4.811-24.587-1.616-43.134 6.425-47.789c8.564-4.958 27.502 2.111 47.463 19.835a144.318 144.318 0 0 1 3.841 3.545c-7.438 7.987-14.787 17.08-21.808 26.988c-12.04 1.116-23.565 2.908-34.161 5.309a160.342 160.342 0 0 1-1.76-7.887Zm110.427 27.268a347.8 347.8 0 0 0-7.785-12.803c8.168 1.033 15.994 2.404 23.343 4.08c-2.206 7.072-4.956 14.465-8.193 22.045a381.151 381.151 0 0 0-7.365-13.322Zm-45.032-43.861c5.044 5.465 10.096 11.566 15.065 18.186a322.04 322.04 0 0 0-30.257-.006c4.974-6.559 10.069-12.652 15.192-18.18ZM82.802 87.83a323.167 323.167 0 0 0-7.227 13.238c-3.184-7.553-5.909-14.98-8.134-22.152c7.304-1.634 15.093-2.97 23.209-3.984a321.524 321.524 0 0 0-7.848 12.897Zm8.081 65.352c-8.385-.936-16.291-2.203-23.593-3.793c2.26-7.3 5.045-14.885 8.298-22.6a321.187 321.187 0 0 0 7.257 13.246c2.594 4.48 5.28 8.868 8.038 13.147Zm37.542 31.03c-5.184-5.592-10.354-11.779-15.403-18.433c4.902.192 9.899.29 14.978.29c5.218 0 10.376-.117 15.453-.343c-4.985 6.774-10.018 12.97-15.028 18.486Zm52.198-57.817c3.422 7.8 6.306 15.345 8.596 22.52c-7.422 1.694-15.436 3.058-23.88 4.071a382.417 382.417 0 0 0 7.859-13.026a347.403 347.403 0 0 0 7.425-13.565Zm-16.898 8.101a358.557 358.557 0 0 1-12.281 19.815a329.4 329.4 0 0 1-23.444.823c-7.967 0-15.716-.248-23.178-.732a310.202 310.202 0 0 1-12.513-19.846h.001a307.41 307.41 0 0 1-10.923-20.627a310.278 310.278 0 0 1 10.89-20.637l-.001.001a307.318 307.318 0 0 1 12.413-19.761c7.613-.576 15.42-.876 23.31-.876H128c7.926 0 15.743.303 23.354.883a329.357 329.357 0 0 1 12.335 19.695a358.489 358.489 0 0 1 11.036 20.54a329.472 329.472 0 0 1-11 20.722Zm22.56-122.124c8.572 4.944 11.906 24.881 6.52 51.026c-.344 1.668-.73 3.367-1.15 5.09c-10.622-2.452-22.155-4.275-34.23-5.408c-7.034-10.017-14.323-19.124-21.64-27.008a160.789 160.789 0 0 1 5.888-5.4c18.9-16.447 36.564-22.941 44.612-18.3ZM128 90.808c12.625 0 22.86 10.235 22.86 22.86s-10.235 22.86-22.86 22.86s-22.86-10.235-22.86-22.86s10.235-22.86 22.86-22.86Z"></path></svg>
|
||||
|
After Width: | Height: | Size: 4.0 KiB |
44
react/src/filters.js
Normal file
44
react/src/filters.js
Normal file
@@ -0,0 +1,44 @@
|
||||
// filepath: c:\Users\samkl\Documents\GitHub\animate\docs\react\src\filters.js
|
||||
import * as THREE from 'three'; // Might be needed for future filters
|
||||
|
||||
// Additive filter application function
|
||||
export function applyFilters(baseValue, filters = [], time) {
|
||||
let offset = 0;
|
||||
filters.forEach(filter => {
|
||||
switch (filter.type) {
|
||||
case 'sin':
|
||||
// Ensure defaults if properties are missing
|
||||
offset += Math.sin(time * (filter.frequency ?? 1)) * (filter.amplitude ?? 0);
|
||||
break;
|
||||
// --- Add Noise Filter ---
|
||||
case 'noise':
|
||||
// Simple pseudo-random noise using time and an offset
|
||||
// Use a combination of sin functions for a smoother noise
|
||||
const noiseVal = (Math.sin(time * (filter.frequency ?? 1) * 1.3 + filter.id * 10) + Math.sin(time * (filter.frequency ?? 1) * 2.7 + filter.id * 5)) / 2;
|
||||
offset += noiseVal * (filter.amplitude ?? 0);
|
||||
break;
|
||||
// --- End Noise Filter ---
|
||||
default:
|
||||
console.warn(`Unknown filter type: ${filter.type}`);
|
||||
}
|
||||
});
|
||||
return baseValue + offset;
|
||||
}
|
||||
|
||||
// Function to get default parameters for a filter type
|
||||
export function getDefaultFilterParams(type) {
|
||||
switch (type) {
|
||||
case 'sin':
|
||||
return { amplitude: 10, frequency: 1 };
|
||||
case 'noise': // Default for noise
|
||||
return { amplitude: 5, frequency: 1 }; // Added frequency for noise control
|
||||
default:
|
||||
return {};
|
||||
}
|
||||
}
|
||||
|
||||
// Available filter types (for dropdowns)
|
||||
export const FILTER_TYPES = {
|
||||
SIN: 'sin',
|
||||
NOISE: 'noise',
|
||||
};
|
||||
87
react/src/index.css
Normal file
87
react/src/index.css
Normal file
@@ -0,0 +1,87 @@
|
||||
:root {
|
||||
font-family: system-ui, Avenir, Helvetica, Arial, sans-serif;
|
||||
line-height: 1.5;
|
||||
font-weight: 400;
|
||||
|
||||
color-scheme: light dark;
|
||||
color: rgba(255, 255, 255, 0.87);
|
||||
background-color: #000000;
|
||||
|
||||
font-synthesis: none;
|
||||
text-rendering: optimizeLegibility;
|
||||
-webkit-font-smoothing: antialiased;
|
||||
-moz-osx-font-smoothing: grayscale;
|
||||
}
|
||||
|
||||
a {
|
||||
font-weight: 500;
|
||||
color: #646cff;
|
||||
text-decoration: inherit;
|
||||
}
|
||||
a:hover {
|
||||
color: #535bf2;
|
||||
}
|
||||
|
||||
body {
|
||||
margin: 0;
|
||||
/* Remove display flex and place-items */
|
||||
/* display: flex; */
|
||||
/* place-items: center; */
|
||||
min-width: 320px;
|
||||
min-height: 100vh;
|
||||
overflow: hidden; /* Prevent scrollbars from body */
|
||||
}
|
||||
|
||||
/* Make root and canvas full screen */
|
||||
#root {
|
||||
width: 100vw;
|
||||
height: 100vh;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
/* Remove text-align center if you don't want leva centered initially */
|
||||
/* text-align: center; */
|
||||
}
|
||||
|
||||
canvas {
|
||||
display: block; /* Ensure canvas takes up block space */
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
|
||||
h1 {
|
||||
font-size: 3.2em;
|
||||
line-height: 1.1;
|
||||
}
|
||||
|
||||
button {
|
||||
border-radius: 8px;
|
||||
border: 1px solid transparent;
|
||||
padding: 0.6em 1.2em;
|
||||
font-size: 1em;
|
||||
font-weight: 500;
|
||||
font-family: inherit;
|
||||
background-color: #1a1a1a;
|
||||
cursor: pointer;
|
||||
transition: border-color 0.25s;
|
||||
}
|
||||
button:hover {
|
||||
border-color: #646cff;
|
||||
}
|
||||
button:focus,
|
||||
button:focus-visible {
|
||||
outline: 4px auto -webkit-focus-ring-color;
|
||||
}
|
||||
|
||||
@media (prefers-color-scheme: light) {
|
||||
:root {
|
||||
color: #213547;
|
||||
background-color: #ffffff;
|
||||
}
|
||||
a:hover {
|
||||
color: #747bff;
|
||||
}
|
||||
button {
|
||||
background-color: #f9f9f9;
|
||||
}
|
||||
}
|
||||
8
react/src/main.jsx
Normal file
8
react/src/main.jsx
Normal file
@@ -0,0 +1,8 @@
|
||||
import React from 'react' // Use React instead of StrictMode for now
|
||||
import { createRoot } from 'react-dom/client'
|
||||
import './index.css'
|
||||
import App from './App.jsx'
|
||||
|
||||
createRoot(document.getElementById('root')).render(
|
||||
<App />
|
||||
)
|
||||
138
react/src/useFilteredControl.js
Normal file
138
react/src/useFilteredControl.js
Normal file
@@ -0,0 +1,138 @@
|
||||
import { useState, useMemo, useCallback } from 'react';
|
||||
import { button, buttonGroup, folder, monitor } from 'leva';
|
||||
import { applyFilters, getDefaultFilterParams, FILTER_TYPES } from './filters';
|
||||
|
||||
/**
|
||||
* Custom hook to manage a numeric control value with additive filters in Leva.
|
||||
*
|
||||
* @param {string} key - A unique key for this control (used in Leva schema).
|
||||
* @param {number} initialValue - The initial base value.
|
||||
* @param {object} options - Leva control options (min, max, step, label, etc.).
|
||||
* @returns {[Function, object]} A tuple containing:
|
||||
* - A function `getFilteredValue(time)` that returns the value with filters applied for the given time.
|
||||
* - A Leva schema fragment for this control and its filters.
|
||||
*/
|
||||
export function useFilteredControl(key, initialValue, options = {}) {
|
||||
const [baseValue, setBaseValue] = useState(initialValue);
|
||||
const [filters, setFilters] = useState([]);
|
||||
|
||||
const label = options.label || key;
|
||||
|
||||
// --- Filter Management Functions ---
|
||||
const addFilter = useCallback((type) => {
|
||||
const newFilter = {
|
||||
id: Date.now() + Math.random(),
|
||||
type: type,
|
||||
...getDefaultFilterParams(type),
|
||||
};
|
||||
setFilters((prev) => [...prev, newFilter]);
|
||||
}, []);
|
||||
|
||||
const removeFilter = useCallback((id) => {
|
||||
setFilters((prev) => prev.filter((f) => f.id !== id));
|
||||
}, []);
|
||||
|
||||
const updateFilter = useCallback((id, newParams) => {
|
||||
setFilters((prev) =>
|
||||
prev.map((f) => (f.id === id ? { ...f, ...newParams } : f))
|
||||
);
|
||||
}, []);
|
||||
|
||||
const clearFilters = useCallback(() => {
|
||||
setFilters([]);
|
||||
}, []);
|
||||
|
||||
// --- Leva Schema Generation ---
|
||||
const schema = useMemo(() => {
|
||||
const controlSchema = {};
|
||||
|
||||
// 1. Base Value Slider
|
||||
controlSchema[key] = {
|
||||
...options,
|
||||
value: baseValue,
|
||||
label: `Base ${label}`,
|
||||
onChange: setBaseValue,
|
||||
};
|
||||
|
||||
// 2. Filters Folder
|
||||
const filterControls = {};
|
||||
// Prefix keys with the control key to ensure uniqueness
|
||||
filterControls[`${key}_Add Filter`] = buttonGroup({
|
||||
// Dynamically create buttons for available filter types
|
||||
...Object.entries(FILTER_TYPES).reduce((acc, [name, type]) => {
|
||||
acc[name] = () => addFilter(type);
|
||||
return acc;
|
||||
}, {}),
|
||||
});
|
||||
filterControls[`${key}_Applied`] = monitor(filters.length, { graph: false });
|
||||
filterControls[`${key}_Clear`] = button(clearFilters, {
|
||||
label: 'Clear All',
|
||||
disabled: filters.length === 0
|
||||
});
|
||||
|
||||
// 3. Individual Filter Controls
|
||||
filters.forEach((filter, index) => {
|
||||
const filterKey = `${key}_filter_${filter.id}`;
|
||||
const filterFolderContent = {};
|
||||
|
||||
filterFolderContent[`type_${filter.id}`] = {
|
||||
value: filter.type,
|
||||
options: Object.values(FILTER_TYPES),
|
||||
label: 'Type',
|
||||
onChange: (newType) => updateFilter(filter.id, { type: newType, ...getDefaultFilterParams(newType) }),
|
||||
};
|
||||
|
||||
// Common Amplitude Control (adjust range based on param if needed)
|
||||
filterFolderContent[`amp_${filter.id}`] = {
|
||||
value: filter.amplitude,
|
||||
min: 0,
|
||||
max: options.max ? options.max * 0.5 : 50, // Example: Max amplitude is half of base max
|
||||
step: (options.max ? options.max * 0.5 : 50) / 100, // Example step
|
||||
label: 'Amplitude',
|
||||
onChange: (v) => updateFilter(filter.id, { amplitude: v }),
|
||||
};
|
||||
|
||||
// Common Frequency Control
|
||||
filterFolderContent[`freq_${filter.id}`] = {
|
||||
value: filter.frequency,
|
||||
min: 0.1,
|
||||
max: 10,
|
||||
step: 0.1,
|
||||
label: 'Frequency',
|
||||
onChange: (v) => updateFilter(filter.id, { frequency: v }),
|
||||
};
|
||||
|
||||
filterFolderContent[`remove_${filter.id}`] = button(() => removeFilter(filter.id), { label: 'Remove' });
|
||||
|
||||
// Add the folder for this specific filter
|
||||
filterControls[filterKey] = folder(filterFolderContent, {
|
||||
collapsed: true,
|
||||
label: `${label} Filter ${index + 1} (${filter.type})`,
|
||||
});
|
||||
});
|
||||
|
||||
// Add the main filters folder under the base control's key
|
||||
controlSchema[`${label} Filters`] = folder(filterControls);
|
||||
|
||||
return controlSchema;
|
||||
|
||||
}, [key, label, options, baseValue, filters, addFilter, removeFilter, updateFilter, clearFilters]);
|
||||
|
||||
// --- Filtered Value Calculation ---
|
||||
const getFilteredValue = useCallback((time) => {
|
||||
// Ensure baseValue is treated as a number
|
||||
const numericBaseValue = Number(baseValue);
|
||||
if (isNaN(numericBaseValue)) {
|
||||
console.warn(`Base value for ${key} is not a number:`, baseValue);
|
||||
return 0; // Or initialValue
|
||||
}
|
||||
const filtered = applyFilters(numericBaseValue, filters, time);
|
||||
// Optional: Clamp the filtered value to the original min/max if desired
|
||||
if (options.min !== undefined && options.max !== undefined) {
|
||||
return Math.max(options.min, Math.min(filtered, options.max));
|
||||
}
|
||||
return filtered;
|
||||
}, [baseValue, filters, key, options.min, options.max]);
|
||||
|
||||
return [getFilteredValue, schema];
|
||||
}
|
||||
7
react/vite.config.js
Normal file
7
react/vite.config.js
Normal file
@@ -0,0 +1,7 @@
|
||||
import { defineConfig } from 'vite'
|
||||
import react from '@vitejs/plugin-react'
|
||||
|
||||
// https://vite.dev/config/
|
||||
export default defineConfig({
|
||||
plugins: [react()],
|
||||
})
|
||||
Reference in New Issue
Block a user