TheCloud/Digital
1
0
Fork 0
mirror of https://github.com/hneemann/Digital.git synced 2025-09-15 07:48:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

minor modification of the animation

Browse Source
This commit is contained in:
hneemann 2018-11-26 19:53:56 +01:00
parent 3527de0839
commit bac805fbea
4 changed files with 45 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/de/neemann/digital/draw/graphics/VectorFloat.java
View File

@ -131,6 +131,12 @@ public class VectorFloat implements VectorInterface {
return Objects.hash(x, y);
}
@Override
public String toString() {
return "(x=" + x
+ ", y=" + y
+ ')';
}
@Override
public Vector round() {

14
src/main/java/de/neemann/digital/fsm/FSMDemos.java
View File

@ -13,6 +13,20 @@ public final class FSMDemos {
private FSMDemos() {
}
/**
* Blink
*
* @return the fsm
*/
public static FSM blink() {
State off = new State("off");
State on = new State("on");
return new FSM(off, on)
.transition(on, off, null)
.transition(off, on, null);
}
/**
* Creates a debounced rotary switch decoder
*

20
src/main/java/de/neemann/digital/fsm/Movable.java
View File

@ -13,6 +13,11 @@ import de.neemann.digital.draw.graphics.VectorFloat;
* @param <A> the type of the implementing class
*/
public class Movable<A extends Movable> {
private static final float MASS = 50f;
private static final float FRICTION = 0.8f;
private static final float MAX_FORCE = 100000f;
private static final float MAX_FORCE_CHECK = (float) (MAX_FORCE / Math.sqrt(2));
private String values = "";
private VectorFloat position;
private transient VectorFloat speed;
@ -25,7 +30,7 @@ public class Movable<A extends Movable> {
public Movable() {
force = new VectorFloat(0, 0);
speed = new VectorFloat(0, 0);
position = new VectorFloat((float) Math.random() - 0.5f, (float) Math.random() - 0.5f).mul(100);
position = new VectorFloat(0, 0);
}
/**
@ -129,15 +134,20 @@ public class Movable<A extends Movable> {
/**
* Moves the element
*
* @param dt the time step
* @param dt the time step in ms
*/
public void move(int dt) {
if (Math.abs(force.getXFloat()) > MAX_FORCE_CHECK || Math.abs(force.getYFloat()) > MAX_FORCE_CHECK) {
double len = force.len();
if (len > MAX_FORCE)
force = force.norm().mul(MAX_FORCE);
}
if (speed == null)
speed = force.mul(dt / 200f);
speed = force.mul(dt / MASS);
else
speed = speed.add(force.mul(dt / 200f));
speed = speed.add(force.mul(dt / MASS));
setPos(position.add(speed.mul(dt / 1000f)));
speed = speed.mul(0.7f);
speed = speed.mul(FRICTION);
}
void setFSM(FSM fsm) {

17
src/main/java/de/neemann/digital/fsm/Transition.java
View File

@ -93,12 +93,15 @@ public class Transition extends Movable<Transition> {
public void setPos(VectorFloat position) {
if (fromState != toState) {
VectorFloat dist = fromState.getPos().sub(toState.getPos());
VectorFloat p = position.sub(fromState.getPos());
VectorFloat n = dist.getOrthogonal().norm();
float l = p.mul(n);
super.setPos(fromState.getPos().sub(dist.mul(0.5f)).add(n.mul(l)));
} else
super.setPos(position);
if (dist.getXFloat() != 0 || dist.getYFloat() != 0) {
VectorFloat p = position.sub(fromState.getPos());
VectorFloat n = dist.getOrthogonal().norm();
float l = p.mul(n);
super.setPos(fromState.getPos().sub(dist.mul(0.5f)).add(n.mul(l)));
return;
}
}
super.setPos(position);
}
/**
@ -152,7 +155,7 @@ public class Transition extends Movable<Transition> {
*/
void initPos() {
setPos(fromState.getPos().add(toState.getPos()).mul(0.5f)
.add(new VectorFloat((float) Math.random() - 0.5f, (float) Math.random() - 0.5f).mul(30)));
.add(new VectorFloat((float) Math.random() - 0.5f, (float) Math.random() - 0.5f).mul(2)));
}
/**