From 86a467f0f36151e7d0243bb2fe216ad21e475ea8 Mon Sep 17 00:00:00 2001
From: Carter Anderson <mcanders1@gmail.com>
Date: Tue, 7 Jan 2020 23:03:09 -0800
Subject: [PATCH] initial gltf example

---
 Cargo.toml                   |   1 +
 examples/assets/Box.glb      | Bin 0 -> 1664 bytes
 examples/assets/Box.gltf     | 142 +++++++++++
 examples/assets/Box0.bin     | Bin 0 -> 648 bytes
 examples/assets/Lantern.gltf | 468 +++++++++++++++++++++++++++++++++++
 examples/load_model.rs       |  11 +
 src/asset/gltf.rs            |   6 +-
 src/asset/mod.rs             |   4 +
 src/render/mesh.rs           |   2 +-
 9 files changed, 630 insertions(+), 4 deletions(-)
 create mode 100644 examples/assets/Box.glb
 create mode 100644 examples/assets/Box.gltf
 create mode 100644 examples/assets/Box0.bin
 create mode 100644 examples/assets/Lantern.gltf
 create mode 100644 examples/load_model.rs

diff --git a/Cargo.toml b/Cargo.toml
index 61888022f7..c737fed958 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -15,6 +15,7 @@ zerocopy = "0.2"
 log = "0.4"
 env_logger = "0.7"
 rand = "0.7.2"
+gltf = "0.14.0"
 
 [profile.release]
 debug = true
