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

Made sea surface look like a sea surface which is randomly generated each time, size may need to be altered a bit else it will cause the program to slow #story[1261]

Browse Source
This commit is contained in:
Fan-Wu Yang
2017-09-11 00:54:11 +12:00
parent a7eefca13a
commit 9ac9c25923
6 changed files with 194 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
racevisionGame/src/main/java/visualiser/layout/Plane3D.java
+156
View File
@@ -0,0 +1,156 @@
package visualiser.layout;
import com.sun.javafx.geom.PickRay;
import com.sun.javafx.scene.input.PickResultChooser;
import com.sun.javafx.sg.prism.NGNode;
import javafx.scene.Node;
import javafx.scene.shape.*;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
/**
* Created by fwy13 on 10/09/17.
*/
public class Plane3D extends TriangleMesh{
/**
* Lenght is up down, and width is left right
* @param width
* @param length
* @param subdivisionsWidth
* @param subdivisionsLength
*/
public Plane3D(float width, float length, int subdivisionsWidth, int subdivisionsLength){
float subWidth = width / (float) subdivisionsWidth;
float subLength = length / (float) subdivisionsLength;
ArrayList<Float> pointsList = new ArrayList<>();
ArrayList<Float> textureCoord = new ArrayList<>();
float startW = -width/2;
float startL = -length/2;
for (float l = 0; l <= length; l += subLength) {
for (float w = 0; w <= width; w += subWidth){
//add points
pointsList.add(w + startW);
pointsList.add(l + startL);
pointsList.add(0f);
//addTexture coords
textureCoord.add(1 - w/width);
textureCoord.add(1 - l/length);
}
}
this.getPoints().setAll(copyListToArray(pointsList));
this.getTexCoords().setAll(copyListToArray(textureCoord));
ArrayList<Integer> faces = new ArrayList<>();
// p0 1 2 t2 0 3
// p2 1 3 t3 0 1
// faces.add(2);
// faces.add(3);
// faces.add(0);
// faces.add(2);
// faces.add(1);
// faces.add(0);
// faces.add(2);
// faces.add(3);
// faces.add(1);
// faces.add(0);
// faces.add(3);
// faces.add(1);
// faces.add(1);
// faces.add(1);
// faces.add(0);
// faces.add(0);
// faces.add(3);
// faces.add(3);
// faces.add(4);
// faces.add(4);
// faces.add(1);
// faces.add(1);
// faces.add(3);
// faces.add(3);
// faces.add(2);
// faces.add(2);
// faces.add(1);
// faces.add(1);
// faces.add(4);
// faces.add(4);
// faces.add(5);
// faces.add(5);
// faces.add(2);
// faces.add(2);
// faces.add(4);
// faces.add(4);
int listSize = pointsList.size()/3;
int divsInRow = subdivisionsWidth + 1;
for (int i = 0; i < listSize; i++){
int row = i/divsInRow;
if (row < 1){
continue;
}
boolean notFirstCol = (i) % divsInRow != 0;
boolean notLastCol = (i + 1) % divsInRow != 0;
if (notFirstCol){
faces.add(i);
faces.add(i);
// printPointAtIndex(i);
faces.add(i - divsInRow);
faces.add(i - divsInRow);
// printPointAtIndex(i - divsInRow);
faces.add(i - 1);
faces.add(i - 1);
// printPointAtIndex(i-1);
}
if (notLastCol) {
faces.add(i - divsInRow + 1);
faces.add(i - divsInRow + 1);
// printPointAtIndex(i - divsInRow + 1);
faces.add(i - divsInRow);
faces.add(i - divsInRow);
// printPointAtIndex(i - divsInRow);
faces.add(i);
faces.add(i);
// printPointAtIndex(i);
}
}
this.getFaces().setAll(copyListToIntArray(faces));
}
private void printPointAtIndex(int index){
int i = index * 3;
float x = this.getPoints().get(i);
float y = this.getPoints().get(i + 1);
float z = this.getPoints().get(i + 2);
System.out.println(String.format("Point at %d is x:%f, y:%f, z:%f", index, x, y, z));
}
private static float[] copyListToArray(List<Float> list){
float[] res = new float[list.size()];
for (int i = 0; i < list.size(); i++){
res[i] = list.get(i);
}
return res;
}
private static int[] copyListToIntArray(List<Integer> list){
int[] res = new int[list.size()];
for (int i = 0; i < list.size(); i++){
res[i] = list.get(i);
}
return res;
}
}
racevisionGame/src/main/java/visualiser/layout/SeaSurface.java
+19 -14
View File
@@ -7,6 +7,7 @@ import javafx.scene.image.PixelWriter;
import javafx.scene.image.WritableImage;
import javafx.scene.paint.Color;
import javafx.scene.paint.PhongMaterial;
import javafx.scene.shape.Box;
import javafx.scene.shape.MeshView;
import javafx.scene.shape.TriangleMesh;
import visualiser.utils.PerlinNoiseGenerator;
@@ -16,11 +17,13 @@ import visualiser.utils.PerlinNoiseGenerator;
*/
public class SeaSurface {
private float[][] noiseArray;
private ImageView surface;
private Subject3D surface;
public SeaSurface(int size){
noiseArray = PerlinNoiseGenerator.createNoise(size);
public SeaSurface(int size, double freq, double x, double z){
noiseArray = PerlinNoiseGenerator.createNoise(size, freq);
createSurface();
surface.setZ(z);
surface.setX(x);
}
private void createSurface(){
@@ -30,13 +33,14 @@ public class SeaSurface {
material.setDiffuseMap(diffuseMap);
material.setSpecularColor(Color.WHITE);
// testing / debugging stuff: show diffuse map on chart
ImageView iv = new ImageView(diffuseMap);
//iv.setTranslateX(-0.5 * noiseArray.length);
//iv.setTranslateY(-0.10 * noiseArray.length);
iv.setRotate(90);
//iv.setRotationAxis(new Point3D(1, 0, 0));
surface = iv;
Plane3D seaPlane = new Plane3D(noiseArray.length, noiseArray.length, 10, 10);
MeshView seaSurface = new MeshView(seaPlane);
// Box seaSurface = new Box(noiseArray.length, 0.1, noiseArray.length);
seaSurface.setMaterial(material);
//seaSurface.setRotationAxis(new Point3D(1, 0, 0));
//seaSurface.setRotate(90);
surface = new Subject3D(seaSurface);
}
/**
@@ -61,10 +65,11 @@ public class SeaSurface {
gray = clamp(gray, 0, 1);
Color lightBlue = new Color(0.2, 0.2, 1, 1);
Color lighterBlue = new Color(0.25, 0.225, 1, 1);
Color brightBlue = new Color(0.06, 0.5, .78, 1);
Color lightBlue = new Color(0.15, 0.68, .88, 1);
Color lighterBlue = new Color(0.28, 0.73, .91, 1);
Color color = lighterBlue.interpolate(lightBlue, gray);
Color color = Color.WHITE.interpolate(brightBlue, gray).interpolate(lighterBlue, gray).interpolate(lightBlue, gray);
pw.setColor(x, y, color);
@@ -92,7 +97,7 @@ public class SeaSurface {
return value;
}
public ImageView getSurface(){
public Subject3D getSurface(){
return surface;
}
racevisionGame/src/main/java/visualiser/layout/View3D.java
+8 -3
View File
@@ -90,7 +90,7 @@ public class View3D extends Pane {
/**
* Default constructor for View3D. Sets up Scene and PerspectiveCamera.
*/
public View3D() {
public View3D(boolean fill) {
this.world = new Group();
this.selectionMap = new HashMap<>();
this.target = null;
@@ -98,13 +98,18 @@ public class View3D extends Pane {
scene.widthProperty().bind(this.widthProperty());
scene.heightProperty().bind(this.heightProperty());
//scene.setFill(new Color(0.2, 0.6, 1, 1));
if (fill) {
scene.setFill(new Color(0.2, 0.6, 1, 1));
}
scene.setCamera(buildCamera());
this.getChildren().add(scene);
}
public View3D(){
this(true);
}
/**
* Sets up camera view frustum and binds transformations
* @return perspective camera