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

- Fixed Merge Errors and some broken lighting

Browse Source 
#tags [1276]
This commit is contained in:
alistairjmcintyre
2017-09-28 02:05:47 +13:00
parent a08a38c985
commit 4018dd783e
3 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/visualiser/fxObjects/assets_3D/BoatObject.java
+4 -4
View File
@@ -39,7 +39,7 @@ public class BoatObject extends Group {
// This stuff only matters to the players boat object. // This stuff only matters to the players boat object.
private Group markIndicator; private Group markIndicator;
private MeshView playerIndicator; private MeshView playerIndicator;
private Color indicatorColor = Color.LIGHTBLUE; private Color indicatorColor = Color.BLACK;
private ReadOnlyDoubleWrapper rotationProperty; private ReadOnlyDoubleWrapper rotationProperty;
private List<SelectedBoatListener> selectedBoatListenerListeners = new ArrayList<>(); private List<SelectedBoatListener> selectedBoatListenerListeners = new ArrayList<>();
@@ -104,8 +104,8 @@ public class BoatObject extends Group {
markIndicator.getTransforms().clear(); markIndicator.getTransforms().clear();
markIndicator.getTransforms().addAll( markIndicator.getTransforms().addAll(
new Rotate(angle, new Point3D(0, 0, 1)), new Rotate(angle, new Point3D(0, 0, 1)),
new Translate(0, -radius, -0.1), new Translate(0, -radius, 0.3`),
new Scale(scale, scale, scale / 3) new Scale(scale, scale, scale / 10)
); );
} }
@@ -160,7 +160,7 @@ public class BoatObject extends Group {
torus.getAssets().getTransforms().addAll( torus.getAssets().getTransforms().addAll(
new Rotate(90, new Point3D(1, 0, 0)), new Rotate(90, new Point3D(1, 0, 0)),
new Scale(0.7, 0.7, 0.7), new Scale(0.7, 0.7, 0.7),
new Translate(0, 0, 0) new Translate(0, 0.5, 0)
); );
this.getChildren().add(torus.getAssets()); this.getChildren().add(torus.getAssets());
src/main/java/seng302/visualiser/fxObjects/assets_3D/ModelFactory.java
+2 -2
View File
@@ -193,12 +193,12 @@ public class ModelFactory {
} }
private static Model makeIdentifierTorus(Group assets) { private static Model makeIdentifierTorus(Group assets) {
assets.getChildren().add(new AmbientLight()); // assets.getChildren().add(new AmbientLight());
return new Model(new Group(assets), null); return new Model(new Group(assets), null);
} }
private static Model makeNextMarkIndicator(Group assets) { private static Model makeNextMarkIndicator(Group assets) {
assets.getChildren().add(new AmbientLight()); // assets.getChildren().add(new AmbientLight());
return new Model(new Group(assets), null); return new Model(new Group(assets), null);
} }
src/main/resources/meshes/indicator_arrow.dae
+10 -11
View File
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<COLLADA xmlns="http://www.collada.org/2005/11/COLLADASchema" version="1.4.1"> <COLLADA xmlns="http://www.collada.org/2005/11/COLLADASchema" version="1.4.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<asset> <asset>
<contributor> <contributor>
<author>Blender User</author> <author>Blender User</author>
<authoring_tool>Blender 2.78.0 commit date:2016-09-26, commit time:12:42, hash:4bb1e22</authoring_tool> <authoring_tool>Blender 2.79.0 commit date:2017-09-11, commit time:10:43, hash:5bd8ac9</authoring_tool>
</contributor> </contributor>
<created>2017-09-27T19:18:31</created> <created>2017-09-28T01:59:46</created>
<modified>2017-09-27T19:18:31</modified> <modified>2017-09-28T01:59:46</modified>
<unit name="meter" meter="1"/> <unit name="meter" meter="1"/>
<up_axis>Z_UP</up_axis> <up_axis>Z_UP</up_axis>
</asset> </asset>
@@ -26,7 +26,7 @@
<color sid="diffuse">0 0.3215737 0.002428917 1</color> <color sid="diffuse">0 0.3215737 0.002428917 1</color>
</diffuse> </diffuse>
<specular> <specular>
<color sid="specular">0.3229167 0.3229167 0.3229167 1</color> <color sid="specular">0.1614584 0.1614584 0.1614584 1</color>
</specular> </specular>
<shininess> <shininess>
<float sid="shininess">50</float> <float sid="shininess">50</float>
@@ -58,9 +58,9 @@
</technique_common> </technique_common>
</source> </source>
<source id="Cone-mesh-normals"> <source id="Cone-mesh-normals">
<float_array id="Cone-mesh-normals-array" count="99">0 0.8641175 -0.5032903 0 0 1 0.1685574 0.8475175 -0.5032917 0.3306731 0.7983459 -0.5032885 0.4800706 0.7184883 -0.5032959 0.6110231 0.6110231 -0.5032907 0.7184883 0.4800706 -0.5032959 0.7983459 0.3306731 -0.5032885 0.8475175 0.1685574 -0.5032917 0.8641175 0 -0.5032903 0.8475175 -0.1685574 -0.5032917 0.7983459 -0.3306731 -0.5032885 0.7184883 -0.4800706 -0.5032959 0.6110231 -0.6110231 -0.5032907 0.4800706 -0.7184883 -0.5032959 0.3306731 -0.7983459 -0.5032885 0.1685574 -0.8475175 -0.5032917 0 -0.8641175 -0.5032903 -0.1685574 -0.8475175 -0.5032917 -0.3306731 -0.7983459 -0.5032885 -0.4800706 -0.7184883 -0.5032959 -0.6110231 -0.6110231 -0.5032907 -0.7184883 -0.4800706 -0.5032959 -0.7983459 -0.3306731 -0.5032885 -0.8475175 -0.1685574 -0.5032917 -0.8641175 0 -0.5032903 -0.8475175 0.1685574 -0.5032917 -0.7983459 0.3306731 -0.5032885 -0.7184883 0.4800706 -0.5032959 -0.6110231 0.6110231 -0.5032907 -0.4800706 0.7184883 -0.5032959 -0.3306731 0.7983459 -0.5032885 -0.1685574 0.8475175 -0.5032917</float_array> <float_array id="Cone-mesh-normals-array" count="117">0.08775347 0.8909768 0.4454884 0.2598883 0.8567371 0.4454883 0.4220357 0.7895733 0.4454883 0.5679644 0.6920669 0.4454883 0.6920669 0.5679644 0.4454883 0.7895736 0.4220353 0.4454883 0.8567369 0.2598885 0.4454883 0.8909768 0.08775347 0.4454884 0.8909768 -0.08775347 0.4454884 0.8567371 -0.2598881 0.4454883 0.7895734 -0.4220355 0.4454884 0.6920669 -0.5679644 0.4454883 0.5679644 -0.6920669 0.4454883 0.4220356 -0.7895734 0.4454883 0.2598879 -0.8567371 0.4454885 0.08775335 -0.8909768 0.4454884 -0.08775389 -0.8909767 0.4454883 -0.2598887 -0.8567368 0.4454883 -0.4220361 -0.7895731 0.4454884 -0.5679646 -0.6920668 0.4454883 -0.6920675 -0.5679637 0.4454884 -0.7895734 -0.4220355 0.4454884 -0.8567374 -0.2598869 0.4454883 -0.8909769 -0.08775287 0.4454884 -0.8909766 0.08775418 0.4454883 -0.8567367 0.2598895 0.4454884 -0.7895728 0.4220367 0.4454883 -0.6920663 0.5679652 0.4454883 -0.5679636 0.6920676 0.4454884 -0.4220345 0.789574 0.4454885 -0.259887 0.8567373 0.4454883 -0.08775269 0.8909768 0.4454884 0 0 -1 -3.97508e-6 0 -1 3.97512e-6 0 -1 3.88859e-7 0 -1 -1.36853e-6 0 -1 1.36853e-6 0 -1 -3.88857e-7 0 -1</float_array>
<technique_common> <technique_common>
<accessor source="#Cone-mesh-normals-array" count="33" stride="3"> <accessor source="#Cone-mesh-normals-array" count="39" stride="3">
<param name="X" type="float"/> <param name="X" type="float"/>
<param name="Y" type="float"/> <param name="Y" type="float"/>
<param name="Z" type="float"/> <param name="Z" type="float"/>
@@ -70,12 +70,11 @@
<vertices id="Cone-mesh-vertices"> <vertices id="Cone-mesh-vertices">
<input semantic="POSITION" source="#Cone-mesh-positions"/> <input semantic="POSITION" source="#Cone-mesh-positions"/>
</vertices> </vertices>
<polylist material="Material_001-material" count="62"> <triangles material="Material_001-material" count="62">
<input semantic="VERTEX" source="#Cone-mesh-vertices" offset="0"/> <input semantic="VERTEX" source="#Cone-mesh-vertices" offset="0"/>
<input semantic="NORMAL" source="#Cone-mesh-normals" offset="1"/> <input semantic="NORMAL" source="#Cone-mesh-normals" offset="1"/>
<vcount>3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 </vcount> <p>0 0 1 0 2 0 2 1 1 1 3 1 3 2 1 2 4 2 4 3 1 3 5 3 5 4 1 4 6 4 6 5 1 5 7 5 7 6 1 6 8 6 8 7 1 7 9 7 9 8 1 8 10 8 10 9 1 9 11 9 11 10 1 10 12 10 12 11 1 11 13 11 13 12 1 12 14 12 14 13 1 13 15 13 15 14 1 14 16 14 16 15 1 15 17 15 17 16 1 16 18 16 18 17 1 17 19 17 19 18 1 18 20 18 20 19 1 19 21 19 21 20 1 20 22 20 22 21 1 21 23 21 23 22 1 22 24 22 24 23 1 23 25 23 25 24 1 24 26 24 26 25 1 25 27 25 27 26 1 26 28 26 28 27 1 27 29 27 29 28 1 28 30 28 30 29 1 29 31 29 31 30 1 30 32 30 32 31 1 31 0 31 16 32 24 32 8 32 32 32 0 32 2 32 2 32 3 32 4 32 4 32 5 32 6 32 6 32 7 32 4 32 8 32 9 32 10 32 10 32 11 32 8 32 12 32 13 32 16 32 14 32 15 32 16 32 16 32 17 32 18 32 18 32 19 32 20 32 20 32 21 32 22 32 22 33 23 33 24 33 24 34 25 34 26 34 26 32 27 32 28 32 28 32 29 32 32 32 30 32 31 32 32 32 32 35 2 35 8 35 4 36 7 36 8 36 8 37 11 37 12 37 13 32 14 32 16 32 16 32 18 32 24 32 20 32 22 32 24 32 24 38 26 38 32 38 29 32 30 32 32 32 2 32 4 32 8 32 8 32 12 32 16 32 18 32 20 32 24 32 26 32 28 32 32 32 32 32 8 32 24 32</p>
<p>0 0 1 1 2 2 2 2 1 1 3 3 3 3 1 1 4 4 4 4 1 1 5 5 5 5 1 1 6 6 6 6 1 1 7 7 7 7 1 1 8 8 8 8 1 1 9 9 9 9 1 1 10 10 10 10 1 1 11 11 11 11 1 1 12 12 12 12 1 1 13 13 13 13 1 1 14 14 14 14 1 1 15 15 15 15 1 1 16 16 16 16 1 1 17 17 17 17 1 1 18 18 18 18 1 1 19 19 19 19 1 1 20 20 20 20 1 1 21 21 21 21 1 1 22 22 22 22 1 1 23 23 23 23 1 1 24 24 24 24 1 1 25 25 25 25 1 1 26 26 26 26 1 1 27 27 27 27 1 1 28 28 28 28 1 1 29 29 29 29 1 1 30 30 30 30 1 1 31 31 31 31 1 1 32 32 32 32 1 1 0 0 16 16 24 24 8 8 32 32 0 0 2 2 2 2 3 3 4 4 4 4 5 5 6 6 6 6 7 7 4 4 8 8 9 9 10 10 10 10 11 11 8 8 12 12 13 13 16 16 14 14 15 15 16 16 16 16 17 17 18 18 18 18 19 19 20 20 20 20 21 21 22 22 22 22 23 23 24 24 24 24 25 25 26 26 26 26 27 27 28 28 28 28 29 29 32 32 30 30 31 31 32 32 32 32 2 2 8 8 4 4 7 7 8 8 8 8 11 11 12 12 13 13 14 14 16 16 16 16 18 18 24 24 20 20 22 22 24 24 24 24 26 26 32 32 29 29 30 30 32 32 2 2 4 4 8 8 8 8 12 12 16 16 18 18 20 20 24 24 26 26 28 28 32 32 32 32 8 8 24 24</p> </triangles>
</polylist>
</mesh> </mesh>
</geometry> </geometry>
</library_geometries> </library_geometries>