michael/Party-Parrots-At-Sea
1
0
Fork 0
mirror of https://github.com/michaelrausch/Party-Parrots-At-Sea.git synced 2026-05-09 06:18:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed scaling issues.

Browse Source 
#fix
This commit is contained in:
Calum
2017-09-25 23:19:03 +13:00
parent c12f7408ad
commit 3d7a64068f
3 changed files with 38 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/visualiser/GameView.java
+19 -43
View File
@@ -1,17 +1,21 @@
package seng302.visualiser;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javafx.application.Platform;
import javafx.beans.value.ChangeListener;
import javafx.collections.ObservableList;
import javafx.geometry.Point2D;
import javafx.scene.*;
import javafx.scene.Group;
import javafx.scene.Node;
import javafx.scene.image.ImageView;
import javafx.scene.layout.Pane;
import javafx.scene.paint.Color;
import javafx.scene.paint.Paint;
import javafx.scene.shape.Circle;
import javafx.scene.shape.Polygon;
import javafx.scene.shape.Rectangle;
import seng302.gameServer.messages.RoundingSide;
import seng302.model.GeoPoint;
import seng302.model.Limit;
@@ -20,9 +24,9 @@ import seng302.model.mark.Corner;
import seng302.model.mark.Mark;
import seng302.utilities.GeoUtility;
import seng302.visualiser.fxObjects.MarkArrowFactory;
import seng302.visualiser.fxObjects.assets_2D.*;
import java.util.*;
import seng302.visualiser.fxObjects.assets_2D.CourseBoundary;
import seng302.visualiser.fxObjects.assets_2D.Gate;
import seng302.visualiser.fxObjects.assets_2D.Marker2D;
/**
* Created by cir27 on 20/07/17.
@@ -73,44 +77,22 @@ public class GameView extends Pane {
gameObjects = this.getChildren();
gameObjects.addAll(mapImage, raceBorder, markers, tokens);
this.parentProperty().addListener((obs, old, parent) -> {
if (old != null) {
((Pane) old).heightProperty().removeListener(heightChangeListener);
}
if (parent != null) {
heightChangeListener = (observableValue, oldHeight, newHeight) -> {
canvasWidth = ((Pane) parent).getWidth();
canvasHeight = newHeight.doubleValue();
updateBorder(borderPoints);
updateCourse(compoundMarks, courseOrder);
};
((Pane) parent).heightProperty().addListener(heightChangeListener);
// }
// if (parent != null) {
// canvasWidth = parent.prefWidth(1);
// canvasHeight = parent.prefHeight(1);
// rescaleRace(borderPoints);
// System.out.println("parent = " + parent.maxWidth(100));
// System.out.println("parent.minWidth(1) = " + parent.minWidth(100));
// System.out.println(canvasWidth);
// System.out.println(canvasHeight);
canvasWidth = ((Pane) parent).getHeight();
canvasWidth = ((Pane) parent).getWidth();
System.out.println("canvasWidth = " + canvasWidth);
System.out.println("canvasHeight = " + canvasHeight);
this.getChildren().add(new Circle(canvasWidth / 2, canvasHeight / 2, 7, Color.GREENYELLOW));
this.getChildren().add(new Circle(canvasWidth, canvasHeight, 7, Color.GREENYELLOW));
this.getChildren().add(new Circle(0,0, 7, Color.GREENYELLOW));
this.getChildren().add(new Circle(canvasWidth, 0, 7, Color.GREENYELLOW));
this.getChildren().add(new Circle(0,canvasHeight, 7, Color.GREENYELLOW));
Rectangle r = new Rectangle(canvasWidth, canvasHeight, Color.TRANSPARENT);
r.setStroke(Color.BLACK);
this.getChildren().add(r);
canvasWidth = parent.prefWidth(1);
canvasHeight = parent.prefHeight(1);
updateBorder(borderPoints);
updateCourse(compoundMarks, courseOrder);
}
});
}
public void setSize(double width, double height) {
canvasHeight = height;
canvasWidth = width;
updateBorder(borderPoints);
updateCourse(compoundMarks, courseOrder);
}
/**
* Adds a orderedMarks to the GameView. The view is scaled accordingly unless a border is set in which
* case the orderedMarks is added relative ot the border.
@@ -512,12 +494,6 @@ public class GameView extends Pane {
return new Point2D(xAxisLocation, yAxisLocation);
}
public void setSize(Double width, Double height){
this.canvasWidth = width;
this.canvasHeight = height;
}
public void setHorizontalBuffer(Double buff){
this.horizontalBuffer = buff;
}