diff --git a/.classpath b/.classpath new file mode 100644 index 0000000..971bc83 --- /dev/null +++ b/.classpath @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/.gitignore b/.gitignore index 11301d9..48ae1dd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ .idea out Nonrobust_Algorithms.iml +/bin/ diff --git a/.project b/.project new file mode 100644 index 0000000..88e2287 --- /dev/null +++ b/.project @@ -0,0 +1,17 @@ + + + CompGeoProj + + + + + + org.eclipse.jdt.core.javabuilder + + + + + + org.eclipse.jdt.core.javanature + + diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000..3a21537 --- /dev/null +++ b/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,11 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/src/main/Controller.java b/src/main/Controller.java index 7412b69..d5177cd 100644 --- a/src/main/Controller.java +++ b/src/main/Controller.java @@ -119,6 +119,7 @@ private void setSliderHandlers() { public static void update(GraphicsContext gc) { + gc.clearRect(0, 0, gc.getCanvas().widthProperty().intValue(), gc.getCanvas().widthProperty().intValue()); for(Drawable item : drawableObjects) { diff --git a/src/main/GridStuff.java b/src/main/GridStuff.java index ab5f626..483d493 100644 --- a/src/main/GridStuff.java +++ b/src/main/GridStuff.java @@ -10,9 +10,9 @@ public class GridStuff{ - int red = 1; - int yellow = -1; - int white = 0; + //int red = 1; + //int yellow = -1; + //int white = 0; int MAX_RESOLUTION = 100; @@ -21,13 +21,22 @@ public class GridStuff{ private double canvasWidth = 769; private double canvasHeight = 769; - private double n = 10; - private double m = 10; + private double n; + private double m; - double getWidth = canvasWidth / 10; - double getHeight = canvasHeight /10; + double getWidth; + double getHeight; GridStuff [][] map = new GridStuff[(int) n][(int) m]; + + public void setZoom(double val) { + + n = m = 10 / val; + getHeight = canvasHeight / m; + getWidth = canvasWidth / n; + draw(); + + } public void draw() { for (int i = 0; i < n; i++) { @@ -54,14 +63,7 @@ public void draw() { } } - public void setZoom(double val) { - - n -= 10 / val; - getHeight = canvasHeight / m; - getWidth = canvasWidth / n; - draw(); - } public GridStuff(Canvas canvas, double zoom){ this.gc = canvas.getGraphicsContext2D();