mirror of
https://github.com/michaelrausch/Party-Parrots-At-Sea.git
synced 2026-05-09 06:18:44 +00:00
Wrote tests that are currently broken for sending server commands through text chat.
#tests
This commit is contained in:
@@ -13,7 +13,6 @@ import javafx.animation.Timeline;
|
|||||||
import javafx.application.Platform;
|
import javafx.application.Platform;
|
||||||
import javafx.collections.ObservableList;
|
import javafx.collections.ObservableList;
|
||||||
import javafx.geometry.Point2D;
|
import javafx.geometry.Point2D;
|
||||||
import javafx.geometry.Point3D;
|
|
||||||
import javafx.scene.Group;
|
import javafx.scene.Group;
|
||||||
import javafx.scene.Node;
|
import javafx.scene.Node;
|
||||||
import javafx.scene.image.ImageView;
|
import javafx.scene.image.ImageView;
|
||||||
@@ -23,12 +22,9 @@ import javafx.scene.layout.AnchorPane;
|
|||||||
import javafx.scene.layout.Pane;
|
import javafx.scene.layout.Pane;
|
||||||
import javafx.scene.paint.Color;
|
import javafx.scene.paint.Color;
|
||||||
import javafx.scene.paint.Paint;
|
import javafx.scene.paint.Paint;
|
||||||
import javafx.scene.paint.PhongMaterial;
|
|
||||||
import javafx.scene.shape.Circle;
|
import javafx.scene.shape.Circle;
|
||||||
import javafx.scene.shape.Cylinder;
|
|
||||||
import javafx.scene.shape.Polygon;
|
import javafx.scene.shape.Polygon;
|
||||||
import javafx.scene.text.Text;
|
import javafx.scene.text.Text;
|
||||||
import javafx.scene.transform.Rotate;
|
|
||||||
import javafx.util.Duration;
|
import javafx.util.Duration;
|
||||||
import seng302.gameServer.messages.RoundingSide;
|
import seng302.gameServer.messages.RoundingSide;
|
||||||
import seng302.model.ClientYacht;
|
import seng302.model.ClientYacht;
|
||||||
@@ -45,6 +41,7 @@ import seng302.visualiser.fxObjects.CourseBoundary;
|
|||||||
import seng302.visualiser.fxObjects.Gate;
|
import seng302.visualiser.fxObjects.Gate;
|
||||||
import seng302.visualiser.fxObjects.MarkArrowFactory;
|
import seng302.visualiser.fxObjects.MarkArrowFactory;
|
||||||
import seng302.visualiser.fxObjects.Marker;
|
import seng302.visualiser.fxObjects.Marker;
|
||||||
|
import seng302.visualiser.fxObjects.VelocityPickup;
|
||||||
import seng302.visualiser.map.Boundary;
|
import seng302.visualiser.map.Boundary;
|
||||||
import seng302.visualiser.map.CanvasMap;
|
import seng302.visualiser.map.CanvasMap;
|
||||||
|
|
||||||
@@ -87,7 +84,7 @@ public class GameView extends Pane {
|
|||||||
private Group markers = new Group();
|
private Group markers = new Group();
|
||||||
private Group tokens = new Group();
|
private Group tokens = new Group();
|
||||||
private List<CompoundMark> course = new ArrayList<>();
|
private List<CompoundMark> course = new ArrayList<>();
|
||||||
private List<Cylinder> mapTokens;
|
private List<Node> mapTokens;
|
||||||
|
|
||||||
private ImageView mapImage = new ImageView();
|
private ImageView mapImage = new ImageView();
|
||||||
|
|
||||||
@@ -187,9 +184,9 @@ public class GameView extends Pane {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
boatObjects.forEach((boat, boatObject) -> boatObject.updateLocation());
|
boatObjects.forEach((boat, boatObject) -> boatObject.updateLocation());
|
||||||
for (Cylinder c : mapTokens) {
|
// for (Cylinder c : mapTokens) {
|
||||||
c.getTransforms().add(new Rotate(1, new Point3D(45, 45, 45)));
|
// c.getTransforms().add(new Rotate(1, new Point3D(45, 45, 45)));
|
||||||
}
|
// }
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -461,11 +458,11 @@ public class GameView extends Pane {
|
|||||||
mapTokens = new ArrayList<>();
|
mapTokens = new ArrayList<>();
|
||||||
for (Token token : newTokens) {
|
for (Token token : newTokens) {
|
||||||
Point2D location = findScaledXY(token.getLat(), token.getLng());
|
Point2D location = findScaledXY(token.getLat(), token.getLng());
|
||||||
Cylinder tokenObject = new Cylinder(10, 10);
|
Node tokenObject = new VelocityPickup();
|
||||||
tokenObject.getTransforms().add(new Rotate(45, new Point3D(45, 45, 45)));
|
// tokenObject.getTransforms().add(new Rotate(45, new Point3D(45, 45, 45)));
|
||||||
tokenObject.setLayoutX(location.getX());
|
tokenObject.setLayoutX(location.getX());
|
||||||
tokenObject.setLayoutY(location.getY());
|
tokenObject.setLayoutY(location.getY());
|
||||||
tokenObject.setMaterial(new PhongMaterial(Color.YELLOW));
|
// tokenObject.setMaterial(new PhongMaterial(Color.YELLOW));
|
||||||
mapTokens.add(tokenObject);
|
mapTokens.add(tokenObject);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,38 @@
|
|||||||
|
package seng302.visualiser.fxObjects;
|
||||||
|
|
||||||
|
import com.interactivemesh.jfx.importer.stl.StlMeshImporter;
|
||||||
|
import javafx.animation.AnimationTimer;
|
||||||
|
import javafx.application.Platform;
|
||||||
|
import javafx.geometry.Point3D;
|
||||||
|
import javafx.scene.paint.Color;
|
||||||
|
import javafx.scene.paint.PhongMaterial;
|
||||||
|
import javafx.scene.shape.MeshView;
|
||||||
|
import javafx.scene.transform.Rotate;
|
||||||
|
import javafx.scene.transform.Scale;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Created by cir27 on 3/09/17.
|
||||||
|
*/
|
||||||
|
public class VelocityPickup extends MeshView {
|
||||||
|
|
||||||
|
public double rotation = 0;
|
||||||
|
public Rotate timerRotation = new Rotate(0, new Point3D(0,0,1));
|
||||||
|
|
||||||
|
public VelocityPickup () {
|
||||||
|
StlMeshImporter importer = new StlMeshImporter();
|
||||||
|
importer.read(getClass().getResource("/velocity_pickup.stl").toString());
|
||||||
|
this.setMesh(importer.getImport());
|
||||||
|
this.setMaterial(new PhongMaterial(Color.YELLOW));
|
||||||
|
this.getTransforms().add(new Scale(30,30,30));
|
||||||
|
this.getTransforms().add(new Rotate(30, new Point3D(1,0, 0)));
|
||||||
|
this.getTransforms().add(new Rotate(90, new Point3D(0,1, 0)));
|
||||||
|
this.getTransforms().add(timerRotation);
|
||||||
|
AnimationTimer at = new AnimationTimer() {
|
||||||
|
@Override
|
||||||
|
public void handle(long now) {
|
||||||
|
Platform.runLater(() -> timerRotation.setAngle(rotation++));
|
||||||
|
}
|
||||||
|
};
|
||||||
|
at.start();
|
||||||
|
}
|
||||||
|
}
|
||||||
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user