wip: gtlf port

xuorig · Feb 23, 2021 · 0b4cf35 · 0b4cf35
1 parent b5cd4ac
commit 0b4cf35
Show file tree

Hide file tree

Showing 14 changed files with 575 additions and 1,289 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -30,7 +30,7 @@ optional = ["audio", "network", "locale", "ui", "tiles", "animation"]
 tiles = ["amethyst_tiles"]
 animation = ["amethyst_animation"]
 audio = ["amethyst_audio"]
-#gltf = ["amethyst_gltf", "amethyst_animation"]
+gltf = ["amethyst_gltf", "amethyst_animation"]
 locale = ["amethyst_locale"]
 network = ["amethyst_network"]
 utils = ["amethyst_utils"]
@@ -56,6 +56,7 @@ profiler = [
     "amethyst_ui/profiler",
     "amethyst_utils/profiler",
     "amethyst_tiles/profiler",
+    "amethyst_gltf/profiler",
 ]
 # sdl_controller = ["amethyst_input/sdl_controller"]
 json = ["amethyst_assets/json"]
@@ -69,7 +70,6 @@ parallel = ["amethyst_core/parallel"]
 [workspace]
 members = ["examples/*", "amethyst_*"]
 exclude = [
-    "amethyst_gltf",
     "amethyst_test",
     "examples/Cargo.toml",
     "examples/_unused_assets",
@@ -102,7 +102,7 @@ amethyst_core = { path = "amethyst_core", version = "0.15.3" }
 amethyst_error = { path = "amethyst_error", version = "0.15.3" }
 amethyst_controls = { path = "amethyst_controls", version = "0.15.3" }
 amethyst_derive = { path = "amethyst_derive", version = "0.15.3" }
-#amethyst_gltf = { path = "amethyst_gltf", version = "0.15.3", optional = true }
+amethyst_gltf = { path = "amethyst_gltf", version = "0.15.3", optional = true }
 amethyst_network = { path = "amethyst_network", version = "0.15.3", optional = true }
 amethyst_locale = { path = "amethyst_locale", version = "0.15.3", optional = true }
 amethyst_rendy = { path = "amethyst_rendy", version = "0.15.3", features = ["window"], optional = true }

diff --git a/amethyst_assets/src/asset.rs b/amethyst_assets/src/asset.rs
@@ -52,7 +52,7 @@ impl<T: Asset<Data = T>> ProcessableAsset for T {
 /// in turn accepted by `Asset::from_data`. Examples for formats are
 /// `Png`, `Obj` and `Wave`.
 ///
-/// The format type itself represents loading options, which are passed to `import`.
+/// The format type itself represents loading options, which are passed to `import_simple`.
 /// E.g. for textures this would be stuff like mipmap levels and
 /// sampler info.
 pub trait Format<D: 'static>: DynClone + Send + Sync + 'static {

diff --git a/amethyst_gltf/Cargo.toml b/amethyst_gltf/Cargo.toml
@@ -20,21 +20,33 @@ amethyst_animation = { path = "../amethyst_animation", version = "0.15.3" }
 amethyst_core = { path = "../amethyst_core", version = "0.15.3" }
 amethyst_error = { path = "../amethyst_error", version = "0.15.3" }
 amethyst_rendy = { path = "../amethyst_rendy", version = "0.15.3" }
+atelier-assets = { git = "https://github.com/radium-io/atelier-assets.git", rev = "6987e6b4abe061f1810018efd7518866b62b70fb", features = [
+    "serde-1",
+    "type_uuid",
+    "serde_importers",
+    "parallel_hash",
+    "rpc_io",
+    "handle",
+] }
 err-derive = "0.2.3"
 base64 = "0.11"
 fnv = "1"
-gltf = { version = "0.15", features = ["KHR_lights_punctual"] }
+gltf = { git = "https://github.com/gltf-rs/gltf.git", rev = "4298aac70336ae0413312a61344badbf67fbcbde", features = ["KHR_lights_punctual"] }
 hibitset = { version = "0.6.2", features = ["parallel"] }
 log = "0.4"
 mikktspace = "0.2.0"
 serde = { version = "1", features = ["derive"] }
+serde_bytes = "0.11"
+type-uuid = "0.1"
+uuid = { version = "0.8", features = ["v4"] }
 
 thread_profiler = { version = "0.3", optional = true }
-image = "0.22.2"
+image = "0.23.12"
 derivative = "2.1.1"
 
 [dev-dependencies]
 amethyst = { path = "../", version = "0.15.3", features = ["renderer"] }
+futures = "0.3"
 
 [features]
 profiler = ["thread_profiler/thread_profiler"]
diff --git a/amethyst_gltf/src/format/animation.rs b/amethyst_gltf/src/format/animation.rs
diff --git a/amethyst_gltf/src/format/importer.rs b/amethyst_gltf/src/format/importer.rs