Update genmesh, obj and image versions

Author: rukai

Cargo.toml

@@ -27,15 +27,15 @@ bitflags = "1"
 cgmath = { version = "0.16", features = ["mint"] }
 derivative = "1.0"
 froggy = "0.4.4"
-genmesh = "0.5"
+genmesh = "0.6"
 gfx = "0.17.1"
 gfx_glyph = "0.13"
 gltf = { features = ["names", "utils", "import"], optional = true, version = "0.11.1" }
-image = "0.18"
+image = "0.20"
 includedir = "0.5"
 itertools = "0.8"
 log = "0.4"
-obj = { version = "0.8.1", features = ["genmesh"] }
+obj = { version = "0.9", features = ["genmesh"] }
 phf = "0.7.12"
 quick-error = "1.2"
 rodio = "0.8"

src/geometry.rs

@@ -158,7 +158,7 @@ impl Geometry {
     ) -> Self {
         Self::generate(
             generators::Plane::new(),
-            |GenVertex { pos, .. }| [pos[0] * 0.5 * width, pos[1] * 0.5 * height, 0.0].into(),
+            |GenVertex { pos, .. }| [pos.x * 0.5 * width, pos.y * 0.5 * height, 0.0].into(),
             |v| v.normal.into(),
         )
     }
@@ -188,9 +188,9 @@ impl Geometry {
             generators::Cube::new(),
             |GenVertex { pos, .. }| {
                 [
-                    pos[0] * 0.5 * width,
-                    pos[1] * 0.5 * height,
-                    pos[2] * 0.5 * depth,
+                    pos.x * 0.5 * width,
+                    pos.y * 0.5 * height,
+                    pos.z * 0.5 * depth,
                 ].into()
             },
             |v| v.normal.into(),
@@ -230,10 +230,10 @@ impl Geometry {
             generators::Cylinder::new(radius_segments),
             //Three.js has height along the Y axis for some reason
             |GenVertex { pos, .. }| {
-                let scale = (pos[2] + 1.0) * 0.5 * radius_top + (1.0 - pos[2]) * 0.5 * radius_bottom;
-                [pos[1] * scale, pos[2] * 0.5 * height, pos[0] * scale].into()
+                let scale = (pos.z + 1.0) * 0.5 * radius_top + (1.0 - pos.z) * 0.5 * radius_bottom;
+                [pos.y * scale, pos.z * 0.5 * height, pos.x * scale].into()
             },
-            |GenVertex { normal, .. }| [normal[1], normal[2], normal[0]].into(),
+            |GenVertex { normal, .. }| [normal.y, normal.z, normal.x].into(),
         )
     }
 
@@ -257,8 +257,8 @@ impl Geometry {
         meridional_segments: usize,
     ) -> Self {
         Self::generate(
-            generators::SphereUV::new(equatorial_segments, meridional_segments),
-            |GenVertex { pos, .. }| [pos[0] * radius, pos[1] * radius, pos[2] * radius].into(),
+            generators::SphereUv::new(equatorial_segments, meridional_segments),
+            |GenVertex { pos, .. }| [pos.x * radius, pos.y * radius, pos.z * radius].into(),
             |v| v.normal.into(),
         )
     }