Skip to content
This repository has been archived by the owner on Oct 25, 2021. It is now read-only.

Switch meshes to GLTF #95

Merged
merged 7 commits into from
Jul 16, 2019
Merged

Switch meshes to GLTF #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b4caf1b
Use gltf asset for carnivore
sunreef Jul 15, 2019
fa1e9ab
Use amethyst example glb
sunreef Jul 15, 2019
695fa2a
Put correct glb file
sunreef Jul 15, 2019
66808ef
Fix gltf loading and convert some meshes
sunreef Jul 15, 2019
f3ea086
Add color to the ground and add tree mesh
sunreef Jul 16, 2019
1a47a6f
Restored colors for different creatures
sunreef Jul 16, 2019
045f096
Restore color of mushi
sunreef Jul 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,6 @@

# IntelliJ folder
.idea

# profiles
thread_profile*
193 changes: 193 additions & 0 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 6 additions & 4 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Loading