fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added Textures to boats as well as added texture to arrow #story[1306]

Browse Source
This commit is contained in:
Fan-Wu Yang
2017-09-25 03:31:38 +13:00
parent 45ba3ae6ac
commit 6d55168c61
163 changed files with 26608 additions and 26456 deletions
Download Patch File Download Diff File Expand all files Collapse all files
racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java
+1 -1
View File
@@ -162,7 +162,7 @@ public class InGameLobbyController extends Controller {
// subjects.add(subject);
Shape3D mesh = Assets3D.getBoat();
PhongMaterial boatColorMat = new PhongMaterial(boat.getColor());
mesh.setMaterial(boatColorMat);
//mesh.setMaterial(boatColorMat);
Subject3D subject = new Subject3D(mesh, 0);
subjects.add(subject);
racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
+1 -1
View File
@@ -332,7 +332,7 @@ public class RaceViewController extends Controller {
Shape3D mesh = Assets3D.getBoat();
PhongMaterial boatColorMat = new PhongMaterial(boat.getColor());
mesh.setMaterial(boatColorMat);
//mesh.setMaterial(boatColorMat);
Subject3D boatModel = new Subject3D(mesh, boat.getSourceID());
viewSubjects.add(boatModel);
racevisionGame/src/main/java/visualiser/layout/Assets3D.java
+2 -2
View File
@@ -29,7 +29,7 @@ public class Assets3D {
ObjModelImporter objModelImporter = new ObjModelImporter();
for (int i = 0; i < sails.length; i++){
String path = String.format("assets/Sails/V1.3 Sail_%06d.obj", i + 1);
String path = String.format("assets/Sails/V1.5 Sail_%06d.obj", i + 1);
System.out.println(path);
URL asset = Assets3D.class.getClassLoader().getResource(path);
objModelImporter.read(asset);
@@ -42,7 +42,7 @@ public class Assets3D {
}
public static Shape3D getBoat(){
String path = "assets/V1.3 Complete Boat without Sail and Rotated.x3d";
String path = "assets/V1.4 Boat.x3d";
return loadX3d(path);
}