\ No newline at end of file
diff --git a/examples/assets/Box.glb b/examples/assets/Box.glb
new file mode 100644
index 0000000000000000000000000000000000000000..95ec886b6b92b134291fd41d34ac9d5349306e0a
GIT binary patch
literal 1664
zcmb7EOK;jh5S}DW+O$p6v`u^8GeNd_1bm4oEftl43Q#VHgE0$OGB&bJ+Q_oRvHz-n
zq(7!Jix*Y|3Dweg=e6_A%bt4u#xVe_&H(<N0DSLt+6l9xh{w!K*p&M`wBsOTCaZTW
ztM;X4e6#uumSYb*jNHISgOS%*nq!fJ&dk&@E@I{&VSX^?#A(BHnA=DRb7rnL4mn;Q
z=xCVRap?XcA+P1MJ#?cQR9<yP{V>fXY|f(@CPIkBiUbn22;I3GyAPRY#|SxE#v~@J
z-RZV!7Blr6`_bt&`^`?9nFdzn`eWB2AFOMR#W1rd(&eFRdl`st&r#1>1WTZ{gEyie
zT(@AfoJ@Fl@A97_$mlWVoykNr7-KrYd=dEEkNb}c3{ujK0x6e1_P<ajC~AvQpjupN
zmxf#{d|9tvvua)JeZo`_tl=OCM$SMCQIG6BwU*i_(L~=juPyZb*LvX)uu-Y(t8X8)
zmM`Jh1#O{8aU);5(Bx*vVhZavFGgXD$F}FWPB&OiXFiUACOfhtUJtw=Y}k%i<bjs2
zXyVcJs-abl>Sp7z%Cj)?0<Kt!ySpB8mygAaw+&aP{A9wVTP&BRVR3&N<5u1pI6ga^
z()U#;R?CI$^qySC^-!;FV)bxyX%qFGSOzWMI<YJ%1-M+Sq{H+#e(ax{ZT#Zpv$~TU
z{sj*3t3QhG0sc@dilqAN%BpQ2|3A5GvqsDVd5b*AN75bgL?o-H)T^iJBYCnDze}W7
ziR}Ai(o0h9k|!JS@{~NuQYX({o7B^}OVU@KWG6n8kKh<ikdELPoWdDAM>>TUa1Jlw
h71BAph6{KDmq-`z7OvnOyhpl%4{!}1;S<s|`~&t3Z215H

literal 0
HcmV?d00001

diff --git a/examples/assets/Box.gltf b/examples/assets/Box.gltf
new file mode 100644
index 0000000000..7f603f07fc
--- /dev/null
+++ b/examples/assets/Box.gltf
@@ -0,0 +1,142 @@
+{
+    "asset": {
+        "generator": "COLLADA2GLTF",
+        "version": "2.0"
+    },
+    "scene": 0,
+    "scenes": [
+        {
+            "nodes": [
+                0
+            ]
+        }
+    ],
+    "nodes": [
+        {
+            "children": [
+                1
+            ],
+            "matrix": [
+                1.0,
+                0.0,
+                0.0,
+                0.0,
+                0.0,
+                0.0,
+                -1.0,
+                0.0,
+                0.0,
+                1.0,
+                0.0,
+                0.0,
+                0.0,
+                0.0,
+                0.0,
+                1.0
+            ]
+        },
+        {
+            "mesh": 0
+        }
+    ],
+    "meshes": [
+        {
+            "primitives": [
+                {
+                    "attributes": {
+                        "NORMAL": 1,
+                        "POSITION": 2
+                    },
+                    "indices": 0,
+                    "mode": 4,
+                    "material": 0
+                }
+            ],
+            "name": "Mesh"
+        }
+    ],
+    "accessors": [
+        {
+            "bufferView": 0,
+            "byteOffset": 0,
+            "componentType": 5123,
+            "count": 36,
+            "max": [
+                23
+            ],
+            "min": [
+                0
+            ],
+            "type": "SCALAR"
+        },
+        {
+            "bufferView": 1,
+            "byteOffset": 0,
+            "componentType": 5126,
+            "count": 24,
+            "max": [
+                1.0,
+                1.0,
+                1.0
+            ],
+            "min": [
+                -1.0,
+                -1.0,
+                -1.0
+            ],
+            "type": "VEC3"
+        },
+        {
+            "bufferView": 1,
+            "byteOffset": 288,
+            "componentType": 5126,
+            "count": 24,
+            "max": [
+                0.5,
+                0.5,
+                0.5
+            ],
+            "min": [
+                -0.5,
+                -0.5,
+                -0.5
+            ],
+            "type": "VEC3"
+        }
+    ],
+    "materials": [
+        {
+            "pbrMetallicRoughness": {
+                "baseColorFactor": [
+                    0.800000011920929,
+                    0.0,
+                    0.0,
+                    1.0
+                ],
+                "metallicFactor": 0.0
+            },
+            "name": "Red"
+        }
+    ],
+    "bufferViews": [
+        {
+            "buffer": 0,
+            "byteOffset": 576,
+            "byteLength": 72,
+            "target": 34963
+        },
+        {
+            "buffer": 0,
+            "byteOffset": 0,
+            "byteLength": 576,
+            "byteStride": 12,
+            "target": 34962
+        }
+    ],
+    "buffers": [
+        {
+            "byteLength": 648,
+            "uri": "Box0.bin"
+        }
+    ]
+}
diff --git a/examples/assets/Box0.bin b/examples/assets/Box0.bin
new file mode 100644
index 0000000000000000000000000000000000000000..d7798abb5161eca17ac8a6883a1f53c6786b484d
GIT binary patch
literal 648
zcmb7;3kt$O5JO+ps`X#BdYoRZH}h&v#Ne<L77LGLCSg0^ZyN2O=BHQcR($O(y_7rU
zoU=Lq&n>^J<DZqgKX<5O#_&ROR`0Xsj=ggE674g}=Vt9q&h3@STkSP_XDu`Dr6ulK
rmCJwUh6T%@VMWWDP0+HXW5+(|IB?{|IXH5m=gKYUxij$K84SDuM?F11

literal 0
HcmV?d00001

diff --git a/examples/assets/Lantern.gltf b/examples/assets/Lantern.gltf
new file mode 100644
index 0000000000..74ef9165db
--- /dev/null
+++ b/examples/assets/Lantern.gltf
@@ -0,0 +1,468 @@
+{
+  "accessors": [
+    {
+      "bufferView": 0,
+      "componentType": 5126,
+      "count": 926,
+      "type": "VEC2",
+      "max": [
+        0.992169142,
+        -0.007998445
+      ],
+      "min": [
+        0.0107366741,
+        -0.992534757
+      ]
+    },
+    {
+      "bufferView": 1,
+      "componentType": 5126,
+      "count": 926,
+      "type": "VEC3",
+      "max": [
+        1.0,
+        1.0,
+        1.0
+      ],
+      "min": [
+        -1.0,
+        -1.0,
+        -1.0
+      ]
+    },
+    {
+      "bufferView": 2,
+      "componentType": 5126,
+      "count": 926,
+      "type": "VEC4",
+      "max": [
+        1.0,
+        0.9999658,
+        1.0,
+        1.0
+      ],
+      "min": [
+        -1.0,
+        -0.962171,
+        -1.0,
+        1.0
+      ]
+    },
+    {
+      "bufferView": 3,
+      "componentType": 5126,
+      "count": 926,
+      "type": "VEC3",
+      "max": [
+        7.74559927,
+        12.8321095,
+        2.31570983
+      ],
+      "min": [
+        -7.74559927,
+        -12.8321095,
+        -2.31570983
+      ]
+    },
+    {
+      "bufferView": 4,
+      "componentType": 5123,
+      "count": 2616,
+      "type": "SCALAR",
+      "max": [
+        925
+      ],
+      "min": [
+        0
+      ]
+    },
+    {
+      "bufferView": 5,
+      "componentType": 5126,
+      "count": 756,
+      "type": "VEC2",
+      "max": [
+        0.8007193,
+        -0.0581455827
+      ],
+      "min": [
+        0.351246148,
+        -0.361011624
+      ]
+    },
+    {
+      "bufferView": 6,
+      "componentType": 5126,
+      "count": 756,
+      "type": "VEC3",
+      "max": [
+        1.0,
+        1.0,
+        0.999998
+      ],
+      "min": [
+        -1.0,
+        -1.0,
+        -0.999998
+      ]
+    },
+    {
+      "bufferView": 7,
+      "componentType": 5126,
+      "count": 756,
+      "type": "VEC4",
+      "max": [
+        0.9997526,
+        1.0,
+        0.999752462,
+        1.0
+      ],
+      "min": [
+        -0.9995128,
+        -1.0,
+        -0.999752462,
+        1.0
+      ]
+    },
+    {
+      "bufferView": 8,
+      "componentType": 5126,
+      "count": 756,
+      "type": "VEC3",
+      "max": [
+        0.129208073,
+        0.6523504,
+        0.129208073
+      ],
+      "min": [
+        -0.129208073,
+        -0.6523504,
+        -0.129208073
+      ]
+    },
+    {
+      "bufferView": 9,
+      "componentType": 5123,
+      "count": 3744,
+      "type": "SCALAR",
+      "max": [
+        755
+      ],
+      "min": [
+        0
+      ]
+    },
+    {
+      "bufferView": 10,
+      "componentType": 5126,
+      "count": 2463,
+      "type": "VEC2",
+      "max": [
+        0.9923278,
+        -0.00728821754
+      ],
+      "min": [
+        0.3673209,
+        -0.413352221
+      ]
+    },
+    {
+      "bufferView": 11,
+      "componentType": 5126,
+      "count": 2463,
+      "type": "VEC3",
+      "max": [
+        1.0,
+        1.0,
+        1.0
+      ],
+      "min": [
+        -1.0,
+        -1.0,
+        -1.0
+      ]
+    },
+    {
+      "bufferView": 12,
+      "componentType": 5126,
+      "count": 2463,
+      "type": "VEC4",
+      "max": [
+        1.0,
+        1.0,
+        1.0,
+        1.0
+      ],
+      "min": [
+        -1.0,
+        -1.0,
+        -1.0,
+        -1.0
+      ]
+    },
+    {
+      "bufferView": 13,
+      "componentType": 5126,
+      "count": 2463,
+      "type": "VEC3",
+      "max": [
+        1.03408229,
+        2.529281,
+        1.03408468
+      ],
+      "min": [
+        -1.03408229,
+        -2.529281,
+        -1.03408468
+      ]
+    },
+    {
+      "bufferView": 14,
+      "componentType": 5123,
+      "count": 9822,
+      "type": "SCALAR",
+      "max": [
+        2462
+      ],
+      "min": [
+        0
+      ]
+    }
+  ],
+  "asset": {
+    "generator": "glTF Tools for Unity",
+    "version": "2.0"
+  },
+  "bufferViews": [
+    {
+      "buffer": 0,
+      "byteLength": 7408
+    },
+    {
+      "buffer": 0,
+      "byteOffset": 7408,
+      "byteLength": 11112
+    },
+    {
+      "buffer": 0,
+      "byteOffset": 18520,
+      "byteLength": 14816
+    },
+    {
+      "buffer": 0,
+      "byteOffset": 33336,
+      "byteLength": 11112
+    },
+    {
+      "buffer": 0,
+      "byteOffset": 44448,
+      "byteLength": 5232
+    },
+    {
+      "buffer": 0,
+      "byteOffset": 49680,
+      "byteLength": 6048
+    },
+    {
+      "buffer": 0,
+      "byteOffset": 55728,
+      "byteLength": 9072
+    },
+    {
+      "buffer": 0,
+      "byteOffset": 64800,
+      "byteLength": 12096
+    },
+    {
+      "buffer": 0,
+      "byteOffset": 76896,
+      "byteLength": 9072
+    },
+    {
+      "buffer": 0,
+      "byteOffset": 85968,
+      "byteLength": 7488
+    },
+    {
+      "buffer": 0,
+      "byteOffset": 93456,
+      "byteLength": 19704
+    },
+    {
+      "buffer": 0,
+      "byteOffset": 113160,
+      "byteLength": 29556
+    },
+    {
+      "buffer": 0,
+      "byteOffset": 142716,
+      "byteLength": 39408
+    },
+    {
+      "buffer": 0,
+      "byteOffset": 182124,
+      "byteLength": 29556
+    },
+    {
+      "buffer": 0,
+      "byteOffset": 211680,
+      "byteLength": 19644
+    }
+  ],
+  "buffers": [
+    {
+      "uri": "Lantern.bin",
+      "byteLength": 231324
+    }
+  ],
+  "images": [
+    {
+      "uri": "Lantern_baseColor.png"
+    },
+    {
+      "uri": "Lantern_roughnessMetallic.png"
+    },
+    {
+      "uri": "Lantern_normal.png"
+    },
+    {
+      "uri": "Lantern_emissive.png"
+    }
+  ],
+  "meshes": [
+    {
+      "primitives": [
+        {
+          "attributes": {
+            "TEXCOORD_0": 0,
+            "NORMAL": 1,
+            "TANGENT": 2,
+            "POSITION": 3
+          },
+          "indices": 4,
+          "material": 0
+        }
+      ],
+      "name": "LanternPole_Body"
+    },
+    {
+      "primitives": [
+        {
+          "attributes": {
+            "TEXCOORD_0": 5,
+            "NORMAL": 6,
+            "TANGENT": 7,
+            "POSITION": 8
+          },
+          "indices": 9,
+          "material": 0
+        }
+      ],
+      "name": "LanternPole_Chain"
+    },
+    {
+      "primitives": [
+        {
+          "attributes": {
+            "TEXCOORD_0": 10,
+            "NORMAL": 11,
+            "TANGENT": 12,
+            "POSITION": 13
+          },
+          "indices": 14,
+          "material": 0
+        }
+      ],
+      "name": "LanternPole_Lantern"
+    }
+  ],
+  "materials": [
+    {
+      "pbrMetallicRoughness": {
+        "baseColorFactor": [
+          0.214041144,
+          0.214041144,
+          0.214041144,
+          1.0
+        ],
+        "baseColorTexture": {
+          "index": 0
+        },
+        "metallicRoughnessTexture": {
+          "index": 1
+        }
+      },
+      "normalTexture": {
+        "index": 2
+      },
+      "emissiveFactor": [
+        1.0,
+        1.0,
+        1.0
+      ],
+      "emissiveTexture": {
+        "index": 3
+      },
+      "name": "LanternPost_Mat"
+    }
+  ],
+  "nodes": [
+    {
+      "mesh": 0,
+      "translation": [
+        -3.82315421,
+        13.01603,
+        0.0
+      ],
+      "name": "LanternPole_Body"
+    },
+    {
+      "mesh": 1,
+      "translation": [
+        -9.582001,
+        21.0378723,
+        0.0
+      ],
+      "name": "LanternPole_Chain"
+    },
+    {
+      "mesh": 2,
+      "translation": [
+        -9.582007,
+        18.0091515,
+        0.0
+      ],
+      "name": "LanternPole_Lantern"
+    },
+    {
+      "children": [
+        0,
+        1,
+        2
+      ],
+      "name": "Lantern"
+    }
+  ],
+  "scene": 0,
+  "scenes": [
+    {
+      "nodes": [
+        3
+      ]
+    }
+  ],
+  "textures": [
+    {
+      "source": 0
+    },
+    {
+      "source": 1
+    },
+    {
+      "source": 2
+    },
+    {
+      "source": 3
+    }
+  ]
+}
\ No newline at end of file
diff --git a/examples/load_model.rs b/examples/load_model.rs
new file mode 100644
index 0000000000..2a1dd9a5b4
--- /dev/null
+++ b/examples/load_model.rs
@@ -0,0 +1,11 @@
+use bevy::*;
+
+fn main() {
+    // let universe = Universe::new();
+    // let world = universe.create_world();
+    // let scheduler = SystemScheduler::<ApplicationStage>::new();
+    // asset::load_gltf(get_path("examples/assets/Box.gltf").to_str().unwrap()).unwrap();
+    asset::load_gltf("examples/assets/Box.gltf").unwrap();
+
+    // Application::run(universe, world, scheduler);
+}
\ No newline at end of file
diff --git a/src/asset/gltf.rs b/src/asset/gltf.rs
index 5341eca8c4..6306f79c93 100644
--- a/src/asset/gltf.rs
+++ b/src/asset/gltf.rs
@@ -2,17 +2,17 @@ use std::{fs, io};
 use std::boxed::Box;
 use std::error::Error;
 
-
 // use crate::render::Mesh;
 
 pub fn load_gltf(path: &str) -> Result<(), Box<dyn Error>> {
+    println!("{}", path);
     let file = fs::File::open(&path)?;
     let reader = io::BufReader::new(file);
     let gltf = gltf::Gltf::from_reader(reader)?;
     for scene in gltf.scenes() {
-        for mesh in scene.nodes() {
+        for _mesh in scene.nodes() {
         }
     }
-
+    
     Ok(())
 }
diff --git a/src/asset/mod.rs b/src/asset/mod.rs
index db45beab6d..e9eb6e41ce 100644
--- a/src/asset/mod.rs
+++ b/src/asset/mod.rs
@@ -1,3 +1,7 @@
+mod gltf;
+
+pub use self::gltf::load_gltf;
+
 use std::{sync::{Arc, RwLock}, marker::PhantomData, ops::Drop, collections::HashMap};
 
 pub struct Handle<T>
diff --git a/src/render/mesh.rs b/src/render/mesh.rs
index be902a248a..2627f4e6ad 100644
--- a/src/render/mesh.rs
+++ b/src/render/mesh.rs
@@ -6,7 +6,7 @@ pub enum MeshType {
     Cube,
     Plane {
         size: f32
-    }
+    },
 }
 
 pub struct Mesh {