Oshgnacknak/AuD-2021-H07-Gruphi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pass factory via constructor

Browse Source
This commit is contained in:
Oshgnacknak
2021-06-30 18:46:10 +02:00
parent c11b1bb1c3
commit d9e92e31af
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/main/java/de/oshgnacknak/gruphi/Gruphi.java
View File

@ -1,7 +1,7 @@
package de.oshgnacknak.gruphi; package de.oshgnacknak.gruphi;
import h07.graph.DirectedGraph; import h07.graph.DirectedGraph;
import h07.graph.EmptyGraphFactory; import h07.graph.DirectedGraphFactory;
import javax.swing.*; import javax.swing.*;
import java.awt.*; import java.awt.*;
@ -17,18 +17,21 @@ class Gruphi extends JFrame {
private static final double VEL = 5; private static final double VEL = 5;
private static final double NEIGHBOUR_DISTANCE = 50; private static final double NEIGHBOUR_DISTANCE = 50;
DirectedGraph<Node, Double> graph = newGraph(); private final DirectedGraph<Node, Double> graph;
MazeGenerator<Node> mazeGenerator = new MazeGenerator<>(graph, (a, b) -> private final MazeGenerator<Node> mazeGenerator;
a.pos.dist(b.pos) <= NEIGHBOUR_DISTANCE);
Node selected = null; private Node selected = null;
Vector vel = new Vector(0, 0); private final Vector vel = new Vector(0, 0);
private boolean running = true; private boolean running = true;
Gruphi() { Gruphi(DirectedGraphFactory<Node, Double> factory) {
super("Gruphi - The Graph GUI - By Osh"); super("Gruphi - The Graph GUI - By Osh");
this.graph = factory.createDirectedGraph();
this. mazeGenerator = new MazeGenerator<>(graph, (a, b) ->
a.pos.dist(b.pos) <= NEIGHBOUR_DISTANCE);
add(new Canvas(this::draw)); add(new Canvas(this::draw));
pack(); pack();
setLocationRelativeTo(null); setLocationRelativeTo(null);
@ -198,7 +201,7 @@ class Gruphi extends JFrame {
.findFirst(); .findFirst();
} }
void draw(Drawable d) { private void draw(Drawable d) {
d.fill(Color.BLACK); d.fill(Color.BLACK);
d.rect(0, 0, getWidth(), getHeight()); d.rect(0, 0, getWidth(), getHeight());
@ -247,20 +250,17 @@ class Gruphi extends JFrame {
} }
} }
void update() { private void update() {
if (selected != null) { if (selected != null) {
selected.pos.add(vel); selected.pos.add(vel);
} }
} }
DirectedGraph<Node, Double> newGraph() {
return new EmptyGraphFactory<Node, Double>().createDirectedGraph();
}
public static void main(String[] args) { public static void main(String[] args) {
var gruphi = new Gruphi(); // TODO:
gruphi.setVisible(true); // var gruphi = new Gruphi(new SomeFactory<>());
gruphi.updateLoop(); // gruphi.setVisible(true);
System.exit(0); // gruphi.updateLoop();
// System.exit(0);
} }
} }