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

Added placeholder assets for velocity pickups.

Browse Source
This commit is contained in:
cir27
2017-09-11 03:11:42 +12:00
parent 78b4786482
commit f136a970db
6 changed files with 85 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/visualiser/fxObjects/assets_3D/ModelFactory.java
+7 -4
View File
@@ -89,7 +89,7 @@ public class ModelFactory {
assets = new Group(importer.getImport());
}
switch (tokenType) {
case VELOCITY_COIN:
case VELOCITY_PICKUP:
return makeCoinPickup(assets);
case FINISH_MARKER:
case PLAIN_MARKER:
@@ -114,7 +114,10 @@ public class ModelFactory {
assets.setRotate(90);
assets.setTranslateX(0.2);
assets.setTranslateY(1);
assets.getTransforms().add(new Rotate(0 ,new Point3D(0,1,0)));
assets.getTransforms().addAll(
new Translate(0,-1,0),
new Rotate(0 ,new Point3D(1,1,1))
);
return new Model(assets, new AnimationTimer() {
private double rotation = 0;
@@ -122,8 +125,8 @@ public class ModelFactory {
@Override
public void handle(long now) {
rotation += 0.5;
((Rotate) group.getTransforms().get(0)).setAngle(rotation);
rotation += 1;
((Rotate) group.getTransforms().get(1)).setAngle(rotation);
}
});
}
src/main/java/seng302/visualiser/fxObjects/assets_3D/ModelType.java
+1 -1
View File
@@ -6,7 +6,7 @@ package seng302.visualiser.fxObjects.assets_3D;
*/
public enum ModelType {
VELOCITY_COIN ("velocity_pickup.dae"),
VELOCITY_PICKUP("velocity_pickup.dae"),
FINISH_MARKER ("finish_marker.dae"),
START_MARKER ("start_marker.dae"),
PLAIN_MARKER ("plain_marker.dae"),