Switch meshes to GLTF (#95)

* Use gltf asset for carnivore * Fix gltf loading and convert some meshes * Add color to the ground and add tree mesh * Restored colors for different creatures * Restore color of mushi
amethyst · Jul 16, 2019 · 1d6e4c7 · 1d6e4c7
1 parent 8e16a1c
commit 1d6e4c7
Show file tree

Hide file tree

Showing 25 changed files with 805 additions and 5,542 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,3 +10,6 @@
 
 # IntelliJ folder
 .idea
+
+# profiles
+thread_profile*
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -5,16 +5,18 @@ authors = []
 edition = "2018"
 
 [dependencies]
-amethyst = { git = "https://github.com/amethyst/amethyst.git", rev = "2509c43", features = ["vulkan"]}
-#amethyst_test = "0.2.0"
+amethyst = { git = "https://github.com/amethyst/amethyst.git", rev = "2509c43", features = ["vulkan", "gltf"]}
 rand = "0.6.5"
 log = "0.4.6"
-#amethyst-imgui = "0.3.0"
-#amethyst-inspector = { git = "https://github.com/awpteamoose/amethyst-inspector.git"}
 smart-default = "0.5.2"
 serde = "1.0.90"
 thread_profiler = "0.3.0"
 
+# TODO: update dependencies for Amethyst newest version
+#amethyst_test = "0.2.0"
+#amethyst-imgui = "0.3.0"
+#amethyst-inspector = { git = "https://github.com/awpteamoose/amethyst-inspector.git"}
+
 [features]
 profiler = [
     "thread_profiler/thread_profiler",