From 854af70fcd2c2e93fc2a03c12f6f4f53f697e287 Mon Sep 17 00:00:00 2001 From: dvub Date: Wed, 18 Dec 2024 18:29:57 -0800 Subject: [PATCH] remove unncessary assets --- .github/workflows/build.yml | 1 + README.md | 10 +-- gui/app/favicon.ico | Bin 25931 -> 0 bytes gui/app/globals.css | 4 +- gui/app/layout.tsx | 38 +++------ gui/app/page.tsx | 163 +++++++++++++++++++++++------------- gui/next.config.ts | 8 +- gui/package.json | 2 +- gui/public/file.svg | 1 - gui/public/globe.svg | 1 - gui/public/next.svg | 1 - gui/public/vercel.svg | 1 - gui/public/window.svg | 1 - gui/tsconfig.json | 2 + 14 files changed, 129 insertions(+), 104 deletions(-) delete mode 100644 gui/app/favicon.ico delete mode 100644 gui/public/file.svg delete mode 100644 gui/public/globe.svg delete mode 100644 gui/public/next.svg delete mode 100644 gui/public/vercel.svg delete mode 100644 gui/public/window.svg diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3be8617..67c7e81 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -75,6 +75,7 @@ jobs: # it needs to be cross compiled targets: ${{ matrix.cross-target }} + # i have no idea why this needs to be here, the macos version just wouldn't build without it - name: Add correct macos target if: startsWith(matrix.os, 'macos') run: rustup target add x86_64-apple-darwin diff --git a/README.md b/README.md index 26128ce..df738ba 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,3 @@ -# Circle Of 5ths +# MIDIOMETRY -## Building - -After installing [Rust](https://rustup.rs/), you can compile Circle Of 5ths as follows: - -```shell -cargo xtask bundle circle_of_5ths --release -``` +This plugin is really quite cool! diff --git a/gui/app/favicon.ico b/gui/app/favicon.ico deleted file mode 100644 index 718d6fea4835ec2d246af9800eddb7ffb276240c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 25931 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 LrJugUA?W`A8`#=m diff --git a/gui/app/globals.css b/gui/app/globals.css index 9e075f4..50ef114 100644 --- a/gui/app/globals.css +++ b/gui/app/globals.css @@ -1,7 +1,7 @@ @tailwind base; @tailwind components; @tailwind utilities; - +/* :root { --background: #ffffff; --foreground: #171717; @@ -14,7 +14,7 @@ } } -/* + body { color: var(--foreground); background: var(--background); diff --git a/gui/app/layout.tsx b/gui/app/layout.tsx index f7fa87e..d2e40b9 100644 --- a/gui/app/layout.tsx +++ b/gui/app/layout.tsx @@ -1,34 +1,16 @@ -import type { Metadata } from "next"; -import { Geist, Geist_Mono } from "next/font/google"; -import "./globals.css"; +import { Inter } from 'next/font/google'; +import './globals.css'; -const geistSans = Geist({ - variable: "--font-geist-sans", - subsets: ["latin"], -}); - -const geistMono = Geist_Mono({ - variable: "--font-geist-mono", - subsets: ["latin"], -}); - -export const metadata: Metadata = { - title: "Create Next App", - description: "Generated by create next app", -}; +const inter = Inter({ variable: '--font-inter', subsets: ['latin'] }); export default function RootLayout({ - children, + children, }: Readonly<{ - children: React.ReactNode; + children: React.ReactNode; }>) { - return ( - - - {children} - - - ); + return ( + + {children} + + ); } diff --git a/gui/app/page.tsx b/gui/app/page.tsx index 6216408..4db4457 100644 --- a/gui/app/page.tsx +++ b/gui/app/page.tsx @@ -2,34 +2,73 @@ import React, { useEffect, useRef, useState } from 'react'; +const NOTE_ON = 144; +const NOTE_OFF = 128; +const NOTE_NAMES = [ + 'C', + 'G', + 'D', + 'A', + 'E', + 'B', + 'F#/Gb', + 'C#/Db', + 'Ab', + 'Eb', + 'Bb', + 'F', +]; +// https://colorkit.co/palette/00202e-003f5c-2c4875-8a508f-bc5090-ff6361-ff8531-ffa600-ffd380/ +// #ffadad, #ffd6a5, #fdffb6, #caffbf, #9bf6ff, #a0c4ff, #bdb2ff and #ffc6ff. +const COLORS = [ + '255,173,173', + '255,214,165', + '253,255,182', + '202,255,191', + '155,246,255', + '160,196,255', + '189,178,255', + '255,198,255', +]; + export default function Home() { const [notes, setNotes] = useState([]); useEffect(() => { - window.onPluginMessage = (message: number[]) => { - const velocity = message[2]; + const noteStatus = message[0]; + + // TODO: + // make use of velocity! + //const velocity = message[2]; const noteNumber = message[1]; - if (velocity > 0) { + if (noteStatus === NOTE_ON) { console.log('NOTE ON:', message); setNotes((prevState) => [...prevState, noteNumber]); - } else { + } else if (noteStatus === NOTE_OFF) { console.log('NOTE OFF:', message); // 0 velocity = note OFF setNotes((prevState) => prevState.filter((note) => note !== noteNumber) ); } - - //const event = new CustomEvent('pluginMessage', { detail: message }); - // window.dispatchEvent(event); }; }, []); return ( -
+
+ {/* --- background title text thingy --- */} +
+

MIDIOMETRY

+
+ + {/* --- credits! --- */} +
+

a plugin by dvub

