0.4.7.1 bugfix affecting combinatorial geometrical transformations of…

… arbitrary multichannel signals (ie. [x,y,z])
dktr0 · Feb 1, 2024 · 0911993 · 0911993
1 parent a098092
commit 0911993
Show file tree

Hide file tree

Showing 6 changed files with 51,125 additions and 50,930 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # ChangeLog
 
+0.4.7.1:
+
+-bugfix affecting combinatorial geometrical transformations of arbitrary multichannel signals (ie. [x,y,z])
+
 0.4.7:
 
 -added smoothstep/smoothstepp

diff --git a/Makefile b/Makefile
@@ -34,11 +34,11 @@ clean:
 
 devBuild:
 	cabal --ghcjs --builddir=dev-result new-build all --disable-library-profiling --disable-documentation --ghcjs-options=-DGHCJS_GC_INTERVAL=60000
-	cp -f dev-result/build/x86_64-linux/ghcjs-8.6.0.1/punctual-0.4.7/x/punctual/build/punctual/punctual.jsexe/index.html .
-	cp -f dev-result/build/x86_64-linux/ghcjs-8.6.0.1/punctual-0.4.7/x/punctual/build/punctual/punctual.jsexe/rts.js .
-	cp -f dev-result/build/x86_64-linux/ghcjs-8.6.0.1/punctual-0.4.7/x/punctual/build/punctual/punctual.jsexe/lib.js .
-	cp -f dev-result/build/x86_64-linux/ghcjs-8.6.0.1/punctual-0.4.7/x/punctual/build/punctual/punctual.jsexe/out.js .
-	cp -f dev-result/build/x86_64-linux/ghcjs-8.6.0.1/punctual-0.4.7/x/punctual/build/punctual/punctual.jsexe/runmain.js .
+	cp -f dev-result/build/x86_64-linux/ghcjs-8.6.0.1/punctual-0.4.7.1/x/punctual/build/punctual/punctual.jsexe/index.html .
+	cp -f dev-result/build/x86_64-linux/ghcjs-8.6.0.1/punctual-0.4.7.1/x/punctual/build/punctual/punctual.jsexe/rts.js .
+	cp -f dev-result/build/x86_64-linux/ghcjs-8.6.0.1/punctual-0.4.7.1/x/punctual/build/punctual/punctual.jsexe/lib.js .
+	cp -f dev-result/build/x86_64-linux/ghcjs-8.6.0.1/punctual-0.4.7.1/x/punctual/build/punctual/punctual.jsexe/out.js .
+	cp -f dev-result/build/x86_64-linux/ghcjs-8.6.0.1/punctual-0.4.7.1/x/punctual/build/punctual/punctual.jsexe/runmain.js .
 
 devTest:
 	cabal --ghcjs new-test test:tests --disable-library-profiling --disable-documentation
@@ -50,8 +50,8 @@ buildBenchmark:
 	cabal --ghcjs --builddir=benchmark new-build punctual-benchmarks --disable-library-profiling --disable-documentation --ghcjs-options=-DGHCJS_GC_INTERVAL=60000
 
 runBenchmark:
-	node benchmark/build/x86_64-linux/ghcjs-8.6.0.1/punctual-0.4.7/b/punctual-benchmarks/build/punctual-benchmarks/punctual-benchmarks.jsexe/all.js
+	node benchmark/build/x86_64-linux/ghcjs-8.6.0.1/punctual-0.4.7.1/b/punctual-benchmarks/build/punctual-benchmarks/punctual-benchmarks.jsexe/all.js
 
 runBenchmarkInBrowser:
-	open benchmark/build/x86_64-linux/ghcjs-8.6.0.1/punctual-0.4.7/b/punctual-benchmarks/build/punctual-benchmarks/punctual-benchmarks.jsexe/index.html
+	open benchmark/build/x86_64-linux/ghcjs-8.6.0.1/punctual-0.4.7.1/b/punctual-benchmarks/build/punctual-benchmarks/punctual-benchmarks.jsexe/index.html
 
diff --git a/library-src/Sound/Punctual.hs b/library-src/Sound/Punctual.hs
@@ -52,7 +52,7 @@ new canvas = do
   punctualWebGL'' <- newIORef punctualWebGL'
   tNow <- getCurrentTime
   tempo' <- newIORef $ Tempo { time=tNow, freq=0.5, Data.Tempo.count=0 }
-  putStrLn "Punctual 0.4.7 initialization complete"
+  putStrLn "Punctual 0.4.7.1 initialization complete"
   pure $ Punctual {
     punctualWs = punctualWs',
     punctualWebGL = punctualWebGL'',

diff --git a/library-src/Sound/Punctual/FragmentShader.hs b/library-src/Sound/Punctual/FragmentShader.hs
@@ -359,10 +359,12 @@ graphToGLSL _ _ _ = return [constantFloat 0]
 
 multiToGLSL :: AlignHint -> GraphEnv -> [Graph] -> GLSL [GLSLExpr]
 multiToGLSL _ _ [] = return [constantFloat 0.0]
-multiToGLSL ah env xs = do
-  xs' <- mapM (graphToGLSL ah env) xs
+multiToGLSL ah env@(m,fxys) xs = do
+  xs' <- forM fxys $ \fxy -> concat <$> mapM (graphToGLSL ah (m,[fxy])) xs
+--  xs' <- mapM (graphToGLSL ah env) xs -- [ [spin 0 fx,spin 1 fx], [spin 0 fy, spin 1 fy]]
   xs'' <- mapM (align GLFloat) xs' -- ?? is this intermediate alignment to float necessary?
-  alignHint ah $ concat $ multi xs''
+  alignHint ah $ concat xs''
+--  alignHint ah $ concat $ multi xs''
 
 
 unaryFunctionWithPosition :: (GLSLExpr -> GLSLExpr -> GLSLExpr) -> AlignHint -> GraphEnv -> Graph -> GLSL [GLSLExpr]

diff --git a/out.js b/out.js
diff --git a/punctual.cabal b/punctual.cabal
@@ -1,5 +1,5 @@
 name:                punctual
-version:             0.4.7
+version:             0.4.7.1
 synopsis:            Live coding language
 description:         Please see README.md
 homepage:            http://github.com/dktr0/Punctual/blob/master/README.md