From 378d3d65c0c6bebbfb73416e1de2fed214a4fde3 Mon Sep 17 00:00:00 2001 From: Samson Yeung Date: Sat, 16 Jan 2021 18:07:34 -0800 Subject: [PATCH 1/3] Add Syphon back in and update for Entwined model. --- oldlx/Trees/Config.java | 2 +- oldlx/Trees/Patterns_MattStone.pde | 17 ++++++++++------- oldlx/Trees/Trees.pde | 2 +- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/oldlx/Trees/Config.java b/oldlx/Trees/Config.java index 34f85e34..8e03c523 100644 --- a/oldlx/Trees/Config.java +++ b/oldlx/Trees/Config.java @@ -3,7 +3,7 @@ final class Config { static final boolean autoplayBMSet = false; static final boolean enableAPC40 = false; - static final boolean enableSoundSyphon = false; + static final boolean enableSoundSyphon = true; static final boolean enableOutputMinitree = false; static final boolean enableOutputBigtree = true; diff --git a/oldlx/Trees/Patterns_MattStone.pde b/oldlx/Trees/Patterns_MattStone.pde index 2a381f28..742aed24 100644 --- a/oldlx/Trees/Patterns_MattStone.pde +++ b/oldlx/Trees/Patterns_MattStone.pde @@ -19,7 +19,7 @@ class SyphonPattern extends TSPattern { super(lx); addParameter(getWidth); addParameter(mode); - client = new SyphonClient(applet, "Modul8", "Main View"); + client = new SyphonClient(applet); xpoints = new int[model.baseCubes.size()]; ypoints = new int[model.baseCubes.size()]; } @@ -35,11 +35,11 @@ class SyphonPattern extends TSPattern { } } - private int mode1(Cube cube, int cubeIdx) { + private int mode1(BaseCube cube, int cubeIdx) { return weighted_get(imgbuffer, int(this.buffWidth * (cube.transformedTheta / 360.0)), this.buffHeight - int(this.buffHeight * (cube.transformedY/model.yMax)), getWidth.getValuei()); } - - private int mode2(Cube cube, int cubeIdx) { + + private int mode2(BaseCube cube, int cubeIdx) { boolean reverse = false; if (cube.transformedTheta > (360.0 / 2)) reverse = true; @@ -48,13 +48,14 @@ class SyphonPattern extends TSPattern { } return weighted_get(imgbuffer, int(this.buffWidth * ((cube.transformedTheta * 2.0) / 360.0)), this.buffHeight - int(this.buffHeight * (cube.transformedY/model.yMax)), getWidth.getValuei()); } - - private int mode3(Cube cube, int cubeIdx) { + + private int mode3(BaseCube cube, int cubeIdx) { return weighted_get(imgbuffer, xpoints[cubeIdx], ypoints[cubeIdx], getWidth.getValuei()); } public void run(double deltaMs) { if (client.available()) { + System.out.println("syphon client available!\r"); buffer = client.getGraphics(buffer); imgbuffer = buffer.get(); @@ -67,7 +68,7 @@ class SyphonPattern extends TSPattern { int c = 0; // NOTE: This is no longer correct because we need to account // for BaseCube, not bothering to fix because syphon is required - for (Cube cube : model.cubes) { + for (BaseCube cube : model.baseCubes) { switch (mode.getValuei()) { case 1: c = mode1(cube, cubeIdx); break; @@ -80,6 +81,8 @@ class SyphonPattern extends TSPattern { setColor(cube, c); cubeIdx++; } + } else { + System.out.println("No syphon client available during run().\r"); } } diff --git a/oldlx/Trees/Trees.pde b/oldlx/Trees/Trees.pde index 5e60cf73..27409566 100644 --- a/oldlx/Trees/Trees.pde +++ b/oldlx/Trees/Trees.pde @@ -121,7 +121,7 @@ class ProcessingEngine extends Engine { void addPatterns(ArrayList patterns) { super.addPatterns(patterns); if (Config.enableSoundSyphon) { - try { patterns.add(new SyphonPattern(lx, Trees.this)); } catch (Throwable e) {} + try { patterns.add(new SyphonPattern(lx, Trees.this)); } catch (Throwable e) { throw e;} } } } From bf1d34851862c030f4d616304c0466bf0643cb0d Mon Sep 17 00:00:00 2001 From: Samson Yeung Date: Sun, 17 Jan 2021 19:20:50 -0800 Subject: [PATCH 2/3] Trailing whitespace fixes. --- oldlx/Trees/Patterns_MattStone.pde | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/oldlx/Trees/Patterns_MattStone.pde b/oldlx/Trees/Patterns_MattStone.pde index 742aed24..ebd6273d 100644 --- a/oldlx/Trees/Patterns_MattStone.pde +++ b/oldlx/Trees/Patterns_MattStone.pde @@ -27,10 +27,10 @@ class SyphonPattern extends TSPattern { void generateMap(int buffWidth, int buffHeight) { this.xscale = buffWidth / model.xRange; this.yscale = buffHeight / model.yRange; - int cubeIdx = 0; + int cubeIdx = 0; for (BaseCube cube : model.baseCubes) { xpoints[cubeIdx] = int((cube.cx - model.xMin) * this.xscale); - ypoints[cubeIdx] = buffHeight - int((cube.cy - model.yMin) * this.yscale); + ypoints[cubeIdx] = buffHeight - int((cube.cy - model.yMin) * this.yscale); cubeIdx++; } } @@ -44,7 +44,7 @@ class SyphonPattern extends TSPattern { if (cube.transformedTheta > (360.0 / 2)) reverse = true; if (reverse) { - return weighted_get(imgbuffer, int(this.buffWidth * ((((360.0 - cube.transformedTheta) * 2)) / 360.0)), this.buffHeight - int(this.buffHeight * (cube.transformedY/model.yMax)), getWidth.getValuei()); + return weighted_get(imgbuffer, int(this.buffWidth * ((((360.0 - cube.transformedTheta) * 2)) / 360.0)), this.buffHeight - int(this.buffHeight * (cube.transformedY/model.yMax)), getWidth.getValuei()); } return weighted_get(imgbuffer, int(this.buffWidth * ((cube.transformedTheta * 2.0) / 360.0)), this.buffHeight - int(this.buffHeight * (cube.transformedY/model.yMax)), getWidth.getValuei()); } @@ -52,7 +52,7 @@ class SyphonPattern extends TSPattern { private int mode3(BaseCube cube, int cubeIdx) { return weighted_get(imgbuffer, xpoints[cubeIdx], ypoints[cubeIdx], getWidth.getValuei()); } - + public void run(double deltaMs) { if (client.available()) { System.out.println("syphon client available!\r"); @@ -73,11 +73,11 @@ class SyphonPattern extends TSPattern { case 1: c = mode1(cube, cubeIdx); break; case 2: c = mode2(cube, cubeIdx); - break; + break; case 3: c = mode3(cube, cubeIdx); - break; + break; } - + setColor(cube, c); cubeIdx++; } @@ -85,10 +85,10 @@ class SyphonPattern extends TSPattern { System.out.println("No syphon client available during run().\r"); } } - + private boolean restoreThreaded = false; private int syphonCount = 0; - + public void onActive() { if (syphonCount == 0) { if (restoreThreaded = lx.engine.isThreaded()) { @@ -96,9 +96,9 @@ class SyphonPattern extends TSPattern { lx.engine.setThreaded(false); } } - ++syphonCount; + ++syphonCount; } - + public void onInactive() { --syphonCount; if ((syphonCount == 0) && restoreThreaded) { From 0e7d073dddbe6a704994684757cc3f7503d72891 Mon Sep 17 00:00:00 2001 From: Samson Yeung Date: Sun, 17 Jan 2021 20:44:19 -0800 Subject: [PATCH 3/3] Disable Syphon pattern by default. --- oldlx/Trees/Config.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oldlx/Trees/Config.java b/oldlx/Trees/Config.java index 8e03c523..34f85e34 100644 --- a/oldlx/Trees/Config.java +++ b/oldlx/Trees/Config.java @@ -3,7 +3,7 @@ final class Config { static final boolean autoplayBMSet = false; static final boolean enableAPC40 = false; - static final boolean enableSoundSyphon = true; + static final boolean enableSoundSyphon = false; static final boolean enableOutputMinitree = false; static final boolean enableOutputBigtree = true;