world-digger-amethyst

[Archive] Game about Digging a lot using upgradable tools. Made using the Amethyst Engine. Might resume work on it eventually.
git clone https://git.jojolepro.com/world-digger-amethyst.git
Log | Files | Refs | README | LICENSE

commit 7a41850ea49e33e8dc7982a67c5067814f43d39c
parent b73d3c2138bb0e8570ee09bbffec701e5c8ea86f
Author: Joël Lupien (Jojolepro) <jojolepromain@gmail.com>
Date:   Tue,  6 Mar 2018 19:47:21 -0500

raycast + ui + a good portion of the gameplay logic

Diffstat:
MCargo.lock | 229++++++++++++++++++++++++++++++++++++++-----------------------------------------
MCargo.toml | 4++--
Aassets/fonts/Nunito-Black.ttf | 0
Aassets/fonts/square.ttf | 0
Mresources/display_config.ron | 2+-
Msrc/main.rs | 332+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------
Msrc/player.rs | 67++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------
7 files changed, 472 insertions(+), 162 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock @@ -11,24 +11,24 @@ name = "alsa-sys" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "amethyst" version = "0.6.0" -source = "git+https://github.com/amethyst/amethyst?branch=develop#db552a76139a4f2fba1fafcabc81f69fa95223e8" -dependencies = [ - "amethyst_assets 0.2.0 (git+https://github.com/amethyst/amethyst?branch=develop)", - "amethyst_audio 0.1.0 (git+https://github.com/amethyst/amethyst?branch=develop)", - "amethyst_config 0.5.0 (git+https://github.com/amethyst/amethyst?branch=develop)", - "amethyst_controls 0.1.0 (git+https://github.com/amethyst/amethyst?branch=develop)", - "amethyst_core 0.1.0 (git+https://github.com/amethyst/amethyst?branch=develop)", - "amethyst_input 0.2.1 (git+https://github.com/amethyst/amethyst?branch=develop)", - "amethyst_renderer 0.6.1 (git+https://github.com/amethyst/amethyst?branch=develop)", - "amethyst_ui 0.2.0 (git+https://github.com/amethyst/amethyst?branch=develop)", - "amethyst_utils 0.2.0 (git+https://github.com/amethyst/amethyst?branch=develop)", +source = "git+https://github.com/jojolepro/amethyst?branch=uilayout#bb15fa601695e5f19cc1f1256c281580f1868e16" +dependencies = [ + "amethyst_assets 0.2.0 (git+https://github.com/jojolepro/amethyst?branch=uilayout)", + "amethyst_audio 0.1.0 (git+https://github.com/jojolepro/amethyst?branch=uilayout)", + "amethyst_config 0.5.0 (git+https://github.com/jojolepro/amethyst?branch=uilayout)", + "amethyst_controls 0.1.0 (git+https://github.com/jojolepro/amethyst?branch=uilayout)", + "amethyst_core 0.1.0 (git+https://github.com/jojolepro/amethyst?branch=uilayout)", + "amethyst_input 0.2.1 (git+https://github.com/jojolepro/amethyst?branch=uilayout)", + "amethyst_renderer 0.6.1 (git+https://github.com/jojolepro/amethyst?branch=uilayout)", + "amethyst_ui 0.2.0 (git+https://github.com/jojolepro/amethyst?branch=uilayout)", + "amethyst_utils 0.2.0 (git+https://github.com/jojolepro/amethyst?branch=uilayout)", "derivative 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "fern 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -44,9 +44,9 @@ dependencies = [ [[package]] name = "amethyst-rhusics" version = "0.1.0" -source = "git+https://github.com/amethyst/amethyst-rhusics?branch=fix/docs#227d4c940f0ca42b8de61a469c668dac57a19e64" +source = "git+https://github.com/jojolepro/amethyst-rhusics?branch=feature/spatial-collision#297763913bdfd983f1ea3b05c94e6dda2dfb74a7" dependencies = [ - "amethyst_core 0.1.0 (git+https://github.com/amethyst/amethyst?branch=develop)", + "amethyst_core 0.1.0 (git+https://github.com/jojolepro/amethyst?branch=uilayout)", "collision 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", "rhusics-core 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "rhusics-ecs 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -57,9 +57,9 @@ dependencies = [ [[package]] name = "amethyst_assets" version = "0.2.0" -source = "git+https://github.com/amethyst/amethyst?branch=develop#db552a76139a4f2fba1fafcabc81f69fa95223e8" +source = "git+https://github.com/jojolepro/amethyst?branch=uilayout#bb15fa601695e5f19cc1f1256c281580f1868e16" dependencies = [ - "amethyst_core 0.1.0 (git+https://github.com/amethyst/amethyst?branch=develop)", + "amethyst_core 0.1.0 (git+https://github.com/jojolepro/amethyst?branch=uilayout)", "crossbeam 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "derivative 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -74,10 +74,10 @@ dependencies = [ [[package]] name = "amethyst_audio" version = "0.1.0" -source = "git+https://github.com/amethyst/amethyst?branch=develop#db552a76139a4f2fba1fafcabc81f69fa95223e8" +source = "git+https://github.com/jojolepro/amethyst?branch=uilayout#bb15fa601695e5f19cc1f1256c281580f1868e16" dependencies = [ - "amethyst_assets 0.2.0 (git+https://github.com/amethyst/amethyst?branch=develop)", - "amethyst_core 0.1.0 (git+https://github.com/amethyst/amethyst?branch=develop)", + "amethyst_assets 0.2.0 (git+https://github.com/jojolepro/amethyst?branch=uilayout)", + "amethyst_core 0.1.0 (git+https://github.com/jojolepro/amethyst?branch=uilayout)", "cpal 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "rodio 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -89,7 +89,7 @@ dependencies = [ [[package]] name = "amethyst_config" version = "0.5.0" -source = "git+https://github.com/amethyst/amethyst?branch=develop#db552a76139a4f2fba1fafcabc81f69fa95223e8" +source = "git+https://github.com/jojolepro/amethyst?branch=uilayout#bb15fa601695e5f19cc1f1256c281580f1868e16" dependencies = [ "ron 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)", @@ -98,11 +98,11 @@ dependencies = [ [[package]] name = "amethyst_controls" version = "0.1.0" -source = "git+https://github.com/amethyst/amethyst?branch=develop#db552a76139a4f2fba1fafcabc81f69fa95223e8" +source = "git+https://github.com/jojolepro/amethyst?branch=uilayout#bb15fa601695e5f19cc1f1256c281580f1868e16" dependencies = [ - "amethyst_core 0.1.0 (git+https://github.com/amethyst/amethyst?branch=develop)", - "amethyst_input 0.2.1 (git+https://github.com/amethyst/amethyst?branch=develop)", - "amethyst_renderer 0.6.1 (git+https://github.com/amethyst/amethyst?branch=develop)", + "amethyst_core 0.1.0 (git+https://github.com/jojolepro/amethyst?branch=uilayout)", + "amethyst_input 0.2.1 (git+https://github.com/jojolepro/amethyst?branch=uilayout)", + "amethyst_renderer 0.6.1 (git+https://github.com/jojolepro/amethyst?branch=uilayout)", "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "shred 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "specs 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -112,7 +112,7 @@ dependencies = [ [[package]] name = "amethyst_core" version = "0.1.0" -source = "git+https://github.com/amethyst/amethyst?branch=develop#db552a76139a4f2fba1fafcabc81f69fa95223e8" +source = "git+https://github.com/jojolepro/amethyst?branch=uilayout#bb15fa601695e5f19cc1f1256c281580f1868e16" dependencies = [ "cgmath 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", "error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -128,10 +128,10 @@ dependencies = [ [[package]] name = "amethyst_input" version = "0.2.1" -source = "git+https://github.com/amethyst/amethyst?branch=develop#db552a76139a4f2fba1fafcabc81f69fa95223e8" +source = "git+https://github.com/jojolepro/amethyst?branch=uilayout#bb15fa601695e5f19cc1f1256c281580f1868e16" dependencies = [ - "amethyst_config 0.5.0 (git+https://github.com/amethyst/amethyst?branch=develop)", - "amethyst_core 0.1.0 (git+https://github.com/amethyst/amethyst?branch=develop)", + "amethyst_config 0.5.0 (git+https://github.com/jojolepro/amethyst?branch=uilayout)", + "amethyst_core 0.1.0 (git+https://github.com/jojolepro/amethyst?branch=uilayout)", "derivative 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)", @@ -144,16 +144,16 @@ dependencies = [ [[package]] name = "amethyst_renderer" version = "0.6.1" -source = "git+https://github.com/amethyst/amethyst?branch=develop#db552a76139a4f2fba1fafcabc81f69fa95223e8" +source = "git+https://github.com/jojolepro/amethyst?branch=uilayout#bb15fa601695e5f19cc1f1256c281580f1868e16" dependencies = [ - "amethyst_assets 0.2.0 (git+https://github.com/amethyst/amethyst?branch=develop)", - "amethyst_core 0.1.0 (git+https://github.com/amethyst/amethyst?branch=develop)", + "amethyst_assets 0.2.0 (git+https://github.com/jojolepro/amethyst?branch=uilayout)", + "amethyst_core 0.1.0 (git+https://github.com/jojolepro/amethyst?branch=uilayout)", "derivative 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "gfx 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)", "gfx_core 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", - "gfx_device_gl 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gfx_device_gl 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)", "gfx_macros 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "gfx_window_glutin 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", "glutin 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -174,12 +174,12 @@ dependencies = [ [[package]] name = "amethyst_ui" version = "0.2.0" -source = "git+https://github.com/amethyst/amethyst?branch=develop#db552a76139a4f2fba1fafcabc81f69fa95223e8" +source = "git+https://github.com/jojolepro/amethyst?branch=uilayout#bb15fa601695e5f19cc1f1256c281580f1868e16" dependencies = [ - "amethyst_assets 0.2.0 (git+https://github.com/amethyst/amethyst?branch=develop)", - "amethyst_core 0.1.0 (git+https://github.com/amethyst/amethyst?branch=develop)", - "amethyst_input 0.2.1 (git+https://github.com/amethyst/amethyst?branch=develop)", - "amethyst_renderer 0.6.1 (git+https://github.com/amethyst/amethyst?branch=develop)", + "amethyst_assets 0.2.0 (git+https://github.com/jojolepro/amethyst?branch=uilayout)", + "amethyst_core 0.1.0 (git+https://github.com/jojolepro/amethyst?branch=uilayout)", + "amethyst_input 0.2.1 (git+https://github.com/jojolepro/amethyst?branch=uilayout)", + "amethyst_renderer 0.6.1 (git+https://github.com/jojolepro/amethyst?branch=uilayout)", "clipboard 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "derivative 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -197,11 +197,11 @@ dependencies = [ [[package]] name = "amethyst_utils" version = "0.2.0" -source = "git+https://github.com/amethyst/amethyst?branch=develop#db552a76139a4f2fba1fafcabc81f69fa95223e8" +source = "git+https://github.com/jojolepro/amethyst?branch=uilayout#bb15fa601695e5f19cc1f1256c281580f1868e16" dependencies = [ - "amethyst_core 0.1.0 (git+https://github.com/amethyst/amethyst?branch=develop)", - "amethyst_input 0.2.1 (git+https://github.com/amethyst/amethyst?branch=develop)", - "amethyst_renderer 0.6.1 (git+https://github.com/amethyst/amethyst?branch=develop)", + "amethyst_core 0.1.0 (git+https://github.com/jojolepro/amethyst?branch=uilayout)", + "amethyst_input 0.2.1 (git+https://github.com/jojolepro/amethyst?branch=uilayout)", + "amethyst_renderer 0.6.1 (git+https://github.com/jojolepro/amethyst?branch=uilayout)", "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "shred 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "specs 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -247,7 +247,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "backtrace-sys 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", "cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-demangle 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -257,8 +257,8 @@ name = "backtrace-sys" version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cc 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", + "cc 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -296,7 +296,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "cc" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -310,7 +310,7 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "gleam 0.4.23 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -368,7 +368,7 @@ dependencies = [ "bitflags 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "block 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.12.4 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)", "objc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -380,7 +380,7 @@ dependencies = [ "bitflags 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "block 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)", "objc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -403,7 +403,7 @@ version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "core-foundation-sys 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -412,7 +412,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "core-foundation-sys 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -420,7 +420,7 @@ name = "core-foundation-sys" version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -428,7 +428,7 @@ name = "core-foundation-sys" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -439,7 +439,7 @@ dependencies = [ "bitflags 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -450,7 +450,7 @@ dependencies = [ "bitflags 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -460,7 +460,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "coreaudio-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -468,7 +468,7 @@ name = "coreaudio-sys" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -481,7 +481,7 @@ dependencies = [ "futures 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)", "ole32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -584,7 +584,7 @@ name = "flate2" version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)", "miniz-sys 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -650,20 +650,20 @@ dependencies = [ [[package]] name = "gfx_device_gl" -version = "0.15.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "gfx_core 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", - "gfx_gl 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gfx_gl 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "gfx_gl" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "gl_generator 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gl_generator 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -697,22 +697,12 @@ version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "gfx_core 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", - "gfx_device_gl 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gfx_device_gl 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)", "glutin 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "gl_generator" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "khronos_api 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", - "xml-rs 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "gl_generator" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ @@ -751,7 +741,7 @@ dependencies = [ "core-graphics 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", "gl_generator 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)", "objc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "osmesa-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "shared_library 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -836,7 +826,7 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.37" +version = "0.2.39" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -875,7 +865,7 @@ name = "malloc_buf" version = "0.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -883,7 +873,7 @@ name = "memchr" version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -891,7 +881,7 @@ name = "memmap" version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -905,8 +895,8 @@ name = "miniz-sys" version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cc 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", + "cc 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -934,7 +924,7 @@ dependencies = [ "num-integer 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)", "num-iter 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", "num-rational 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", - "num-traits 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "num-traits 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -943,7 +933,7 @@ version = "0.1.43" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "num-integer 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)", - "num-traits 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "num-traits 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -953,7 +943,7 @@ name = "num-complex" version = "0.1.42" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "num-traits 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "num-traits 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -962,7 +952,7 @@ name = "num-integer" version = "0.1.36" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "num-traits 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "num-traits 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -971,7 +961,7 @@ version = "0.1.35" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "num-integer 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)", - "num-traits 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "num-traits 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -981,7 +971,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "num-bigint 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)", "num-integer 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)", - "num-traits 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "num-traits 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -990,12 +980,12 @@ name = "num-traits" version = "0.1.43" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "num-traits 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "num-traits 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "num-traits" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -1003,7 +993,7 @@ name = "num_cpus" version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1093,7 +1083,7 @@ name = "parking_lot_core" version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1139,7 +1129,7 @@ version = "0.3.22" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1149,7 +1139,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1168,7 +1158,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "crossbeam-deque 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1321,7 +1311,7 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1429,7 +1419,7 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)", "redox_syscall 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1441,7 +1431,7 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1457,7 +1447,7 @@ name = "time" version = "0.1.39" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)", "redox_syscall 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1525,7 +1515,7 @@ version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)", "token_store 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "wayland-scanner 0.12.5 (registry+https://github.com/rust-lang/crates.io-index)", "wayland-sys 0.12.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1621,7 +1611,7 @@ dependencies = [ "core-foundation 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.12.4 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)", "objc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "wayland-client 0.12.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1636,8 +1626,8 @@ dependencies = [ name = "world-digger" version = "0.1.0" dependencies = [ - "amethyst 0.6.0 (git+https://github.com/amethyst/amethyst?branch=develop)", - "amethyst-rhusics 0.1.0 (git+https://github.com/amethyst/amethyst-rhusics?branch=fix/docs)", + "amethyst 0.6.0 (git+https://github.com/jojolepro/amethyst?branch=uilayout)", + "amethyst-rhusics 0.1.0 (git+https://github.com/jojolepro/amethyst-rhusics?branch=feature/spatial-collision)", "collision 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)", "rhusics-core 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1661,7 +1651,7 @@ version = "2.17.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1670,7 +1660,7 @@ name = "xcb" version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1690,17 +1680,17 @@ dependencies = [ [metadata] "checksum aho-corasick 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ca972c2ea5f742bfce5687b9aef75506a764f61d37f8f649047846a9686ddb66" "checksum alsa-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9013f855a808ab924a4c08b5c1ec9bd6b04fdb2295b4d570fb723e0ed2802a4f" -"checksum amethyst 0.6.0 (git+https://github.com/amethyst/amethyst?branch=develop)" = "<none>" -"checksum amethyst-rhusics 0.1.0 (git+https://github.com/amethyst/amethyst-rhusics?branch=fix/docs)" = "<none>" -"checksum amethyst_assets 0.2.0 (git+https://github.com/amethyst/amethyst?branch=develop)" = "<none>" -"checksum amethyst_audio 0.1.0 (git+https://github.com/amethyst/amethyst?branch=develop)" = "<none>" -"checksum amethyst_config 0.5.0 (git+https://github.com/amethyst/amethyst?branch=develop)" = "<none>" -"checksum amethyst_controls 0.1.0 (git+https://github.com/amethyst/amethyst?branch=develop)" = "<none>" -"checksum amethyst_core 0.1.0 (git+https://github.com/amethyst/amethyst?branch=develop)" = "<none>" -"checksum amethyst_input 0.2.1 (git+https://github.com/amethyst/amethyst?branch=develop)" = "<none>" -"checksum amethyst_renderer 0.6.1 (git+https://github.com/amethyst/amethyst?branch=develop)" = "<none>" -"checksum amethyst_ui 0.2.0 (git+https://github.com/amethyst/amethyst?branch=develop)" = "<none>" -"checksum amethyst_utils 0.2.0 (git+https://github.com/amethyst/amethyst?branch=develop)" = "<none>" +"checksum amethyst 0.6.0 (git+https://github.com/jojolepro/amethyst?branch=uilayout)" = "<none>" +"checksum amethyst-rhusics 0.1.0 (git+https://github.com/jojolepro/amethyst-rhusics?branch=feature/spatial-collision)" = "<none>" +"checksum amethyst_assets 0.2.0 (git+https://github.com/jojolepro/amethyst?branch=uilayout)" = "<none>" +"checksum amethyst_audio 0.1.0 (git+https://github.com/jojolepro/amethyst?branch=uilayout)" = "<none>" +"checksum amethyst_config 0.5.0 (git+https://github.com/jojolepro/amethyst?branch=uilayout)" = "<none>" +"checksum amethyst_controls 0.1.0 (git+https://github.com/jojolepro/amethyst?branch=uilayout)" = "<none>" +"checksum amethyst_core 0.1.0 (git+https://github.com/jojolepro/amethyst?branch=uilayout)" = "<none>" +"checksum amethyst_input 0.2.1 (git+https://github.com/jojolepro/amethyst?branch=uilayout)" = "<none>" +"checksum amethyst_renderer 0.6.1 (git+https://github.com/jojolepro/amethyst?branch=uilayout)" = "<none>" +"checksum amethyst_ui 0.2.0 (git+https://github.com/jojolepro/amethyst?branch=uilayout)" = "<none>" +"checksum amethyst_utils 0.2.0 (git+https://github.com/jojolepro/amethyst?branch=uilayout)" = "<none>" "checksum android_glue 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "000444226fcff248f2bc4c7625be32c63caccfecc2723a2b9f78a7487a49c407" "checksum approx 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "08abcc3b4e9339e33a3d0a5ed15d84a687350c05689d825e0f6655eef9e76a94" "checksum arrayvec 0.3.25 (registry+https://github.com/rust-lang/crates.io-index)" = "06f59fe10306bb78facd90d28c2038ad23ffaaefa85bac43c8a434cde383334f" @@ -1714,7 +1704,7 @@ dependencies = [ "checksum bitflags 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b3c30d3802dfb7281680d6285f2ccdaa8c2d8fee41f93805dba5c4cf50dc23cf" "checksum block 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" "checksum byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "652805b7e73fada9d85e9a6682a4abd490cb52d96aeecc12e33a0de34dfd0d23" -"checksum cc 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "deaf9ec656256bb25b404c51ef50097207b9cbb29c933d31f92cae5a8a0ffee0" +"checksum cc 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "9be26b24e988625409b19736d130f0c7d224f01d06454b5f81d8d23d6c1a618f" "checksum cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d4c819a1287eb618df47cc647173c5c4c66ba19d888a6e50d605672aed3140de" "checksum cgl 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "86765cb42c2a2c497e142af72517c1b4d7ae5bb2f25dfa77a5c69642f2342d89" "checksum cgmath 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)" = "87f025a17ad3f30d49015c787903976d5f9cd6115ece1eb7f4d6ffe06b8c4080" @@ -1754,12 +1744,11 @@ dependencies = [ "checksum futures 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)" = "0bab5b5e94f5c31fc764ba5dd9ad16568aae5d4825538c01d6bca680c9bf94a7" "checksum gfx 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7d7ce0c1f747245342a73453fdb098ea0764c430421fbc4d98cdc8ef8ede4834" "checksum gfx_core 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d85039b7bda0348fee728e6787876138839ced69650129ab65aee7ee58fc6367" -"checksum gfx_device_gl 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bd623ca10704d54966771a1b2c901b9f4033701e5edb81865c529722887a3054" -"checksum gfx_gl 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "daa001fc5c5d4bc78e0543f04ca3ef123e78fa79cfd7a27179cafddb90251540" +"checksum gfx_device_gl 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4ee355b916fc3441b4366b59e6cfac259fba1b22c35fa1cd1638ff384f89d025" +"checksum gfx_gl 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3e8a920f8f6c1025a7ddf9dd25502bf059506fd3cd765dfbe8dba0b56b7eeecb" "checksum gfx_glyph 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cbbf94c995ca8f55de345285121f628cd4b7749510925e77559813d0e1d74d11" "checksum gfx_macros 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d38f9e1d3f4705b26e73437e35fd71c955aba5781f6bb5391d37a166204d301f" "checksum gfx_window_glutin 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)" = "73aec7a95849ce5f1de58d8fa032e4310d1e9f988f43ce2ab3ba8ea6430acd2b" -"checksum gl_generator 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "04e3e0220a68b8875b5a311fe67ee3b76d3d9b719a92277aff0ec5bb5e7b0ec1" "checksum gl_generator 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4f5c19cde55637681450c92f7a05ea16c78e2b6d0587e601ec1ebdab6960854b" "checksum gl_generator 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a795170cbd85b5a7baa58d6d7525cae6a03e486859860c220f7ebbbdd379d0a" "checksum gleam 0.4.23 (registry+https://github.com/rust-lang/crates.io-index)" = "76e3a7f5351837630a7dd0cd6d7976de547929f9fabd381b9d5ac35f82e90be2" @@ -1775,7 +1764,7 @@ dependencies = [ "checksum lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73" "checksum lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c8f31047daa365f19be14b47c29df4f7c3b581832407daabe6ae77397619237d" "checksum lewton 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c1b7b81410f7895d4793bae921cc62317c5500c6ef211c9c24cad778eda77c20" -"checksum libc 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)" = "56aebce561378d99a0bb578f8cb15b6114d2a1814a6c7949bbe646d968bb4fa9" +"checksum libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)" = "f54263ad99207254cf58b5f701ecb432c717445ea2ee8af387334bdd1a03fdff" "checksum libloading 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "fd38073de8f7965d0c17d30546d4bb6da311ab428d1c7a3fc71dff7f9d4979b9" "checksum linked-hash-map 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "70fb39025bc7cdd76305867c4eccf2f2dcf6e9a57f5b21a93e1c2d86cd03ec9e" "checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" @@ -1795,7 +1784,7 @@ dependencies = [ "checksum num-iter 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)" = "4b226df12c5a59b63569dd57fafb926d91b385dfce33d8074a412411b689d593" "checksum num-rational 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "ee314c74bd753fc86b4780aa9475da469155f3848473a261d2d18e35245a784e" "checksum num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)" = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" -"checksum num-traits 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e7de20f146db9d920c45ee8ed8f71681fd9ade71909b48c3acbd766aa504cf10" +"checksum num-traits 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b3c2bd9b9d21e48e956b763c9f37134dc62d9e95da6edb3f672cacb6caf3cd3" "checksum num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c51a3322e4bca9d212ad9a158a02abc6934d005490c054a2778df73a70aa0a30" "checksum objc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "877f30f37acef6749b1841cceab289707f211aecfc756553cd63976190e6cc2e" "checksum objc-foundation 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" diff --git a/Cargo.toml b/Cargo.toml @@ -4,8 +4,8 @@ version = "0.1.0" authors = ["Joël Lupien (Jojolepro) <jojolepromain@gmail.com>"] [dependencies] -amethyst = { git = "https://github.com/amethyst/amethyst", branch = "develop" } -amethyst-rhusics = { git = "https://github.com/amethyst/amethyst-rhusics", branch = "fix/docs" } +amethyst = { git = "https://github.com/jojolepro/amethyst", branch = "uilayout" } +amethyst-rhusics = { git = "https://github.com/jojolepro/amethyst-rhusics", branch = "feature/spatial-collision" } rhusics-ecs = { version = "0.1", features = ["eders"] } rhusics-core = { version = "0.1", features = ["specs", "eders"] } specs = "0.10" diff --git a/assets/fonts/Nunito-Black.ttf b/assets/fonts/Nunito-Black.ttf Binary files differ. diff --git a/assets/fonts/square.ttf b/assets/fonts/square.ttf Binary files differ. diff --git a/resources/display_config.ron b/resources/display_config.ron @@ -1 +1 @@ -( fullscreen: false, multisampling: 4, title: "World Digger", visibility: true, vsync: false, ) +( fullscreen: false, dimensions:Some((1024,768)), multisampling: 4, title: "World Digger", visibility: true, vsync: false, ) diff --git a/src/main.rs b/src/main.rs @@ -10,15 +10,19 @@ use amethyst::config::Config; use amethyst::controls::{FlyControlTag,FlyControlBundle}; use amethyst::core::frame_limiter::FrameRateLimitStrategy; use amethyst::core::transform::{GlobalTransform, Transform, TransformBundle}; -use amethyst::ecs::{World,VecStorage,Component,Fetch,Entity,System,Join,ReadStorage}; -use amethyst::input::InputBundle; +use amethyst::core::{Time,Parent}; +use amethyst::ecs::{World,VecStorage,Component,Fetch,Entity,System,Join,ReadStorage,FetchMut,Entities}; +use amethyst::input::{InputBundle,InputHandler}; use amethyst::renderer::{AmbientColor, Camera, DisplayConfig, DrawShaded, ElementState, Event, KeyboardInput, Material, MaterialDefaults, MeshHandle, ObjFormat, Pipeline, PosNormTex, Projection, RenderBundle, Rgba, Stage, - VirtualKeyCode, WindowEvent,Texture}; + VirtualKeyCode, WindowEvent,Texture,MouseButton}; use amethyst::shrev::EventChannel; +use amethyst::ui::{Anchor, Anchored, DrawUi, FontAsset, MouseReactive, Stretch, Stretched, + TtfFormat, UiBundle, UiEvent, UiFocused, UiImage, UiText, + UiTransform,TextEditing}; -use amethyst_rhusics::{time_sync, DefaultBasicPhysicsBundle3}; +use amethyst_rhusics::{time_sync, DefaultBasicPhysicsBundle3,SpatialPhysicsBundle3}; use collision::{Aabb3,Ray3}; use collision::dbvt::query_ray_closest; use collision::primitive::{Primitive3,Cuboid}; @@ -27,8 +31,10 @@ use rhusics_ecs::WithRigidBody; use rhusics_ecs::physics3d::{register_physics,BodyPose3, CollisionMode, CollisionStrategy, Mass3,DynamicBoundingVolumeTree3,SpatialSortingSystem3,ContactEvent3, SpatialCollisionSystem3,GJK3,CurrentFrameUpdateSystem3,NextFrameSetupSystem3,ContactResolutionSystem3}; -use amethyst::core::cgmath::{Deg, Array, Basis3,Basis2, One, Point3, Quaternion, Vector3,Matrix3,Zero,EuclideanSpace}; +use amethyst::core::cgmath::{Deg, Array, Basis3,Basis2, One, Point3, Quaternion, Vector3,Matrix3,Zero,EuclideanSpace,Rotation}; +mod player; +use player::{Tool,Backpack,BlockDefinition,BlockDefinitions,BlockInstance,Inventory,UiUpdaterSystem,MineProgress}; /* @@ -48,24 +54,76 @@ UI -struct RayCastSystem; +struct MiningSystem{ + was_down: bool, +} + +impl MiningSystem{ + pub fn new() -> Self{ + MiningSystem{ + was_down: false, + } + } +} -impl<'a> System<'a> for RayCastSystem { +impl<'a> System<'a> for MiningSystem { type SystemData = ( + Entities<'a>, Fetch<'a, DynamicBoundingVolumeTree3<f32>>, ReadStorage<'a, Camera>, ReadStorage<'a, Transform>, + ReadStorage<'a, BlockInstance>, + Fetch<'a, InputHandler<String,String>>, + FetchMut<'a, Inventory>, + FetchMut<'a, MineProgress>, + Fetch<'a, Time>, ); - fn run(&mut self, (tree,camera,transform): Self::SystemData) { - for (tr,_) in (&transform,&camera).join(){ - //let ray = Ray3::new(Point3::new(-4., 10., 0.), Vector3::new(0., -1., 0.)); - let forward = Quaternion::from(tr.rotation).conjugate() * Vector3::unit_z(); - let ray = Ray3::new(Point3::from_vec(tr.translation), forward); - if let Some((v, p)) = query_ray_closest(&*tree, ray) { - println!("hit bounding volume of {:?} at point {:?}", v.value, p); + fn run(&mut self, (entities,tree,camera,transform,block_definitions,input, mut inventory, mut progress, time): Self::SystemData) { + let btn_down = input.mouse_button_is_down(MouseButton::Left); + + if btn_down { + for (tr, _) in (&transform, &camera).join() { + let forward = Quaternion::from(tr.rotation).conjugate().invert() * -Vector3::unit_z(); + let ray = Ray3::new(Point3::from_vec(tr.translation), forward); + if let Some((v, p)) = query_ray_closest(&*tree, ray) { + println!("hit bounding volume of {:?} at point {:?}", v.value, p); + + // TODO raycast lookat + dist check, are we mining same block that we were + if Some(v.value) != progress.block { + progress.block = Some(v.value); + progress.start = time.absolute_time_seconds(); + progress.progress = 0.0; + } + + progress.progress = (time.absolute_time_seconds() - progress.start) as f32 / inventory.tool.use_time; + + if progress.progress > 1.0 { + progress.progress = 1.0; + } + + if progress.progress == 1.0 { + progress.reset(); + + entities.delete(v.value); + + // switch to block def + inventory.carrying += 1; + + if inventory.carrying > inventory.backpack.capacity { + inventory.carrying = inventory.backpack.capacity; + } + } + + } else{ + progress.reset(); + } } + }else if self.was_down{ + progress.reset(); } + + self.was_down = btn_down; } } @@ -102,17 +160,12 @@ struct ExampleState; impl State for ExampleState { fn on_start(&mut self, mut world: &mut World) { - register_physics::<f32, ObjectType>(&mut world); + //register_physics::<f32, ObjectType>(&mut world); //world.register_physics_3d - - - - - initialise_camera(world); - let (mut comps,cube) = { + let (mut comps,cube,font,red,blue,green) = { let mat_defaults = world.read_resource::<MaterialDefaults>().clone(); let loader = world.read_resource::<Loader>(); @@ -121,11 +174,23 @@ impl State for ExampleState { loader.load("cube.obj", ObjFormat, (), (), &mesh_storage) }; + let font = loader.load( + "fonts/Nunito-Black.ttf", + TtfFormat, + Default::default(), + (), + &world.read_resource::<AssetStorage<FontAsset>>(), + ); + + let red = loader.load_from_data([1.0,0.0,0.0,1.0].into(), (), &world.read_resource::<AssetStorage<Texture>>()); + let blue = loader.load_from_data([0.0,0.0,1.0,1.0].into(), (), &world.read_resource::<AssetStorage<Texture>>()); + let green = loader.load_from_data([0.0,1.0,0.0,1.0].into(), (), &world.read_resource::<AssetStorage<Texture>>()); + let tex_storage = world.read_resource(); let radius = 4; - let cube_size = 3.0; + let cube_size = 1.0; let mut comps: Vec<(Material, Transform)> = vec![]; @@ -151,14 +216,14 @@ impl State for ExampleState { } } } - (comps,cube) + (comps,cube,font,red,blue,green) }; //world.register::<ObjectType>(); //world.write_resource::<EventChannel<ContactEvent<Entity, Point3<f32>>>>(); while let Some(c) = comps.pop(){ - /*world + world .create_entity() .with(cube.clone()) .with(c.0) @@ -176,10 +241,28 @@ impl State for ExampleState { Mass3::new(1.0), ) .with(c.1) - .build();*/ + .build(); } + /*let background = world + .create_entity() + .with(UiTransform::new( + "background".to_string(), + 0.0, + 0.0, + 0.0, + 20.0, + 20.0, + 0, + )) + .with(UiImage { + texture: red.clone(), + }) + .with(Stretched::new(Stretch::XY)) + .with(Anchored::new(Anchor::Middle)) + .build();*/ + let mut trans = Transform::default(); trans.translation = Vector3::new(0.0, -20.0, 0.0); world @@ -200,6 +283,187 @@ impl State for ExampleState { .build(); world.add_resource(AmbientColor(Rgba::from([1.0; 3]))); + + + // INVENTORY + let tool1 = Tool{ + name: String::from("Spoon"), + icon: red.clone(), + use_time: 1.0, + mine_quantity: 1, + cost: 0, + }; + + let backpack1 = Backpack{ + name: String::from("Hands"), + icon: blue.clone(), + capacity: 5, + cost: 0, + }; + + let inventory = Inventory{ + tool: tool1, + backpack: backpack1, + carrying: 0, + money: 0, + }; + + + let progress = MineProgress{ + block: None, + start: 0.0, + progress: 0.0, + }; + + + + // World registering stuff + + world.add_resource(inventory); + world.add_resource(progress); + world.add_resource(Time::default()); + world.register::<BlockInstance>(); + + // UI + + world + .create_entity() + .with(UiTransform::new( + "money".to_string(), + 270., + 45., + 1., + 500., + 75., + 1, + )) + .with(UiText::new( + font.clone(), + "0$".to_string(), + [0.2, 0.2, 1.0, 1.0], + 50., + )) + .with(Anchored::new(Anchor::TopLeft)) + .build(); + + world + .create_entity() + .with(UiTransform::new( + "tool".to_string(), + -80., + 45., + 1., + 500., + 75., + 1, + )) + .with(UiText::new( + font.clone(), + "".to_string(), + [0.2, 0.2, 1.0, 1.0], + 50., + )) + .with(Anchored::new(Anchor::TopRight)) + .build(); + + world + .create_entity() + .with(UiTransform::new( + "backpack".to_string(), + -80., + 120., + 1., + 500., + 75., + 1, + )) + .with(UiText::new( + font.clone(), + "".to_string(), + [0.2, 0.2, 1.0, 1.0], + 50., + )) + .with(Anchored::new(Anchor::TopRight)) + .build(); + + world + .create_entity() + .with(UiTransform::new( + "carry".to_string(), + -80., + 195., + 1., + 500., + 75., + 1, + )) + .with(UiText::new( + font.clone(), + "0 Kg".to_string(), + [0.2, 0.2, 1.0, 1.0], + 50., + )) + .with(Anchored::new(Anchor::TopRight)) + .build(); + + world + .create_entity() + .with(UiTransform::new( + "mine progress".to_string(), + 0., + -50., + 1., + 500., + 32., + 1, + )) + .with(UiImage { + texture: red.clone(), + }) + .with(Anchored::new(Anchor::BottomMiddle)) + .build(); + + + let sell_btn = world + .create_entity() + .with(UiTransform::new( + "sell button".to_string(), + 80., + -40., + 1., + 150., + 100., + 1, + )) + .with(UiImage { + texture: green.clone(), + }) + .with(Anchored::new(Anchor::MiddleLeft)) + .build(); + + world + .create_entity() + .with(UiTransform::new( + "sell text".to_string(), + 0., + 0., + -1., + 50., + 40., + -1, + )) + .with(UiText::new( + font.clone(), + "Sell".to_string(), + [0.0, 0.0, 0.0, 1.0], + 50., + )) + .with(Anchored::new(Anchor::Middle)) + .with(Parent{ + entity: sell_btn, + }) + .build(); + } fn handle_event(&mut self, _: &mut World, event: Event) -> Trans { @@ -260,13 +524,14 @@ fn run() -> Result<(), Error> { let pipeline_builder = Pipeline::build().with_stage( Stage::with_backbuffer() .clear_target([1.0, 0.6, 0.8, 1.0], 1.0) - .with_pass(DrawShaded::<PosNormTex>::new()), + .with_pass(DrawShaded::<PosNormTex>::new()) + .with_pass(DrawUi::new()), ); // PHYSIC------------------------- - let mut channel = EventChannel::<ContactEvent<Entity,Point3<f32>>>::new(); + /*let mut channel = EventChannel::<ContactEvent<Entity,Point3<f32>>>::new(); let reader_2 = channel - .register_reader(); + .register_reader();*/ let mut game = Application::build(resources_directory, ExampleState)? .with_frame_limit(FrameRateLimitStrategy::Unlimited, 0) @@ -275,23 +540,26 @@ fn run() -> Result<(), Error> { Some(String::from("move_y")), Some(String::from("move_z")), ).with_speed(20.0).with_sensitivity(0.3,0.3))? + .with_bundle(UiBundle::<String,String>::new())? .with_bundle(TransformBundle::new().with_dep(&["fly_movement"]))? .with_bundle( InputBundle::<String, String>::new().with_bindings_from_file(&key_bindings_path), )? .with_bundle(RenderBundle::new(pipeline_builder, Some(display_config)))? - //.with_bundle(DefaultBasicPhysicsBundle3::<f32,ObjectType>::new())? + //.with_bundle(DefaultBasicPhysicsBundle3::<ObjectType>::new())? + .with_bundle(SpatialPhysicsBundle3::<Primitive3<f32>,Aabb3<f32>,ObjectType>::new())? + .with(UiUpdaterSystem,"ui_updater",&[]) //PHYSICS!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - .with(SpatialSortingSystem3::<f32, BodyPose3<f32>, ObjectType>::new(),"1",&[]) + /*.with(SpatialSortingSystem3::<f32, BodyPose3<f32>, ObjectType>::new(),"1",&[]) .with(SpatialCollisionSystem3::<f32, BodyPose3<f32>, ObjectType>::new().with_narrow_phase(GJK3::new()),"2",&["1"]) .with(CurrentFrameUpdateSystem3::<f32>::new(),"3",&["2"]) .with(NextFrameSetupSystem3::<f32>::new(),"4",&["3"]) - //.with(RayCastSystem,"raycast_test",&["3"]) .with(ContactResolutionSystem3::<f32>::new(reader_2),"5",&["4"]) .with_resource(EventChannel::<ContactEvent<Entity,Point3<f32>>>::new()) - .with_resource(channel) + .with_resource(channel)*/ + .with(MiningSystem::new(),"mining",&[]) .build()?; game.run(); Ok(()) diff --git a/src/player.rs b/src/player.rs @@ -1,19 +1,26 @@ -use specs::{VecStorage,Component}; +use amethyst::ecs::{VecStorage,Component,System,ReadStorage,Fetch,WriteStorage,Join,Entity}; +use amethyst::assets::Handle; +use amethyst::renderer::Texture; +use amethyst::ui::{UiTransform,UiText,UiImage}; // tools, equipped, backpack, tool stats -struct Tool{ +pub struct Tool{ + pub name: String, + pub icon: Handle<Texture>, pub use_time: f32, pub mine_quantity: i32, pub cost: i32, } -struct Backpack{ +pub struct Backpack{ + pub name: String, + pub icon: Handle<Texture>, pub capacity: i32, pub cost: i32, } -struct BlockInstance{ +pub struct BlockInstance{ pub weight_left: i32, } @@ -21,17 +28,63 @@ impl Component for BlockInstance{ type Storage = VecStorage<Self>; } -struct BlockDefinition{ +pub struct BlockDefinition{ pub since_depth: i32, pub weight: i32, } -struct BlockDefinitions{ +pub struct BlockDefinitions{ blocks: Vec<BlockDefinition>, } -struct Inventory{ +pub struct Inventory{ pub tool: Tool, pub backpack: Backpack, pub carrying: i32, + pub money: i32, +} + +pub struct MineProgress{ + pub block: Option<Entity>, + pub start: f64, + pub progress: f32, +} + +impl MineProgress{ + pub fn reset(&mut self){ + self.block = None; + self.start = 0.0; + self.progress = 0.0; + } +} + +pub struct UiUpdaterSystem; + +impl<'a> System<'a> for UiUpdaterSystem { + type SystemData = ( + Fetch<'a, Inventory>, + WriteStorage<'a, UiTransform>, + WriteStorage<'a, UiText>, + WriteStorage<'a, UiImage>, + Fetch<'a, MineProgress>, + ); + + fn run(&mut self, (inventory,mut transforms,mut texts,mut images,progress): Self::SystemData) { + for (tr,mut text) in (&transforms,&mut texts).join(){ + match &*tr.id{ + "money" => text.text = format!("{}$",inventory.money), + "tool" => text.text = format!("{}",inventory.tool.name), + "backpack" => text.text = format!("{}",inventory.backpack.name), + "carry" => text.text = format!("{}/{} Kg",inventory.carrying,inventory.backpack.capacity), + _ => {}, + } + } + + for (mut tr, mut images) in (&mut transforms,&mut images).join(){ + match &*tr.id{ + "mine progress" => tr.width = progress.progress * 500.0, + _ => {}, + } + } + } } \ No newline at end of file