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

Added limits to zooming

Browse Source 
#story[1121]
This commit is contained in:
Kusal Ekanayake
2017-08-16 17:25:51 +12:00
parent 7b9d28ade9
commit 8501fc0b6d
1 changed files with 9 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/visualiser/GameView.java
+9 -36
View File
@@ -96,14 +96,18 @@ public class GameView extends Pane {
public void zoomOut() { public void zoomOut() {
scaleFactor = 0.1; scaleFactor = 0.1;
this.setScaleX(this.getScaleX() - scaleFactor); if (this.getScaleX() > 0.5) {
this.setScaleY(this.getScaleY() - scaleFactor); this.setScaleX(this.getScaleX() - scaleFactor);
this.setScaleY(this.getScaleY() - scaleFactor);
}
} }
public void zoomIn() { public void zoomIn() {
scaleFactor = 0.10; scaleFactor = 0.10;
this.setScaleX(this.getScaleX() + scaleFactor); if (this.getScaleX() < 3) {
this.setScaleY(this.getScaleY() + scaleFactor); this.setScaleX(this.getScaleX() + scaleFactor);
this.setScaleY(this.getScaleY() + scaleFactor);
}
} }
private enum ScaleDirection { private enum ScaleDirection {
@@ -118,39 +122,8 @@ public class GameView extends Pane {
double y = selectedBoat.getBoatLayoutY(); double y = selectedBoat.getBoatLayoutY();
double displacementX = this.getWidth(); double displacementX = this.getWidth();
double displacementY = this.getHeight(); double displacementY = this.getHeight();
// this.setLayoutX((-x) );
// this.setLayoutY((-y) );
// System.out.println("displacementX = " + displacementX);
// System.out.println("panelWidth = " + panelWidth);
// System.out.println("displacementY = " + displacementY);
// System.out.println("panelHeight = " + panelHeight);
this.setLayoutX((-x + (displacementX / 2.0)) * this.getScaleX()); this.setLayoutX((-x + (displacementX / 2.0)) * this.getScaleX());
this.setLayoutY((-y + (displacementY / 2.0)) * this.getScaleY()); this.setLayoutY((-y + (displacementY / 2.0)) * this.getScaleY());
// this.setLayoutX((-x + (canvasWidth / 2.0)) * this.getScaleX());
// this.setLayoutY((-y + (canvasHeight / 2.0)) * this.getScaleY());
// boolean isBoatSelected = false;
// for (BoatObject boat : boatObjects.values()) {
// if (boat.getSelected()) {
// isBoatSelected = true;
// selectedBoat = boat;
// double x = boat.getBoatLayoutX();
// double y = boat.getBoatLayoutY();
// double displacementX = this.getWidth();
// double displacementY = this.getHeight();
//// double displacementX = 1200d;
//// double displacementY = 900d;
//// System.out.println("displacementY = " + displacementY);
//// System.out.println("displacementX = " + displacementX);
// this.setLayoutX((-x + (displacementX/2.0)) * this.getScaleX());
// this.setLayoutY((-y + (displacementY/2.0)) * this.getScaleY());
// }
// }
// if (!isBoatSelected) {
// this.setLayoutX(0);
// this.setLayoutY(0);
// }
} else { } else {
this.setLayoutX(0); this.setLayoutX(0);
this.setLayoutY(0); this.setLayoutY(0);