+
+
); @@ -40,83 +79,87 @@ const Dodecagon = (props: { notes: number[] }) => { const canvasRef = useRef(null); - useEffect(() => {}, []); - useEffect(() => { // --- init setup --- // - const refCurrent = canvasRef.current!; const ctx = refCurrent.getContext('2d')!; ctx.clearRect(0, 0, refCurrent.width, refCurrent.height); + ctx.textAlign = 'center'; const centerX = refCurrent.width / 2; const centerY = refCurrent.height / 2; const radius = Math.min(refCurrent.width, refCurrent.height) * 0.33; + // this has to be here because we need canvas context for center coords and radius const coordinates = generateCoordinates( { x: centerX, y: centerY }, radius ); - const noteNames = [ - 'C', - 'G', - 'D', - 'A', - 'E', - 'B', - 'F#/Gb', - 'C#/Db', - 'Ab', - 'Eb', - 'Bb', - 'F', - ]; - - ctx.lineWidth = 2; - - ctx.strokeStyle = `rgba(0,0,0,1)`; - ctx.arc(centerX, centerY, radius, 0, Math.PI * 2); - // ctx.stroke(); - - coordinates.forEach((coordinate, index) => { - const text = noteNames[index]; - ctx.fillText(text, coordinate.x + 10, coordinate.y); + + // --- add note names in slightly larger circle --- // + const textOffset = 25; + generateCoordinates( + { x: centerX, y: centerY }, + radius + textOffset + ).forEach((coordinate, index) => { + const text = NOTE_NAMES[index]; + ctx.fillStyle = 'white'; + ctx.fillText(text, coordinate.x, coordinate.y); }); - for (let i = 0; i < notes.length - 1; i++) { - const note = notes[i]; - const normalizedNote = note % 12; + // --- draw dots to represent when notes are played --- // + notes.map((note) => { + const octave = Math.floor(note / 12); - const result = coordinates.find( - (x, i) => (i * 7) % 12 === normalizedNote - )!; + const resultCoordinates = findNoteCoordinates(note, coordinates); + const radius = octave / 10; - const nextNote = notes[i + 1]; - const nextIndex = nextNote % 12; + ctx.strokeStyle = `rgba(255,255,255,0.25)`; + ctx.lineWidth = 1; - const result2 = coordinates.find( - (x, i) => (i * 7) % 12 === nextIndex - )!; + ctx.beginPath(); + ctx.arc( + resultCoordinates.x, + resultCoordinates.y, + 25 * radius, + 0, + Math.PI * 2 + ); + ctx.stroke(); + }); + + // --- CONNECTING LINES --- // + const lineOpacity = 0.5; + const lineWidth = 2; + + for (let i = 0; i < notes.length - 1; i++) { + // this is a stupidly overcomplicated wawy to do shit + const results = Array(2) + .fill(0) + .map((_, j) => { + const note = notes[i + j]; + return findNoteCoordinates(note, coordinates); + }); + + ctx.lineWidth = lineWidth; + + const color = + COLORS[Math.abs(notes[i] - notes[i + 1]) % COLORS.length]; + ctx.strokeStyle = `rgba(${color},${lineOpacity}`; ctx.beginPath(); - ctx.strokeStyle = `rgba(0,0,0,${0.25}`; - ctx.moveTo(result.x, result.y); - ctx.lineTo(result2.x, result2.y); + ctx.moveTo(results[0].x, results[0].y); + ctx.lineTo(results[1].x, results[1].y); ctx.stroke(); } }, [notes]); return ( -
- +
+
); }; @@ -134,3 +177,11 @@ function generateCoordinates( } return coordinates; } + +function findNoteCoordinates( + note: number, + coordinates: Array<{ x: number; y: number }> +) { + const normalizedNote = note % 12; + return coordinates.find((_, i) => (i * 7) % 12 === normalizedNote)!; +} diff --git a/gui/next.config.ts b/gui/next.config.ts index 1f7ee96..67aad76 100644 --- a/gui/next.config.ts +++ b/gui/next.config.ts @@ -1,9 +1,9 @@ -import type { NextConfig } from "next"; +import type { NextConfig } from 'next'; const nextConfig: NextConfig = { - /* config options here */ - output: 'export', - distDir: '../assets' + /* config options here */ + output: 'export', + distDir: '../assets', }; export default nextConfig; diff --git a/gui/package.json b/gui/package.json index bdd8e3a..c6206d9 100644 --- a/gui/package.json +++ b/gui/package.json @@ -3,7 +3,7 @@ "version": "0.1.0", "private": true, "scripts": { - "dev": "next dev --turbopack", + "dev": "next dev --turbopack", "build": "next build", "start": "next start", "lint": "next lint" diff --git a/gui/public/file.svg b/gui/public/file.svg deleted file mode 100644 index 004145c..0000000 --- a/gui/public/file.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/gui/public/globe.svg b/gui/public/globe.svg deleted file mode 100644 index 567f17b..0000000 --- a/gui/public/globe.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/gui/public/next.svg b/gui/public/next.svg deleted file mode 100644 index 5174b28..0000000 --- a/gui/public/next.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/gui/public/vercel.svg b/gui/public/vercel.svg deleted file mode 100644 index 7705396..0000000 --- a/gui/public/vercel.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/gui/public/window.svg b/gui/public/window.svg deleted file mode 100644 index b2b2a44..0000000 --- a/gui/public/window.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/gui/tsconfig.json b/gui/tsconfig.json index d1cc6b7..ed7cfc9 100644 --- a/gui/tsconfig.json +++ b/gui/tsconfig.json @@ -32,7 +32,9 @@ "**/*.ts", "**/*.tsx", ".next/types/**/*.ts", + // "dist/types/**/*.ts", "next-env.d.ts", + // "../assets/types/**/*.ts" "dist/types/**/*.ts" ], "exclude": [