From: Leighton Wallace Date: Tue, 26 Nov 2013 08:35:48 +0000 (-0800) Subject: Fade in/out for all automata X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=ea4abd09b42427238041d04ee572d09133434705;p=SugarCubes.git Fade in/out for all automata --- diff --git a/L8onWallace.pde b/L8onWallace.pde index eddf375..fc4bac0 100644 --- a/L8onWallace.pde +++ b/L8onWallace.pde @@ -2,28 +2,33 @@ class L8onLife extends SCPattern { // Controls the rate of life algorithm ticks, in milliseconds private BasicParameter rateParameter = new BasicParameter("DELAY", 112.5, 0.0, 1000.0); // Controls the probability of a mutation in the cycleOfLife - private BasicParameter randomParameter = new BasicParameter("RAND", 0.000000011, 0.0, 0.1); - // Controls the brightness of dead cubes. - private BasicParameter deadParameter = new BasicParameter("DEAD", 25.0, 0.0, 100.0); + private BasicParameter mutationParameter = new BasicParameter("MUT", 0.000000011, 0.0, 0.1); // Controls the saturation. private BasicParameter saturationParameter = new BasicParameter("SAT", 90.0, 0.0, 100.0); public final double MIN_ALIVE_PROBABILITY = 0.2; public final double MAX_ALIVE_PROBABILITY = 0.9; - private final SawLFO cubePos = new SawLFO(0, model.cubes.size(), 2500); + public final float MAX_ALIVE_BRIGHTNESS = 90.0; + + private final SawLFO cubePos = new SawLFO(0, model.cubes.size(), 4000); class CubeState { // Index of cube in glucose.model.cubes public Integer index; // Boolean which describes if cube is alive. public boolean alive; + // Boolean which describes if strip was just changed; + public boolean just_changed; + // Current brightness + public float current_brightness; // List of this cubes neighbors public List neighbors; - public CubeState(Integer index, boolean alive, List neighbors) { + public CubeState(Integer index, boolean alive, float current_brightness, List neighbors) { this.index = index; this.alive = alive; + this.current_brightness = current_brightness; this.neighbors = neighbors; } } @@ -49,8 +54,7 @@ class L8onLife extends SCPattern { new_lives = new ArrayList(); addParameter(rateParameter); - addParameter(randomParameter); - addParameter(deadParameter); + addParameter(mutationParameter); addParameter(saturationParameter); addModulator(cubePos).trigger(); } @@ -67,9 +71,9 @@ class L8onLife extends SCPattern { cube_state = this.cube_states.get(i); if(shouldLightCube(cube_state)) { - lightLiveCube(cube, i); + lightLiveCube(cube, cube_state, deltaMs); } else { - lightDeadCube(cube, i); + lightDeadCube(cube, cube_state, deltaMs); } i++; @@ -86,30 +90,52 @@ class L8onLife extends SCPattern { } } - public void lightLiveCube(Cube cube, Integer index) { - float cube_dist = LXUtils.wrapdistf((float) index, cubePos.getValuef(), model.cubes.size()); + public void lightLiveCube(Cube cube, CubeState cube_state, double deltaMs) { + float cube_dist = LXUtils.wrapdistf((float) cube_state.index, cubePos.getValuef(), model.cubes.size()); float hv = (cube_dist / model.cubes.size()) * 360; + float bv = cube_state.current_brightness; + + if(!cube_state.just_changed || deltaMs >= rateParameter.getValuef()) { + float bright_prop = min(((float) time_since_last_run / rateParameter.getValuef()), 1.0); + bv = min(MAX_ALIVE_BRIGHTNESS, bright_prop * MAX_ALIVE_BRIGHTNESS); + + if(cube_state.current_brightness < bv) { + cube_state.current_brightness = bv; + } else { + bv = cube_state.current_brightness; + } + } for (LXPoint p : cube.points) { colors[p.index] = lx.hsb( hv, saturationParameter.getValuef(), - 75 + bv ); } } - public void lightDeadCube(Cube cube, Integer index) { - float cube_dist = LXUtils.wrapdistf((float) index, cubePos.getValuef(), model.cubes.size()); - float dist_proportion = (cube_dist / (float) model.cubes.size()); - float hv = dist_proportion * 360; - float dead_bright = deadParameter.getValuef() * dist_proportion; + public void lightDeadCube(Cube cube, CubeState cube_state, double deltaMs) { + float cube_dist = LXUtils.wrapdistf((float) cube_state.index, cubePos.getValuef(), model.cubes.size()); + float hv = (cube_dist / (float) model.cubes.size()) * 360; + float bv = cube_state.current_brightness; + + if(!cube_state.just_changed || deltaMs >= rateParameter.getValuef()) { + float bright_prop = 1.0 - min(((float) time_since_last_run / rateParameter.getValuef()), 1.0); + bv = max(0.0, bright_prop * MAX_ALIVE_BRIGHTNESS); + + if(cube_state.current_brightness > bv) { + cube_state.current_brightness = bv; + } else { + bv = cube_state.current_brightness; + } + } for (LXPoint p : cube.points) { colors[p.index] = lx.hsb( hv, saturationParameter.getValuef(), - dead_bright + bv ); } } @@ -130,12 +156,13 @@ class L8onLife extends SCPattern { boolean alive = false; CubeState cube_state; this.cube_states = new ArrayList(); + float current_brightness = 0.0; Integer i = 0; - for (Cube c : model.cubes) { + for (Cube c : model.cubes) { neighbors = findCubeNeighbors(c, i); alive = true; - cube_state = new CubeState(i, alive, neighbors); + cube_state = new CubeState(i, alive, current_brightness, neighbors); this.cube_states.add(cube_state); ++i; } @@ -174,6 +201,7 @@ class L8onLife extends SCPattern { // Respect rate parameter. if(time_since_last_run < rateParameter.getValuef()) { any_changes_this_run = true; + cube_state.just_changed = false; return cube_state.alive; } else { boolean new_life = cycleOfLife(cube_state); @@ -213,11 +241,12 @@ class L8onLife extends SCPattern { } } - if(mutation <= randomParameter.getValuef()) { + if(mutation <= mutationParameter.getValuef()) { after_alive = !after_alive; } if(before_alive != after_alive) { + cube_state.just_changed = true; any_changes_this_run = true; } @@ -240,25 +269,35 @@ class L8onLife extends SCPattern { } class L8onAutomata extends SCPattern { - // Controls the probability of a mutation in the cycleOfStripperLife - private BasicParameter randomParameter = new BasicParameter("RAND", 0.000000011, 0.0, 0.1); // Controls the rate of life algorithm ticks, in milliseconds private BasicParameter rateParameter = new BasicParameter("DELAY", 75.0, 0.0, 1000.0); + // Controls the probability of a mutation in the cycleOfStripperLife + private BasicParameter mutationParameter = new BasicParameter("MUT", 0.000000011, 0.0, 0.1); + // Controls the rate of life algorithm ticks, in milliseconds + private BasicParameter saturationParameter = new BasicParameter("SAT", 90.0, 0.0, 100.0); - private final SawLFO pointPos = new SawLFO(0, model.points.size(), 3000); + private final SawLFO pointPos = new SawLFO(0, model.points.size(), 8000); public final double MIN_ALIVE_PROBABILITY = 0.2; public final double MAX_ALIVE_PROBABILITY = 0.9; + public final float MAX_ALIVE_BRIGHTNESS = 90.0; + class PointState { // Index of cube in glucose.model.cubes public Integer index; // Boolean which describes if cube is alive. public boolean alive; + // Boolean which describes if strip was just changed; + public boolean just_changed; + // Current brightness + public float current_brightness; - public PointState(Integer index, boolean alive) { + public PointState(Integer index, boolean alive, float current_brightness) { this.index = index; this.alive = alive; + this.current_brightness = current_brightness; + this.just_changed = false; } } @@ -283,20 +322,21 @@ class L8onAutomata extends SCPattern { any_changes_this_run = false; new_states = new ArrayList(); - addParameter(randomParameter); + addParameter(mutationParameter); addParameter(rateParameter); + addParameter(saturationParameter); addModulator(pointPos).trigger(); } private void initPointStates() { - boolean alive = false; + boolean alive = true; PointState point_state; this.point_states = new ArrayList(); Integer i = 0; + float current_brightness = 0.0; for (LXPoint p : model.points) { - alive = true; - point_state = new PointState(i, alive); + point_state = new PointState(i, alive, current_brightness); this.point_states.add(point_state); ++i; } @@ -314,11 +354,10 @@ class L8onAutomata extends SCPattern { point_state = this.point_states.get(i); if(shouldLightPoint(point_state)) { - lightLivePoint(p, i); + lightLivePoint(p, point_state, deltaMs); } else { - lightDeadPoint(p, i); + lightDeadPoint(p, point_state, deltaMs); } - i++; } @@ -333,22 +372,49 @@ class L8onAutomata extends SCPattern { } } - public void lightLivePoint(LXPoint p, Integer index) { - float point_dist = LXUtils.wrapdistf((float) index, pointPos.getValuef(), model.points.size()); + public void lightLivePoint(LXPoint p, PointState point_state, double deltaMs) { + float point_dist = LXUtils.wrapdistf((float) point_state.index, pointPos.getValuef(), model.points.size()); float hv = (point_dist / model.points.size()) * 360; + float bv = point_state.current_brightness; + + if(deltaMs >= rateParameter.getValuef() || !point_state.just_changed) { + float bright_prop = min(((float) time_since_last_run / rateParameter.getValuef()), 1.0); + bv = min(MAX_ALIVE_BRIGHTNESS, bright_prop * MAX_ALIVE_BRIGHTNESS); + + if(point_state.current_brightness < bv) { + point_state.current_brightness = bv; + } else { + bv = point_state.current_brightness; + } + } colors[p.index] = lx.hsb( hv, - 90, - 80 + saturationParameter.getValuef(), + bv ); } - public void lightDeadPoint(LXPoint p, Integer index) { + public void lightDeadPoint(LXPoint p, PointState point_state, double deltaMs) { + float point_dist = LXUtils.wrapdistf((float) point_state.index, pointPos.getValuef(), model.points.size()); + float hv = (point_dist / model.points.size()) * 360; + float bv = point_state.current_brightness; + + if(!point_state.just_changed || deltaMs >= rateParameter.getValuef()) { + float bright_prop = 1.0 - min(((float) time_since_last_run / rateParameter.getValuef()), 1.0); + bv = max(0.0, bright_prop * MAX_ALIVE_BRIGHTNESS); + + if(point_state.current_brightness > bv) { + point_state.current_brightness = bv; + } else { + bv = point_state.current_brightness; + } + } + colors[p.index] = lx.hsb( - 120, - 0, - 0 + hv, + saturationParameter.getValuef(), + bv ); } @@ -356,6 +422,7 @@ class L8onAutomata extends SCPattern { // Respect rate parameter. if(time_since_last_run < rateParameter.getValuef()) { any_changes_this_run = true; + point_state.just_changed = false; return point_state.alive; } else { boolean new_state = cycleOfAutomata(point_state); @@ -386,32 +453,30 @@ class L8onAutomata extends SCPattern { } } - if(mutation < randomParameter.getValuef()) { + if(mutation < mutationParameter.getValuef()) { after_alive = !after_alive; } if(before_alive != after_alive) { any_changes_this_run = true; + point_state.just_changed = true; } return after_alive; } public int countLiveNeighbors(PointState point_state) { - Integer index = point_state.index; - PointState before_neighbor; - PointState after_neighbor; - int count = 0; - if (index > 0) { - before_neighbor = point_states.get(index - 1); + + if (point_state.index > 0) { + PointState before_neighbor = point_states.get(point_state.index - 1); if(before_neighbor.alive) { count++; } } - if (index < (point_states.size() - 1)) { - after_neighbor = point_states.get(index + 1); + if (point_state.index < (point_states.size() - 1)) { + PointState after_neighbor = point_states.get(point_state.index + 1); if(after_neighbor.alive) { count++; } @@ -437,24 +502,25 @@ class L8onAutomata extends SCPattern { for (PointState point_state: this.point_states) { point_state.alive = (Math.random() <= prob); + point_state.just_changed = true; } } } -class L8onStrips extends SCPattern { +class L8onStripLife extends SCPattern { // Controls the rate of life algorithm ticks, in milliseconds private BasicParameter rateParameter = new BasicParameter("DELAY", 112.5, 1.0, 1000.0); // Controls the probability of a mutation in the cycleOfStripperLife - private BasicParameter randomParameter = new BasicParameter("RAND", 0.000000011, 0.0, 0.1); + private BasicParameter mutationParameter = new BasicParameter("MUT", 0.000000011, 0.0, 0.1); // Controls the saturation. private BasicParameter saturationParameter = new BasicParameter("SAT", 90.0, 0.0, 100.0); public final double MIN_ALIVE_PROBABILITY = 0.4; public final double MAX_ALIVE_PROBABILITY = 0.9; - public final float MAX_ALIVE_BRIGHTNESS = 95.0; + public final float MAX_ALIVE_BRIGHTNESS = 90.0; - private final SawLFO stripPos = new SawLFO(0, model.strips.size(), 3000); + private final SawLFO stripPos = new SawLFO(0, model.strips.size(), 8000); class StripState { // Index of strip in glucose.model.strips @@ -471,7 +537,9 @@ class L8onStrips extends SCPattern { public StripState(Integer index, boolean alive, float current_brightness, List neighbors) { this.index = index; this.alive = alive; + this.current_brightness = current_brightness; this.neighbors = neighbors; + this.just_changed = false; } } @@ -484,7 +552,7 @@ class L8onStrips extends SCPattern { // Hold the new lives private List new_lives; - public L8onStrips(GLucose glucose) { + public L8onStripLife(GLucose glucose) { super(glucose); //Print debug info about the strips. @@ -497,7 +565,7 @@ class L8onStrips extends SCPattern { new_lives = new ArrayList(); addParameter(rateParameter); - addParameter(randomParameter); + addParameter(mutationParameter); addParameter(saturationParameter); addModulator(stripPos).trigger(); @@ -534,28 +602,19 @@ class L8onStrips extends SCPattern { } public void lightLiveStrip(Strip strip, StripState strip_state, double deltaMs) { - Integer index = strip_state.index; - float strip_dist = LXUtils.wrapdistf((float) index, stripPos.getValuef(), model.strips.size()); + float strip_dist = LXUtils.wrapdistf((float) strip_state.index, stripPos.getValuef(), model.strips.size()); float hv = (strip_dist / model.strips.size()) * 360; float bv = strip_state.current_brightness; - if(!strip_state.just_changed || deltaMs >= rateParameter.getValuef()) { + if(deltaMs >= rateParameter.getValuef() || !strip_state.just_changed) { float bright_prop = min(((float) time_since_last_run / rateParameter.getValuef()), 1.0); bv = min(MAX_ALIVE_BRIGHTNESS, bright_prop * MAX_ALIVE_BRIGHTNESS); - if(index == 100) { - print("live prop: " + bright_prop + " bv: " + bv + " current: " + strip_state.current_brightness + "\n"); - } - if(strip_state.current_brightness < bv) { strip_state.current_brightness = bv; } else { bv = strip_state.current_brightness; } - - if(index == 100) { - print("live bv: " + bv + " current: " + strip_state.current_brightness + "\n"); - } } for (LXPoint p : strip.points) { @@ -568,29 +627,19 @@ class L8onStrips extends SCPattern { } public void lightDeadStrip(Strip strip, StripState strip_state, double deltaMs) { - Integer index = strip_state.index; - float strip_dist = LXUtils.wrapdistf((float) index, stripPos.getValuef(), model.strips.size()); - float dist_proportion = (strip_dist / (float) model.strips.size()); - float hv = dist_proportion * 360; - float bv = strip_state.current_brightness; + float strip_dist = LXUtils.wrapdistf((float) strip_state.index, stripPos.getValuef(), model.strips.size()); + float hv = (strip_dist / model.strips.size()) * 360; + float bv = strip_state.current_brightness; if(!strip_state.just_changed || deltaMs >= rateParameter.getValuef()) { float bright_prop = 1.0 - min(((float) time_since_last_run / rateParameter.getValuef()), 1.0); bv = max(0.0, bright_prop * MAX_ALIVE_BRIGHTNESS); - if(index == 100) { - print("dead prop: " + bright_prop + " bv: " + bv + " current: " + strip_state.current_brightness + "\n"); - } - if(strip_state.current_brightness > bv) { strip_state.current_brightness = bv; } else { bv = strip_state.current_brightness; } - - if(index == 100) { - print("dead bv: " + bv + " current: " + strip_state.current_brightness + "\n"); - } } for (LXPoint p : strip.points) { @@ -613,7 +662,7 @@ class L8onStrips extends SCPattern { private void initStripStates() { List neighbors; boolean alive = false; - float current_brightness; + float current_brightness = 0.0; StripState strip_state; this.strip_states = new ArrayList(); Integer i = 0; @@ -623,7 +672,6 @@ class L8onStrips extends SCPattern { for (Strip strip : model.strips) { neighbors = findStripNeighbors(strip, i); alive = true; - current_brightness = 0.0; strip_state = new StripState(i, alive, current_brightness, neighbors); this.strip_states.add(strip_state); @@ -643,11 +691,7 @@ class L8onStrips extends SCPattern { for (StripState strip_state : this.strip_states) { strip_state.alive = (Math.random() <= prob); - if(strip_state.alive) { - strip_state.current_brightness = 0; - } else{ - strip_state.current_brightness = MAX_ALIVE_BRIGHTNESS; - } + strip_state.just_changed = true; } } @@ -695,7 +739,6 @@ class L8onStrips extends SCPattern { } public boolean cycleOfStripperLife(StripState strip_state) { - Integer index = strip_state.index; Integer alive_neighbor_count = countLiveNeighbors(strip_state); boolean before_alive = strip_state.alive; boolean after_alive = before_alive; @@ -716,7 +759,7 @@ class L8onStrips extends SCPattern { } } - if(mutation < randomParameter.getValuef()) { + if(mutation < mutationParameter.getValuef()) { after_alive = !after_alive; } diff --git a/SugarCubes.pde b/SugarCubes.pde index bef521d..c14786f 100644 --- a/SugarCubes.pde +++ b/SugarCubes.pde @@ -74,9 +74,9 @@ LXPattern[] patterns(GLucose glucose) { new JackieDots(glucose), // L8on - new L8onLife(glucose), new L8onAutomata(glucose), - new L8onStrips(glucose), + new L8onLife(glucose), + new L8onStripLife(glucose), // Vincent new VSTowers(glucose),