key-fall

[Archive] Game Idea/Prototype. Similar to Synthesia but playable with a MIDI piano/keyboard. Uses the Amethyst Engine.
git clone https://git.jojolepro.com/key-fall.git
Log | Files | Refs | README

commit e1edad64779c7043eb4c975e3d3231f33aa5ff0f
parent 3060093f578a4a137390d57a8d2b0f9745f9f973
Author: Joël Lupien (Jojolepro) <jojolepromain@gmail.com>
Date:   Fri, 29 Jun 2018 07:36:59 -0400

Updated to newest amethyst version. Freeze is fixed. Cleaned code.

Diffstat:
M.idea/workspace.xml | 476+++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------
MCargo.lock | 1144++++++++++++++++++++++++++++++++++---------------------------------------------
MCargo.toml | 6++++--
Asrc/data/midi.rs | 130+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Asrc/data/mod.rs | 4++++
Asrc/data/notes.rs | 20++++++++++++++++++++
Asrc/data/states.rs | 168+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Msrc/main.rs | 338++++++++++----------------------------------------------------------------------
Asrc/systems/graphics/mod.rs | 2++
Asrc/systems/graphics/notes.rs | 94+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Asrc/systems/mod.rs | 1+
11 files changed, 1291 insertions(+), 1092 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml @@ -2,9 +2,17 @@ <project version="4"> <component name="ChangeListManager"> <list default="true" id="7f4db088-d833-442b-8045-f3ffe2b74658" name="Default" comment=""> + <change afterPath="$PROJECT_DIR$/src/data/midi.rs" afterDir="false" /> + <change afterPath="$PROJECT_DIR$/src/data/mod.rs" afterDir="false" /> + <change afterPath="$PROJECT_DIR$/src/data/notes.rs" afterDir="false" /> + <change afterPath="$PROJECT_DIR$/src/data/states.rs" afterDir="false" /> + <change afterPath="$PROJECT_DIR$/src/systems/graphics/mod.rs" afterDir="false" /> + <change afterPath="$PROJECT_DIR$/src/systems/graphics/notes.rs" afterDir="false" /> + <change afterPath="$PROJECT_DIR$/src/systems/mod.rs" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/Cargo.lock" beforeDir="false" afterPath="$PROJECT_DIR$/Cargo.lock" afterDir="false" /> <change beforePath="$PROJECT_DIR$/Cargo.toml" beforeDir="false" afterPath="$PROJECT_DIR$/Cargo.toml" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/src/main.rs" beforeDir="false" afterPath="$PROJECT_DIR$/src/main.rs" afterDir="false" /> </list> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="TRACKING_ENABLED" value="true" /> @@ -18,36 +26,102 @@ <file leaf-file-name="main.rs" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/main.rs"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="362"> - <caret line="363" column="6" selection-start-line="363" selection-start-column="6" selection-end-line="363" selection-end-column="6" /> - <folding> - <element signature="e#2656#2657#0" expanded="true" /> - <element signature="e#2707#2708#0" expanded="true" /> - <element signature="e#2813#2814#0" expanded="true" /> - <element signature="e#2856#2857#0" expanded="true" /> - <element signature="e#4437#4438#0" expanded="true" /> - <element signature="e#4477#4478#0" expanded="true" /> - <element signature="e#7305#7306#0" expanded="true" /> - <element signature="e#7331#7332#0" expanded="true" /> - </folding> + <state relative-caret-position="216"> + <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" /> </state> </provider> </entry> </file> - <file leaf-file-name="Cargo.toml" pinned="false" current-in-tab="true"> + <file leaf-file-name="notes.rs" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/data/notes.rs"> + <provider selected="true" editor-type-id="text-editor"> + <state> + <caret column="33" selection-start-column="33" selection-end-column="33" /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="midi.rs" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/data/midi.rs"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="426"> + <caret line="107" column="37" selection-start-line="107" selection-start-column="12" selection-end-line="107" selection-end-column="37" /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="mod.rs" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/data/mod.rs"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="32"> + <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="states.rs" pinned="false" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/src/data/states.rs"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="388"> + <caret line="75" column="33" lean-forward="true" selection-start-line="75" selection-start-column="33" selection-end-line="75" selection-end-column="33" /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="mod.rs" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/systems/mod.rs"> + <provider selected="true" editor-type-id="text-editor"> + <state> + <caret column="4" selection-start-column="4" selection-end-column="4" /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="mod.rs" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/systems/graphics/mod.rs"> + <provider selected="true" editor-type-id="text-editor"> + <state> + <caret column="14" selection-start-column="14" selection-end-column="14" /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="notes.rs" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/systems/graphics/notes.rs"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="438"> + <caret line="29" column="14" selection-start-line="29" selection-start-column="14" selection-end-line="29" selection-end-column="14" /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="Cargo.toml" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/Cargo.toml"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="224"> - <caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" /> + <state relative-caret-position="208"> + <caret line="13" column="48" selection-start-line="13" selection-start-column="48" selection-end-line="13" selection-end-column="48" /> </state> </provider> </entry> </file> </leaf> </component> + <component name="FileTemplateManagerImpl"> + <option name="RECENT_TEMPLATES"> + <list> + <option value="Rust File" /> + </list> + </option> + </component> <component name="FindInProjectRecents"> <findStrings> <find>came</find> + <find>println!</find> + <find>Sample midi file read test</find> + <find>GameState</find> + <find>self</find> + <find>MidiEvent</find> + <find>MidiInput</find> </findStrings> </component> <component name="Git.Settings"> @@ -57,13 +131,23 @@ <option name="CHANGED_PATHS"> <list> <option value="$PROJECT_DIR$/.gitignore" /> - <option value="$PROJECT_DIR$/src/main.rs" /> + <option value="$PROJECT_DIR$/src/graphics/notes.rs" /> + <option value="$PROJECT_DIR$/src/systems/mod.rs" /> + <option value="$PROJECT_DIR$/src/systems/graphics/mod.rs" /> + <option value="$PROJECT_DIR$/src/data/mod.rs" /> + <option value="$PROJECT_DIR$/src/systems/graphics/notes.rs" /> + <option value="$PROJECT_DIR$/src/data/midi.rs" /> + <option value="$PROJECT_DIR$/src/data/notes.rs" /> + <option value="$PROJECT_DIR$/src/data/midi_keyboard.rs" /> + <option value="$PROJECT_DIR$/src/utils/error.rs" /> <option value="$PROJECT_DIR$/Cargo.toml" /> + <option value="$PROJECT_DIR$/src/main.rs" /> + <option value="$PROJECT_DIR$/src/data/states.rs" /> </list> </option> </component> <component name="ProjectFrameBounds"> - <option name="x" value="12" /> + <option name="x" value="1932" /> <option name="y" value="15" /> <option name="width" value="1896" /> <option name="height" value="1053" /> @@ -75,6 +159,7 @@ <foldersAlwaysOnTop value="true" /> </navigator> <panes> + <pane id="AndroidView" /> <pane id="ProjectPane"> <subPane> <expand> @@ -92,24 +177,48 @@ <item name="key-fall" type="462c0819:PsiDirectoryNode" /> <item name="src" type="462c0819:PsiDirectoryNode" /> </path> + <path> + <item name="key-fall" type="b2602c69:ProjectViewProjectNode" /> + <item name="key-fall" type="462c0819:PsiDirectoryNode" /> + <item name="src" type="462c0819:PsiDirectoryNode" /> + <item name="data" type="462c0819:PsiDirectoryNode" /> + </path> + <path> + <item name="key-fall" type="b2602c69:ProjectViewProjectNode" /> + <item name="key-fall" type="462c0819:PsiDirectoryNode" /> + <item name="src" type="462c0819:PsiDirectoryNode" /> + <item name="systems" type="462c0819:PsiDirectoryNode" /> + </path> + <path> + <item name="key-fall" type="b2602c69:ProjectViewProjectNode" /> + <item name="key-fall" type="462c0819:PsiDirectoryNode" /> + <item name="src" type="462c0819:PsiDirectoryNode" /> + <item name="systems" type="462c0819:PsiDirectoryNode" /> + <item name="graphics" type="462c0819:PsiDirectoryNode" /> + </path> </expand> <select /> </subPane> </pane> <pane id="PackagesPane" /> <pane id="Scope" /> - <pane id="AndroidView" /> </panes> </component> <component name="PropertiesComponent"> <property name="jdk.selected.JAVA_MODULE" value="1.8" /> - <property name="last_opened_file_path" value="$PROJECT_DIR$" /> + <property name="last_opened_file_path" value="$PROJECT_DIR$/../midir" /> <property name="org.rust.cargo.project.model.PROJECT_DISCOVERY" value="true" /> <property name="project.structure.last.edited" value="Modules" /> <property name="project.structure.proportion" value="0.0" /> <property name="project.structure.side.proportion" value="0.35794184" /> <property name="settings.editor.selected.configurable" value="preferences.lookFeel" /> </component> + <component name="RecentsManager"> + <key name="MoveFile.RECENT_KEYS"> + <recent name="$PROJECT_DIR$/src/systems/graphics" /> + <recent name="$PROJECT_DIR$/src" /> + </key> + </component> <component name="RunDashboard"> <option name="ruleStates"> <list> @@ -167,19 +276,6 @@ <properties /> <listeners /> </configuration> - <configuration default="true" type="Remote" factoryName="Remote"> - <option name="USE_SOCKET_TRANSPORT" value="true" /> - <option name="SERVER_MODE" value="false" /> - <option name="SHMEM_ADDRESS" value="javadebug" /> - <option name="HOST" value="localhost" /> - <option name="PORT" value="5005" /> - </configuration> - <configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin"> - <module name="" /> - <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" /> - <option name="PROGRAM_PARAMETERS" /> - <predefined_log_file id="idea.log" enabled="true" /> - </configuration> </component> <component name="SvnConfiguration"> <configuration /> @@ -195,28 +291,28 @@ <servers /> </component> <component name="ToolWindowManager"> - <frame x="12" y="15" width="1896" height="1053" extended-state="0" /> + <frame x="1932" y="15" width="1896" height="1053" extended-state="0" /> <layout> <window_info anchor="right" id="Palette" order="3" /> <window_info anchor="bottom" id="TODO" order="6" /> - <window_info anchor="right" id="Cargo" order="3" /> - <window_info anchor="right" id="Palette&#9;" order="3" /> + <window_info anchor="right" id="Cargo" order="8" /> + <window_info anchor="right" id="Palette&#9;" order="5" /> <window_info id="Image Layers" order="2" /> - <window_info anchor="right" id="Capture Analysis" order="3" /> - <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" /> - <window_info anchor="right" id="Maven Projects" order="3" /> + <window_info anchor="right" id="Capture Analysis" order="4" /> + <window_info anchor="bottom" id="Event Log" order="9" side_tool="true" /> + <window_info anchor="right" id="Maven Projects" order="7" /> <window_info anchor="bottom" id="Run" order="2" /> - <window_info anchor="bottom" id="Version Control" order="7" /> + <window_info anchor="bottom" id="Version Control" order="8" /> <window_info anchor="bottom" id="Terminal" order="7" /> - <window_info id="Capture Tool" order="2" /> - <window_info id="Designer" order="2" /> - <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.1254054" /> + <window_info id="Capture Tool" order="6" /> + <window_info id="Designer" order="3" /> + <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.12756757" /> <window_info id="Structure" order="1" side_tool="true" weight="0.24972972" /> <window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> - <window_info id="UI Designer" order="2" /> - <window_info anchor="right" id="Theme Preview" order="3" /> + <window_info id="UI Designer" order="4" /> + <window_info anchor="right" id="Theme Preview" order="6" /> <window_info anchor="bottom" id="Debug" order="3" weight="0.4" /> - <window_info id="Favorites" order="2" side_tool="true" /> + <window_info id="Favorites" order="5" side_tool="true" /> <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" /> <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> <window_info anchor="right" id="Commander" order="0" weight="0.4" /> @@ -231,18 +327,127 @@ <component name="editorHistoryManager"> <entry file="file://$PROJECT_DIR$/src/main.rs"> <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="592"> + <caret line="37" column="23" lean-forward="true" selection-start-line="37" selection-start-column="23" selection-end-line="37" selection-end-column="23" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/data/notes.rs"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="288"> + <caret line="18" column="1" lean-forward="true" selection-start-line="18" selection-start-column="1" selection-end-line="18" selection-end-column="1" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/data/midi.rs"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="336"> + <caret line="21" column="16" selection-start-line="21" selection-start-column="16" selection-end-line="21" selection-end-column="16" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/data/mod.rs"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="32"> + <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/data/states.rs"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="16"> + <caret line="1" column="4" selection-start-line="1" selection-start-column="4" selection-end-line="1" selection-end-column="4" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/systems/mod.rs"> + <provider selected="true" editor-type-id="text-editor"> + <state> + <caret column="4" selection-start-column="4" selection-end-column="4" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/systems/graphics/mod.rs"> + <provider selected="true" editor-type-id="text-editor"> + <state> + <caret column="14" selection-start-column="14" selection-end-column="14" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/systems/graphics/notes.rs"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="352"> + <caret line="22" column="30" lean-forward="true" selection-start-line="22" selection-start-column="30" selection-end-line="22" selection-end-column="30" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/Cargo.toml"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="208"> + <caret line="13" column="8" selection-start-line="13" selection-end-line="13" selection-end-column="8" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main.rs"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="368"> + <caret line="23" column="88" selection-start-line="23" selection-start-column="88" selection-end-line="23" selection-end-column="88" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/Cargo.toml"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="224"> + <caret line="14" selection-start-line="14" selection-end-line="14" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main.rs"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="368"> + <caret line="23" column="88" selection-start-line="23" selection-start-column="88" selection-end-line="23" selection-end-column="88" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/Cargo.toml"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="224"> + <caret line="14" selection-start-line="14" selection-end-line="14" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main.rs"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="368"> + <caret line="23" column="88" lean-forward="true" selection-start-line="23" selection-start-column="88" selection-end-line="23" selection-end-column="88" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/Cargo.toml"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="224"> + <caret line="14" selection-start-line="14" selection-end-line="14" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main.rs"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="5808"> + <caret line="363" column="6" selection-start-line="363" selection-start-column="6" selection-end-line="363" selection-end-column="6" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/Cargo.toml"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="224"> + <caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main.rs"> + <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="1584"> <caret line="99" column="82" selection-start-line="99" selection-start-column="82" selection-end-line="99" selection-end-column="82" /> - <folding> - <element signature="e#2656#2657#0" expanded="true" /> - <element signature="e#2707#2708#0" expanded="true" /> - <element signature="e#2813#2814#0" expanded="true" /> - <element signature="e#2856#2857#0" expanded="true" /> - <element signature="e#4437#4438#0" expanded="true" /> - <element signature="e#4477#4478#0" expanded="true" /> - <element signature="e#7305#7306#0" expanded="true" /> - <element signature="e#7331#7332#0" expanded="true" /> - </folding> </state> </provider> </entry> @@ -257,16 +462,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="5552"> <caret line="347" column="8" selection-start-line="347" selection-start-column="8" selection-end-line="347" selection-end-column="8" /> - <folding> - <element signature="e#2656#2657#0" expanded="true" /> - <element signature="e#2707#2708#0" expanded="true" /> - <element signature="e#2813#2814#0" expanded="true" /> - <element signature="e#2856#2857#0" expanded="true" /> - <element signature="e#4437#4438#0" expanded="true" /> - <element signature="e#4477#4478#0" expanded="true" /> - <element signature="e#7305#7306#0" expanded="true" /> - <element signature="e#7331#7332#0" expanded="true" /> - </folding> </state> </provider> </entry> @@ -281,16 +476,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="2304"> <caret line="144" lean-forward="true" selection-start-line="144" selection-end-line="144" /> - <folding> - <element signature="e#2656#2657#0" expanded="true" /> - <element signature="e#2707#2708#0" expanded="true" /> - <element signature="e#2813#2814#0" expanded="true" /> - <element signature="e#2856#2857#0" expanded="true" /> - <element signature="e#4437#4438#0" expanded="true" /> - <element signature="e#4477#4478#0" expanded="true" /> - <element signature="e#7305#7306#0" expanded="true" /> - <element signature="e#7331#7332#0" expanded="true" /> - </folding> </state> </provider> </entry> @@ -302,20 +487,7 @@ </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main.rs"> - <provider selected="true" editor-type-id="text-editor"> - <state> - <folding> - <element signature="e#2656#2657#0" expanded="true" /> - <element signature="e#2707#2708#0" expanded="true" /> - <element signature="e#2813#2814#0" expanded="true" /> - <element signature="e#2856#2857#0" expanded="true" /> - <element signature="e#4437#4438#0" expanded="true" /> - <element signature="e#4477#4478#0" expanded="true" /> - <element signature="e#7305#7306#0" expanded="true" /> - <element signature="e#7331#7332#0" expanded="true" /> - </folding> - </state> - </provider> + <provider selected="true" editor-type-id="text-editor" /> </entry> <entry file="file://$PROJECT_DIR$/Cargo.toml"> <provider selected="true" editor-type-id="text-editor"> @@ -325,95 +497,113 @@ </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main.rs"> + <provider selected="true" editor-type-id="text-editor" /> + </entry> + <entry file="file://$PROJECT_DIR$/src/main.rs"> + <provider selected="true" editor-type-id="text-editor" /> + </entry> + <entry file="file://$PROJECT_DIR$/src/main.rs"> + <provider selected="true" editor-type-id="text-editor" /> + </entry> + <entry file="file://$USER_HOME$/.cargo/git/checkouts/amethyst-fedb0a1032a075ce/108486f/amethyst_core/src/transform/bundle.rs"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="302"> + <caret line="22" column="11" selection-start-line="22" selection-start-column="11" selection-end-line="22" selection-end-column="11" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/.gitignore"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="16"> + <caret line="1" selection-start-line="1" selection-end-line="1" /> + </state> + </provider> + </entry> + <entry file="file:///shareddata/share/Prog/Rust/amethyst-extra/src/lib.rs"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="303"> + <caret line="336" column="11" selection-start-line="336" selection-start-column="11" selection-end-line="336" selection-end-column="11" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/systems/mod.rs"> <provider selected="true" editor-type-id="text-editor"> <state> - <folding> - <element signature="e#2656#2657#0" expanded="true" /> - <element signature="e#2707#2708#0" expanded="true" /> - <element signature="e#2813#2814#0" expanded="true" /> - <element signature="e#2856#2857#0" expanded="true" /> - <element signature="e#4437#4438#0" expanded="true" /> - <element signature="e#4477#4478#0" expanded="true" /> - <element signature="e#7305#7306#0" expanded="true" /> - <element signature="e#7331#7332#0" expanded="true" /> - </folding> + <caret column="4" selection-start-column="4" selection-end-column="4" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main.rs"> + <entry file="file://$PROJECT_DIR$/src/systems/graphics/mod.rs"> <provider selected="true" editor-type-id="text-editor"> <state> - <folding> - <element signature="e#2656#2657#0" expanded="true" /> - <element signature="e#2707#2708#0" expanded="true" /> - <element signature="e#2813#2814#0" expanded="true" /> - <element signature="e#2856#2857#0" expanded="true" /> - <element signature="e#4437#4438#0" expanded="true" /> - <element signature="e#4477#4478#0" expanded="true" /> - <element signature="e#7305#7306#0" expanded="true" /> - <element signature="e#7331#7332#0" expanded="true" /> - </folding> + <caret column="14" selection-start-column="14" selection-end-column="14" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main.rs"> + <entry file="file://$PROJECT_DIR$/src/systems/graphics/notes.rs"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="438"> + <caret line="29" column="14" selection-start-line="29" selection-start-column="14" selection-end-line="29" selection-end-column="14" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/data/midi_keyboard.rs"> <provider selected="true" editor-type-id="text-editor"> <state> + <caret lean-forward="true" selection-end-line="8" selection-end-column="1" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/utils/error.rs"> + <provider selected="true" editor-type-id="text-editor"> + <state> + <caret selection-end-line="43" selection-end-column="1" /> <folding> - <element signature="e#2656#2657#0" expanded="true" /> - <element signature="e#2707#2708#0" expanded="true" /> - <element signature="e#2813#2814#0" expanded="true" /> - <element signature="e#2856#2857#0" expanded="true" /> - <element signature="e#4437#4438#0" expanded="true" /> - <element signature="e#4477#4478#0" expanded="true" /> - <element signature="e#7305#7306#0" expanded="true" /> - <element signature="e#7331#7332#0" expanded="true" /> + <element signature="e#1156#1157#0" expanded="true" /> + <element signature="e#1185#1186#0" expanded="true" /> </folding> </state> </provider> </entry> - <entry file="file://$USER_HOME$/.cargo/git/checkouts/amethyst-fedb0a1032a075ce/108486f/amethyst_core/src/transform/bundle.rs"> + <entry file="file://$PROJECT_DIR$/Cargo.toml"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="302"> - <caret line="22" column="11" selection-start-line="22" selection-start-column="11" selection-end-line="22" selection-end-column="11" /> + <state relative-caret-position="208"> + <caret line="13" column="48" selection-start-line="13" selection-start-column="48" selection-end-line="13" selection-end-column="48" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/.gitignore"> + <entry file="file://$PROJECT_DIR$/src/data/mod.rs"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="16"> - <caret line="1" selection-start-line="1" selection-end-line="1" /> + <state relative-caret-position="32"> + <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" /> </state> </provider> </entry> - <entry file="file:///shareddata/share/Prog/Rust/amethyst-extra/src/lib.rs"> + <entry file="file://$PROJECT_DIR$/src/data/midi.rs"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="303"> - <caret line="336" column="11" selection-start-line="336" selection-start-column="11" selection-end-line="336" selection-end-column="11" /> + <state relative-caret-position="426"> + <caret line="107" column="37" selection-start-line="107" selection-start-column="12" selection-end-line="107" selection-end-column="37" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/data/notes.rs"> + <provider selected="true" editor-type-id="text-editor"> + <state> + <caret column="33" selection-start-column="33" selection-end-column="33" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main.rs"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="362"> - <caret line="363" column="6" selection-start-line="363" selection-start-column="6" selection-end-line="363" selection-end-column="6" /> - <folding> - <element signature="e#2656#2657#0" expanded="true" /> - <element signature="e#2707#2708#0" expanded="true" /> - <element signature="e#2813#2814#0" expanded="true" /> - <element signature="e#2856#2857#0" expanded="true" /> - <element signature="e#4437#4438#0" expanded="true" /> - <element signature="e#4477#4478#0" expanded="true" /> - <element signature="e#7305#7306#0" expanded="true" /> - <element signature="e#7331#7332#0" expanded="true" /> - </folding> + <state relative-caret-position="216"> + <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/Cargo.toml"> + <entry file="file://$PROJECT_DIR$/src/data/states.rs"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="224"> - <caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" /> + <state relative-caret-position="388"> + <caret line="75" column="33" lean-forward="true" selection-start-line="75" selection-start-column="33" selection-end-line="75" selection-end-column="33" /> </state> </provider> </entry> diff --git a/Cargo.lock b/Cargo.lock @@ -21,7 +21,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "alsa-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", "nix 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -30,375 +30,219 @@ name = "alsa-sys" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.11 (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#108486f610e1f66de788f4125277ad5b2e5ee2e6" +version = "0.7.0" +source = "git+https://github.com/amethyst/amethyst?branch=develop#4b7dc40fbbf85be40438f81e2cb48f7bca33ab05" dependencies = [ - "amethyst_animation 0.1.0 (git+https://github.com/amethyst/amethyst?branch=develop)", - "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_animation 0.2.0 (git+https://github.com/amethyst/amethyst?branch=develop)", + "amethyst_assets 0.3.0 (git+https://github.com/amethyst/amethyst?branch=develop)", + "amethyst_audio 0.2.0 (git+https://github.com/amethyst/amethyst?branch=develop)", + "amethyst_config 0.6.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_core 0.2.0 (git+https://github.com/amethyst/amethyst?branch=develop)", + "amethyst_input 0.3.0 (git+https://github.com/amethyst/amethyst?branch=develop)", + "amethyst_renderer 0.7.0 (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)", "derivative 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "fern 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rayon 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc_version_runtime 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "vergen 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "winit 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "amethyst" -version = "0.6.0" -dependencies = [ - "amethyst_animation 0.1.0", - "amethyst_assets 0.2.0", - "amethyst_audio 0.1.0", - "amethyst_config 0.5.0", - "amethyst_controls 0.1.0", - "amethyst_core 0.1.0", - "amethyst_input 0.2.1", - "amethyst_renderer 0.6.1", - "amethyst_ui 0.2.0", - "amethyst_utils 0.2.0", - "derivative 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "fern 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", + "fern 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "rayon 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version_runtime 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "vergen 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "winit 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)", + "winit 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "amethyst-extra" version = "0.1.0" dependencies = [ - "amethyst 0.6.0 (git+https://github.com/amethyst/amethyst?branch=develop)", + "amethyst 0.7.0 (git+https://github.com/amethyst/amethyst?branch=develop)", "dirty 0.2.0 (git+https://github.com/jojolepro/dirty)", - "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", - "ron 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.53 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.53 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "ron 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.66 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.66 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "amethyst_animation" -version = "0.1.0" -source = "git+https://github.com/amethyst/amethyst?branch=develop#108486f610e1f66de788f4125277ad5b2e5ee2e6" -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_renderer 0.6.1 (git+https://github.com/amethyst/amethyst?branch=develop)", - "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", - "hibitset 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", - "itertools 0.7.8 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", - "minterpolate 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.53 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "amethyst_animation" -version = "0.1.0" -dependencies = [ - "amethyst_assets 0.2.0", - "amethyst_core 0.1.0", - "amethyst_renderer 0.6.1", - "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", - "hibitset 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", - "itertools 0.7.8 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", - "minterpolate 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.53 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "amethyst_assets" version = "0.2.0" -source = "git+https://github.com/amethyst/amethyst?branch=develop#108486f610e1f66de788f4125277ad5b2e5ee2e6" +source = "git+https://github.com/amethyst/amethyst?branch=develop#4b7dc40fbbf85be40438f81e2cb48f7bca33ab05" dependencies = [ - "amethyst_core 0.1.0 (git+https://github.com/amethyst/amethyst?branch=develop)", - "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)", + "amethyst_assets 0.3.0 (git+https://github.com/amethyst/amethyst?branch=develop)", + "amethyst_core 0.2.0 (git+https://github.com/amethyst/amethyst?branch=develop)", + "amethyst_renderer 0.7.0 (git+https://github.com/amethyst/amethyst?branch=develop)", "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "hibitset 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)", - "parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "rayon 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", + "itertools 0.7.8 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "minterpolate 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.66 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "amethyst_assets" -version = "0.2.0" +version = "0.3.0" +source = "git+https://github.com/amethyst/amethyst?branch=develop#4b7dc40fbbf85be40438f81e2cb48f7bca33ab05" dependencies = [ - "amethyst_core 0.1.0", + "amethyst_core 0.2.0 (git+https://github.com/amethyst/amethyst?branch=develop)", "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)", "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "hibitset 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)", + "log 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "rayon 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", + "ron 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.66 (registry+https://github.com/rust-lang/crates.io-index)", + "shred 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "shred-derive 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "amethyst_audio" -version = "0.1.0" -source = "git+https://github.com/amethyst/amethyst?branch=develop#108486f610e1f66de788f4125277ad5b2e5ee2e6" -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)", - "cpal 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rodio 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "smallvec 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "amethyst_audio" -version = "0.1.0" +version = "0.2.0" +source = "git+https://github.com/amethyst/amethyst?branch=develop#4b7dc40fbbf85be40438f81e2cb48f7bca33ab05" dependencies = [ - "amethyst_assets 0.2.0", - "amethyst_core 0.1.0", + "amethyst_assets 0.3.0 (git+https://github.com/amethyst/amethyst?branch=develop)", + "amethyst_core 0.2.0 (git+https://github.com/amethyst/amethyst?branch=develop)", "cpal 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rodio 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "rodio 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.66 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "amethyst_config" -version = "0.5.0" -source = "git+https://github.com/amethyst/amethyst?branch=develop#108486f610e1f66de788f4125277ad5b2e5ee2e6" -dependencies = [ - "ron 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.53 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "amethyst_config" -version = "0.5.0" -dependencies = [ - "ron 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.53 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "amethyst_controls" -version = "0.1.0" -source = "git+https://github.com/amethyst/amethyst?branch=develop#108486f610e1f66de788f4125277ad5b2e5ee2e6" +version = "0.6.0" +source = "git+https://github.com/amethyst/amethyst?branch=develop#4b7dc40fbbf85be40438f81e2cb48f7bca33ab05" 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)", - "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", - "winit 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)", + "ron 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.66 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "amethyst_controls" version = "0.1.0" +source = "git+https://github.com/amethyst/amethyst?branch=develop#4b7dc40fbbf85be40438f81e2cb48f7bca33ab05" dependencies = [ - "amethyst_core 0.1.0", - "amethyst_input 0.2.1", - "amethyst_renderer 0.6.1", - "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", - "winit 0.14.0 (git+https://github.com/francesca64/winit?branch=x11-get-prop)", + "amethyst_assets 0.3.0 (git+https://github.com/amethyst/amethyst?branch=develop)", + "amethyst_core 0.2.0 (git+https://github.com/amethyst/amethyst?branch=develop)", + "amethyst_input 0.3.0 (git+https://github.com/amethyst/amethyst?branch=develop)", + "amethyst_renderer 0.7.0 (git+https://github.com/amethyst/amethyst?branch=develop)", + "serde 1.0.66 (registry+https://github.com/rust-lang/crates.io-index)", + "winit 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "amethyst_core" -version = "0.1.0" -source = "git+https://github.com/amethyst/amethyst?branch=develop#108486f610e1f66de788f4125277ad5b2e5ee2e6" -dependencies = [ - "cgmath 0.16.1 (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)", - "hibitset 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)", - "quickcheck 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rayon 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.53 (registry+https://github.com/rust-lang/crates.io-index)", - "shred 0.7.0-alpha5 (registry+https://github.com/rust-lang/crates.io-index)", - "shrev 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "specs 0.11.0-alpha6 (registry+https://github.com/rust-lang/crates.io-index)", - "specs-hierarchy 0.1.0-alpha6 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "amethyst_core" -version = "0.1.0" +version = "0.2.0" +source = "git+https://github.com/amethyst/amethyst?branch=develop#4b7dc40fbbf85be40438f81e2cb48f7bca33ab05" dependencies = [ "cgmath 0.16.1 (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)", "hibitset 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)", + "log 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "quickcheck 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "rayon 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.53 (registry+https://github.com/rust-lang/crates.io-index)", - "shred 0.7.0-alpha5 (registry+https://github.com/rust-lang/crates.io-index)", - "shrev 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "specs 0.11.0-alpha6 (registry+https://github.com/rust-lang/crates.io-index)", - "specs-hierarchy 0.1.0-alpha6 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.66 (registry+https://github.com/rust-lang/crates.io-index)", + "shred 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "shrev 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", + "specs 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", + "specs-hierarchy 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "amethyst_input" -version = "0.2.1" -source = "git+https://github.com/amethyst/amethyst?branch=develop#108486f610e1f66de788f4125277ad5b2e5ee2e6" -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)", - "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.53 (registry+https://github.com/rust-lang/crates.io-index)", - "smallvec 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", - "winit 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "amethyst_input" -version = "0.2.1" -dependencies = [ - "amethyst_config 0.5.0", - "amethyst_core 0.1.0", - "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.53 (registry+https://github.com/rust-lang/crates.io-index)", - "smallvec 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", - "winit 0.14.0 (git+https://github.com/francesca64/winit?branch=x11-get-prop)", -] - -[[package]] -name = "amethyst_renderer" -version = "0.6.1" -source = "git+https://github.com/amethyst/amethyst?branch=develop#108486f610e1f66de788f4125277ad5b2e5ee2e6" +version = "0.3.0" +source = "git+https://github.com/amethyst/amethyst?branch=develop#4b7dc40fbbf85be40438f81e2cb48f7bca33ab05" 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_config 0.6.0 (git+https://github.com/amethyst/amethyst?branch=develop)", + "amethyst_core 0.2.0 (git+https://github.com/amethyst/amethyst?branch=develop)", "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.2 (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.23.0 (registry+https://github.com/rust-lang/crates.io-index)", - "glutin 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", - "hetseq 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "hibitset 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", - "imagefmt 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rayon 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.53 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.53 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.66 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", - "wavefront_obj 5.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "winit 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)", + "winit 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "amethyst_renderer" -version = "0.6.1" +version = "0.7.0" +source = "git+https://github.com/amethyst/amethyst?branch=develop#4b7dc40fbbf85be40438f81e2cb48f7bca33ab05" dependencies = [ - "amethyst_assets 0.2.0", - "amethyst_core 0.1.0", + "amethyst_assets 0.3.0 (git+https://github.com/amethyst/amethyst?branch=develop)", + "amethyst_core 0.2.0 (git+https://github.com/amethyst/amethyst?branch=develop)", "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)", + "genmesh 0.6.2 (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.2 (registry+https://github.com/rust-lang/crates.io-index)", + "gfx_device_gl 0.15.3 (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.23.0 (registry+https://github.com/rust-lang/crates.io-index)", - "glutin 0.15.0", + "gfx_window_glutin 0.24.0 (registry+https://github.com/rust-lang/crates.io-index)", + "glsl-layout 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "glutin 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", "hetseq 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "hibitset 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "imagefmt 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "rayon 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.53 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.53 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.66 (registry+https://github.com/rust-lang/crates.io-index)", + "shred 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "shred-derive 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "wavefront_obj 5.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "winit 0.14.0 (git+https://github.com/francesca64/winit?branch=x11-get-prop)", + "winit 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "amethyst_ui" version = "0.2.0" -source = "git+https://github.com/amethyst/amethyst?branch=develop#108486f610e1f66de788f4125277ad5b2e5ee2e6" +source = "git+https://github.com/amethyst/amethyst?branch=develop#4b7dc40fbbf85be40438f81e2cb48f7bca33ab05" 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.3.0 (git+https://github.com/amethyst/amethyst?branch=develop)", + "amethyst_core 0.2.0 (git+https://github.com/amethyst/amethyst?branch=develop)", + "amethyst_input 0.3.0 (git+https://github.com/amethyst/amethyst?branch=develop)", + "amethyst_renderer 0.7.0 (git+https://github.com/amethyst/amethyst?branch=develop)", "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)", "gfx 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gfx_glyph 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", + "gfx_glyph 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", + "glsl-layout 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "hibitset 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rusttype 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", - "shred 0.7.0-alpha5 (registry+https://github.com/rust-lang/crates.io-index)", - "shred-derive 0.5.0-alpha1 (registry+https://github.com/rust-lang/crates.io-index)", + "ron 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.66 (registry+https://github.com/rust-lang/crates.io-index)", + "shred 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "shred-derive 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-normalization 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-segmentation 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "winit 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "amethyst_ui" -version = "0.2.0" -dependencies = [ - "amethyst_assets 0.2.0", - "amethyst_core 0.1.0", - "amethyst_input 0.2.1", - "amethyst_renderer 0.6.1", - "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)", - "gfx 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gfx_glyph 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "hibitset 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rusttype 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", - "shred 0.7.0-alpha5 (registry+https://github.com/rust-lang/crates.io-index)", - "shred-derive 0.5.0-alpha1 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-normalization 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-segmentation 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "winit 0.14.0 (git+https://github.com/francesca64/winit?branch=x11-get-prop)", + "winit 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "amethyst_utils" version = "0.2.0" -source = "git+https://github.com/amethyst/amethyst?branch=develop#108486f610e1f66de788f4125277ad5b2e5ee2e6" +source = "git+https://github.com/amethyst/amethyst?branch=develop#4b7dc40fbbf85be40438f81e2cb48f7bca33ab05" dependencies = [ - "amethyst_core 0.1.0 (git+https://github.com/amethyst/amethyst?branch=develop)", - "winit 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "amethyst_utils" -version = "0.2.0" -dependencies = [ - "amethyst_core 0.1.0", - "winit 0.14.0 (git+https://github.com/francesca64/winit?branch=x11-get-prop)", + "amethyst_assets 0.3.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.2.0 (git+https://github.com/amethyst/amethyst?branch=develop)", + "amethyst_renderer 0.7.0 (git+https://github.com/amethyst/amethyst?branch=develop)", + "serde 1.0.66 (registry+https://github.com/rust-lang/crates.io-index)", + "shred 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "shred-derive 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -411,7 +255,7 @@ name = "ansi_term" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -420,6 +264,14 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] +name = "approx" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "num-traits 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] name = "arrayvec" version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -437,30 +289,30 @@ name = "atty" version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", "termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "backtrace" -version = "0.3.7" +version = "0.3.8" 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)", + "backtrace-sys 0.1.23 (registry+https://github.com/rust-lang/crates.io-index)", "cfg-if 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-demangle 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "backtrace-sys" -version = "0.1.16" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cc 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)", + "cc 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -473,7 +325,7 @@ dependencies = [ "clang-sys 0.21.2 (registry+https://github.com/rust-lang/crates.io-index)", "clap 2.31.2 (registry+https://github.com/rust-lang/crates.io-index)", "env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", "peeking_take_while 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro2 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -509,12 +361,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "byteorder" -version = "1.2.2" +version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "cc" -version = "1.0.15" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -535,8 +387,8 @@ name = "cgl" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "gleam 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -558,7 +410,7 @@ dependencies = [ "mint 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.53 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.66 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -567,7 +419,7 @@ version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", "libloading 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -581,7 +433,7 @@ dependencies = [ "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "textwrap 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-width 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -607,18 +459,18 @@ name = "clipboard-win" version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "cocoa" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 1.0.3 (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.40 (registry+https://github.com/rust-lang/crates.io-index)", + "core-graphics 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", "objc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -628,16 +480,16 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "core-foundation-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "core-foundation" -version = "0.5.1" +version = "0.6.0" 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.40 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -645,7 +497,7 @@ name = "core-foundation-sys" version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -653,18 +505,23 @@ name = "core-foundation-sys" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] +name = "core-foundation-sys" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] name = "core-graphics" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "core-foundation 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation 0.6.0 (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.40 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -673,12 +530,12 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "coreaudio-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "coreaudio-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "coreaudio-sys" -version = "0.2.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bindgen 0.32.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -712,9 +569,9 @@ dependencies = [ "core-foundation-sys 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "coreaudio-rs 0.9.1 (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.40 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", "stdweb 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -739,7 +596,7 @@ dependencies = [ "arrayvec 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", "cfg-if 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "crossbeam-utils 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "nodrop 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", "scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -778,7 +635,7 @@ dependencies = [ [[package]] name = "downcast-rs" -version = "1.0.1" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -787,7 +644,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.53 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.66 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -818,15 +675,15 @@ name = "error-chain" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "backtrace 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", + "backtrace 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "fern" -version = "0.5.5" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -834,7 +691,7 @@ name = "flate2" version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", "miniz-sys 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -880,7 +737,16 @@ name = "fxhash" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "byteorder 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "genmesh" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "cgmath 0.16.1 (registry+https://github.com/rust-lang/crates.io-index)", + "mint 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -891,7 +757,7 @@ dependencies = [ "derivative 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "draw_state 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "gfx_core 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -902,18 +768,18 @@ dependencies = [ "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "derivative 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "draw_state 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.53 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.66 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "gfx_device_gl" -version = "0.15.2" +version = "0.15.3" 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.5.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -926,16 +792,15 @@ dependencies = [ [[package]] name = "gfx_glyph" -version = "0.9.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "backtrace 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", + "backtrace 0.3.8 (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)", - "linked-hash-map 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "ordered-float 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rusttype 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", + "rusttype 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "twox-hash 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-normalization 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "xi-unicode 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -952,12 +817,12 @@ dependencies = [ [[package]] name = "gfx_window_glutin" -version = "0.23.0" +version = "0.24.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.2 (registry+https://github.com/rust-lang/crates.io-index)", - "glutin 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gfx_device_gl 0.15.3 (registry+https://github.com/rust-lang/crates.io-index)", + "glutin 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -965,7 +830,7 @@ name = "ghakuf" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "byteorder 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -975,13 +840,13 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "khronos_api 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.2 (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 = "gleam" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "gl_generator 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -993,46 +858,44 @@ version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] -name = "glutin" -version = "0.15.0" +name = "glsl-layout" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "android_glue 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "cgl 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "cocoa 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", - "core-foundation 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "core-graphics 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gl_generator 0.9.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.40 (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)", - "wayland-client 0.12.5 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "winit 0.14.0 (git+https://github.com/francesca64/winit?branch=x11-get-prop)", - "x11-dl 2.17.5 (registry+https://github.com/rust-lang/crates.io-index)", + "cgmath 0.16.1 (registry+https://github.com/rust-lang/crates.io-index)", + "gfx_core 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", + "glsl-layout-derive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "glsl-layout-derive" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "quote 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.13.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "glutin" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "android_glue 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "cgl 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "cocoa 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", - "core-foundation 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "core-graphics 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cocoa 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "core-graphics 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", "gl_generator 0.9.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.40 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.42 (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)", - "wayland-client 0.12.5 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "winit 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)", - "x11-dl 2.17.5 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-client 0.20.10 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", + "winit 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)", + "x11-dl 2.18.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1091,10 +954,11 @@ dependencies = [ name = "key-fall" version = "0.1.0" dependencies = [ - "amethyst 0.6.0", + "amethyst 0.7.0 (git+https://github.com/amethyst/amethyst?branch=develop)", "amethyst-extra 0.1.0", "ghakuf 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "midir 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1110,7 +974,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "lazy_static" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -1118,13 +982,13 @@ name = "lewton" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "byteorder 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "ogg 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "libc" -version = "0.2.40" +version = "0.2.42" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -1133,7 +997,7 @@ version = "0.4.3" 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)", - "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1142,8 +1006,8 @@ name = "libloading" version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cc 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cc 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1156,23 +1020,31 @@ name = "log" version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "log" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] +name = "mach" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] name = "malloc_buf" version = "0.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1185,7 +1057,7 @@ name = "memchr" version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1193,7 +1065,7 @@ name = "memchr" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1201,7 +1073,7 @@ name = "memchr" version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1209,8 +1081,8 @@ name = "memmap" version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1226,7 +1098,7 @@ dependencies = [ "alsa 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "coremidi 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", "memalloc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "nix 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1234,20 +1106,29 @@ dependencies = [ ] [[package]] -name = "miniz-sys" -version = "0.1.10" +name = "minimp3" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cc 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)", + "minimp3-sys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "slice-deque 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] -name = "mint" -version = "0.4.9" +name = "minimp3-sys" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "mint 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cc 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "miniz-sys" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "cc 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1257,12 +1138,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "minterpolate" -version = "0.2.2" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "mint 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)", + "mint 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "num 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.53 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.66 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1277,7 +1158,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "cfg-if 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", + "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "nix" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", + "cc 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1299,21 +1192,21 @@ name = "num" version = "0.1.42" 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-bigint 0.1.44 (registry+https://github.com/rust-lang/crates.io-index)", "num-complex 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)", - "num-integer 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", - "num-iter 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)", + "num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)", + "num-iter 0.1.37 (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.3 (registry+https://github.com/rust-lang/crates.io-index)", + "num-traits 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "num-bigint" -version = "0.1.43" +version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "num-integer 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", - "num-traits 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)", + "num-traits 0.2.5 (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)", ] @@ -1323,25 +1216,25 @@ name = "num-complex" version = "0.1.43" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "num-traits 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "num-traits 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "num-integer" -version = "0.1.37" +version = "0.1.39" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "num-traits 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "num-traits 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "num-iter" -version = "0.1.36" +version = "0.1.37" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "num-integer 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", - "num-traits 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)", + "num-traits 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1349,9 +1242,9 @@ name = "num-rational" version = "0.1.42" 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.37 (registry+https://github.com/rust-lang/crates.io-index)", - "num-traits 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "num-bigint 0.1.44 (registry+https://github.com/rust-lang/crates.io-index)", + "num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)", + "num-traits 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1360,12 +1253,12 @@ name = "num-traits" version = "0.1.43" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "num-traits 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "num-traits 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "num-traits" -version = "0.2.3" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -1373,7 +1266,7 @@ name = "num_cpus" version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1407,7 +1300,7 @@ name = "ogg" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "byteorder 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1432,7 +1325,7 @@ name = "owning_ref" version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "stable_deref_trait 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "stable_deref_trait 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1458,10 +1351,10 @@ name = "parking_lot_core" version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.42 (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.1 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1496,6 +1389,14 @@ dependencies = [ ] [[package]] +name = "proc-macro2" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] name = "quickcheck" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1527,12 +1428,20 @@ dependencies = [ ] [[package]] +name = "quote" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "proc-macro2 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] name = "rand" 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.40 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1542,8 +1451,8 @@ 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.40 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1561,15 +1470,15 @@ version = "1.4.0" 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.40 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.42 (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)", ] [[package]] name = "redox_syscall" -version = "0.1.37" +version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -1577,7 +1486,7 @@ name = "redox_termios" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "redox_syscall 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", + "redox_syscall 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1622,37 +1531,30 @@ name = "remove_dir_all" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "rodio" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cgmath 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)", "claxon 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "cpal 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "hound 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "lewton 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", + "minimp3 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "ron" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "serde 1.0.53 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "ron" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.53 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.66 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1661,6 +1563,14 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] +name = "rustc-hash" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "byteorder 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] name = "rustc-serialize" version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1684,13 +1594,14 @@ dependencies = [ [[package]] name = "rusttype" -version = "0.4.3" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ + "approx 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "arrayvec 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", - "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "linked-hash-map 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "ordered-float 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "stb_truetype 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1706,20 +1617,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "serde" -version = "1.0.53" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "serde_derive 1.0.53 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.66 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "serde_derive" -version = "1.0.53" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "proc-macro2 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.13.8 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.14.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1727,25 +1638,25 @@ name = "shared_library" 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.40 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "shred" -version = "0.7.0-alpha5" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "arrayvec 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", "fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "mopa 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "rayon 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", - "smallvec 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "shred-derive" -version = "0.5.0-alpha1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1754,7 +1665,7 @@ dependencies = [ [[package]] name = "shrev" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "derivative 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1762,37 +1673,48 @@ dependencies = [ ] [[package]] +name = "slice-deque" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", + "mach 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] name = "smallvec" version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "serde 1.0.53 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.66 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "smallvec" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "smithay-client-toolkit" -version = "0.2.1" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "byteorder 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "dlib 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "memmap 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", + "nix 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "tempfile 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "wayland-client 0.20.6 (registry+https://github.com/rust-lang/crates.io-index)", - "wayland-commons 0.20.6 (registry+https://github.com/rust-lang/crates.io-index)", - "wayland-protocols 0.20.6 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-client 0.20.10 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-commons 0.20.10 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-protocols 0.20.10 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "specs" -version = "0.11.0-alpha6" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "crossbeam 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1800,29 +1722,30 @@ dependencies = [ "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)", "hibitset 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "mopa 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "rayon 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", - "shred 0.7.0-alpha5 (registry+https://github.com/rust-lang/crates.io-index)", - "shred-derive 0.5.0-alpha1 (registry+https://github.com/rust-lang/crates.io-index)", - "shrev 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "shred 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "shred-derive 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", + "shrev 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "tuple_utils 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "specs-hierarchy" -version = "0.1.0-alpha6" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "hibitset 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", - "shred 0.7.0-alpha5 (registry+https://github.com/rust-lang/crates.io-index)", - "shred-derive 0.5.0-alpha1 (registry+https://github.com/rust-lang/crates.io-index)", - "shrev 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "specs 0.11.0-alpha6 (registry+https://github.com/rust-lang/crates.io-index)", + "shred 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "shred-derive 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", + "shrev 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", + "specs 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "stable_deref_trait" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -1830,7 +1753,7 @@ name = "stb_truetype" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "byteorder 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1864,7 +1787,7 @@ dependencies = [ [[package]] name = "syn" -version = "0.13.8" +version = "0.13.11" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "proc-macro2 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1873,6 +1796,16 @@ dependencies = [ ] [[package]] +name = "syn" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "proc-macro2 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] name = "synom" version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1885,11 +1818,11 @@ name = "tempfile" version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "redox_syscall 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", + "redox_syscall 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", "remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1897,8 +1830,8 @@ name = "termion" version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)", - "redox_syscall 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", + "redox_syscall 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1907,7 +1840,7 @@ name = "textwrap" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "unicode-width 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1916,7 +1849,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.40 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1932,7 +1865,7 @@ name = "thread_local" version = "0.3.5" 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)", + "lazy_static 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1941,17 +1874,12 @@ name = "time" version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.40 (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)", + "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", + "redox_syscall 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] -name = "token_store" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] name = "tuple_utils" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1981,7 +1909,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "unicode-width" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -2046,115 +1974,52 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "wayland-client" -version = "0.12.5" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.40 (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)", -] - -[[package]] -name = "wayland-client" -version = "0.20.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)", - "wayland-commons 0.20.6 (registry+https://github.com/rust-lang/crates.io-index)", - "wayland-scanner 0.20.6 (registry+https://github.com/rust-lang/crates.io-index)", - "wayland-sys 0.20.6 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-commons 0.20.10 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-scanner 0.20.10 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-sys 0.20.10 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "wayland-commons" -version = "0.20.6" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "downcast-rs 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", - "wayland-sys 0.20.6 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "wayland-kbd" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "dlib 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "memmap 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", - "wayland-client 0.12.5 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "wayland-protocols" -version = "0.12.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "wayland-client 0.12.5 (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)", + "downcast-rs 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-sys 0.20.10 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "wayland-protocols" -version = "0.20.6" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "wayland-client 0.20.6 (registry+https://github.com/rust-lang/crates.io-index)", - "wayland-commons 0.20.6 (registry+https://github.com/rust-lang/crates.io-index)", - "wayland-scanner 0.20.6 (registry+https://github.com/rust-lang/crates.io-index)", - "wayland-sys 0.20.6 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-client 0.20.10 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-commons 0.20.10 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-scanner 0.20.10 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-sys 0.20.10 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "wayland-scanner" -version = "0.12.5" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "xml-rs 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] -name = "wayland-scanner" -version = "0.20.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "xml-rs 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "wayland-sys" -version = "0.12.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "dlib 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] name = "wayland-sys" -version = "0.20.6" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "dlib 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "wayland-window" -version = "0.13.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "memmap 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", - "tempfile 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "wayland-client 0.12.5 (registry+https://github.com/rust-lang/crates.io-index)", - "wayland-protocols 0.12.5 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2162,7 +2027,7 @@ name = "which" version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2172,7 +2037,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "winapi" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2196,43 +2061,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "winit" -version = "0.13.1" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "android_glue 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "cocoa 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", - "core-foundation 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "core-graphics 0.13.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.40 (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)", - "wayland-kbd 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)", - "wayland-protocols 0.12.5 (registry+https://github.com/rust-lang/crates.io-index)", - "wayland-window 0.13.3 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "x11-dl 2.17.5 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "winit" -version = "0.14.0" -source = "git+https://github.com/francesca64/winit?branch=x11-get-prop#8055367253235bcfb8c2c1c528c94c33ccbdad9d" -dependencies = [ - "android_glue 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "cocoa 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", - "core-foundation 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "core-graphics 0.13.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.40 (registry+https://github.com/rust-lang/crates.io-index)", + "cocoa 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "core-graphics 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", "objc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", "percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", - "smithay-client-toolkit 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "wayland-client 0.20.6 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "x11-dl 2.17.5 (registry+https://github.com/rust-lang/crates.io-index)", + "smithay-client-toolkit 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-client 0.20.10 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", + "x11-dl 2.18.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2255,11 +2099,11 @@ dependencies = [ [[package]] name = "x11-dl" -version = "2.17.5" +version = "2.18.0" 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.40 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2268,8 +2112,8 @@ name = "xcb" version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2290,33 +2134,34 @@ dependencies = [ "checksum aho-corasick 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "d6531d44de723825aa81398a6415283229725a00fa30713812ab9323faa82fc4" "checksum alsa 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fe0820f7fc33380123dcd5deaadbc4467d56b6cecb60e5d80d6cd523a9664adc" "checksum alsa-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b0edcbbf9ef68f15ae1b620f722180b82a98b6f0628d30baa6b8d2a5abc87d58" -"checksum amethyst 0.6.0 (git+https://github.com/amethyst/amethyst?branch=develop)" = "<none>" -"checksum amethyst_animation 0.1.0 (git+https://github.com/amethyst/amethyst?branch=develop)" = "<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 0.7.0 (git+https://github.com/amethyst/amethyst?branch=develop)" = "<none>" +"checksum amethyst_animation 0.2.0 (git+https://github.com/amethyst/amethyst?branch=develop)" = "<none>" +"checksum amethyst_assets 0.3.0 (git+https://github.com/amethyst/amethyst?branch=develop)" = "<none>" +"checksum amethyst_audio 0.2.0 (git+https://github.com/amethyst/amethyst?branch=develop)" = "<none>" +"checksum amethyst_config 0.6.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_core 0.2.0 (git+https://github.com/amethyst/amethyst?branch=develop)" = "<none>" +"checksum amethyst_input 0.3.0 (git+https://github.com/amethyst/amethyst?branch=develop)" = "<none>" +"checksum amethyst_renderer 0.7.0 (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 android_glue 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "000444226fcff248f2bc4c7625be32c63caccfecc2723a2b9f78a7487a49c407" "checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" "checksum approx 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "08abcc3b4e9339e33a3d0a5ed15d84a687350c05689d825e0f6655eef9e76a94" +"checksum approx 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5817aa36ff3bf3ceb774e8c678c4294d1544f98d9a6af2588c9011a88dbc6994" "checksum arrayvec 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)" = "a1e964f9e24d588183fcb43503abda40d288c8657dfc27311516ce2f05675aef" "checksum atom 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3c86699c3f02778ec07158376991c8f783dd1f2f95c579ffaf0738dc984b2fe2" "checksum atty 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "2fc4a1aa4c24c0718a250f0681885c1af91419d242f29eb8f2ab28502d80dbd1" -"checksum backtrace 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea58cd16fd6c9d120b5bcb01d63883ae4cc7ba2aed35c1841b862a3c7ef6639" -"checksum backtrace-sys 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "44585761d6161b0f57afc49482ab6bd067e4edef48c12a152c237eb0203f7661" +"checksum backtrace 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "dbdd17cd962b570302f5297aea8648d5923e22e555c2ed2d8b2e34eca646bf6d" +"checksum backtrace-sys 0.1.23 (registry+https://github.com/rust-lang/crates.io-index)" = "bff67d0c06556c0b8e6b5f090f0eac52d950d9dfd1d35ba04e4ca3543eaf6a7e" "checksum bindgen 0.32.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8b242e11a8f446f5fc7b76b37e81d737cabca562a927bd33766dac55b5f1177f" "checksum bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "32866f4d103c4e438b1db1158aa1b1a80ee078e5d77a59a2f906fd62a577389c" "checksum bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d" "checksum bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4efd02e230a02e18f92fc2735f44597385ed02ad8f831e7c1c1156ee5e1ab3a5" "checksum bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d0c54bb8f454c567f21197eefcdbf5679d0bd99f2ddbe52e84c77061952e6789" "checksum block 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" -"checksum byteorder 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "73b5bdfe7ee3ad0b99c9801d58807a9dbc9e09196365b0203853b99889ab3c87" -"checksum cc 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)" = "0ebb87d1116151416c0cf66a0e3fb6430cccd120fd6300794b4dfaa050ac40ba" +"checksum byteorder 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "74c0b906e9446b0a2e4f760cdb3fa4b2c48cdc6db8766a845c54b6ff063fd2e9" +"checksum cc 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)" = "49ec142f5768efb5b7622aebc3fdbdbb8950a4b9ba996393cb76ef7466e8747d" "checksum cexpr 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "42aac45e9567d97474a834efdee3081b3c942b2205be932092f53354ce503d6c" "checksum cfg-if 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "405216fd8fe65f718daa7102ea808a946b6ce40c742998fbfd3463645552de18" "checksum cgl 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "80f05e25f9631fdee56693110feda284a49308ca1e768857a0ad3906cfc1502a" @@ -2327,14 +2172,15 @@ dependencies = [ "checksum claxon 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "84d1237389598ada39533a0015b2d04a9e21cae771c1ab9327fb87520c9e84c7" "checksum clipboard 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "b9b4623b47d8637fc9d47564583d4cc01eb8c8e34e26b2bf348bf4b036acb657" "checksum clipboard-win 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "289da2fc09ab964a4948a63287c94fcb4698fa823c46da84c3792928c9d36110" -"checksum cocoa 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b0c23085dde1ef4429df6e5896b89356d35cdd321fb43afe3e378d010bb5adc6" +"checksum cocoa 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b44bd25bd275e9d74a5dff8ca55f2fb66c9ad5e12170d58697701df21a56e0e" "checksum core-foundation 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "25bfd746d203017f7d5cbd31ee5d8e17f94b6521c7af77ece6c9e4b2d4b16c67" -"checksum core-foundation 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "286e0b41c3a20da26536c6000a280585d519fd07b3956b43aed8a79e9edce980" +"checksum core-foundation 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c7caa6cb9e76ddddbea09a03266d6b3bc98cd41e9fb9b017c473e7cca593ec25" "checksum core-foundation-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "065a5d7ffdcbc8fa145d6f0746f3555025b9097a9e9cda59f7467abae670c78d" "checksum core-foundation-sys 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "716c271e8613ace48344f723b60b900a93150271e5be206212d052bbc0883efa" -"checksum core-graphics 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fb0ed45fdc32f9ab426238fba9407dfead7bacd7900c9b4dd3f396f46eafdae3" +"checksum core-foundation-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b2a53cce0ddcf7e7e1f998738d757d5a3bf08bf799a180e50ebe50d298f52f5a" +"checksum core-graphics 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e54c4ab33705fa1fc8af375bb7929d68e1c1546c1ecef408966d8c3e49a1d84a" "checksum coreaudio-rs 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f229761965dad3e9b11081668a6ea00f1def7aa46062321b5ec245b834f6e491" -"checksum coreaudio-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3514bd984efbc6e996748f139fcbadb00c564533b1a28bebdf9895441befeaa6" +"checksum coreaudio-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "78fdbabf58d5b1f461e31b94a571c109284f384cec619a3d96e66ec55b4de82b" "checksum coremidi 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "33326bbe31e4f0102c694281998365bf37ecd7ed08d2993ded0c19c57579cbed" "checksum coremidi-sys 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "07f05827cebb30dcd539ff1ac9bf6764f574a15fa147f8572f99d7617142f95e" "checksum cpal 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "39514c86a5d58efbc5b1d1d7c96902b06bc02b4820940f9a0ef775ca05c54407" @@ -2345,13 +2191,13 @@ dependencies = [ "checksum derivative 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "67b3d6d0e84e53a5bdc263cc59340541877bb541706a191d762bfac6a481bdde" "checksum dirty 0.2.0 (git+https://github.com/jojolepro/dirty)" = "<none>" "checksum dlib 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "77e51249a9d823a4cb79e3eca6dcd756153e8ed0157b6c04775d04bf1b13b76a" -"checksum downcast-rs 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5b28487662892f2f2755292dfac47435fb72375e3f5861c7a59a76abdfb1e21f" +"checksum downcast-rs 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "18df8ce4470c189d18aa926022da57544f31e154631eb4cfe796aea97051fe6c" "checksum draw_state 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "33cf9537e2d06891448799b96d5a8c8083e0e90522a7fdabe6ebf4f41d79d651" "checksum either 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3be565ca5c557d7f59e7cfcf1844f9e3033650c929c6566f511e8005f205c1d0" "checksum env_logger 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "15abd780e45b3ea4f76b4e9a26ff4843258dd8a3eed2775a0e7368c2e7936c2f" "checksum env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3ddf21e73e016298f5cb37d6ef8e8da8e39f91f9ec8b0df44b7deb16a9f8cd5b" "checksum error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ff511d5dc435d703f4971bc399647c9bc38e20cb41452e3b9feb4765419ed3f3" -"checksum fern 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "de237898aa785d93b869e965132f62a525b90cce5c0bf2a395f03e62e085bc5c" +"checksum fern 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "57915fe00a83af935983eb2d00b0ecc62419c4741b28c207ecbf98fd4a1b94c8" "checksum flate2 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)" = "e6234dd4468ae5d1e2dbb06fe2b058696fdc50a339c68a393aefbf00bc81e423" "checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3" "checksum foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" @@ -2360,18 +2206,21 @@ dependencies = [ "checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" "checksum futures 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)" = "1a70b146671de62ec8c8ed572219ca5d594d9b06c0b364d5e67b722fc559b48c" "checksum fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" +"checksum genmesh 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "093d52460513e54346e440eadad05a799378654001d7c3a384c3d1e59b5f1e9f" "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.2 (registry+https://github.com/rust-lang/crates.io-index)" = "28db9b21971721a57ab0f7a751a58dc8c50bede80c914533ad94fd664377925d" +"checksum gfx_device_gl 0.15.3 (registry+https://github.com/rust-lang/crates.io-index)" = "5afb3bc6017229804c4a814972581eb16d7b8f2568fda9daf9d0ef6e78198305" "checksum gfx_gl 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3e8a920f8f6c1025a7ddf9dd25502bf059506fd3cd765dfbe8dba0b56b7eeecb" -"checksum gfx_glyph 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d06682b5ff9d6216ae531eb12c0ad727e205bf82641b86886cb5fbda360f2b80" +"checksum gfx_glyph 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "852efd558c450c42acaf799af2536f8c5b03359d7f210f3381eac13344df2786" "checksum gfx_macros 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d38f9e1d3f4705b26e73437e35fd71c955aba5781f6bb5391d37a166204d301f" -"checksum gfx_window_glutin 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5e7ab34e95020625700ffed78b870e9f3fe4f024f23f9ff744af4f6e2c238921" +"checksum gfx_window_glutin 0.24.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c92eef8c21844fd7dd46e9276c5d37bfdc62f67e78a987715cb7b9130906eaff" "checksum ghakuf 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "13e9c67552cb8e25aea67430d003303a8bc618f6b1f20f18c2f21d37752362f5" "checksum gl_generator 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a795170cbd85b5a7baa58d6d7525cae6a03e486859860c220f7ebbbdd379d0a" -"checksum gleam 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e47b39459e47b76be4d2c82702932cdc66df09dcb8f813424167991adb8b3380" +"checksum gleam 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "12b793fcf40a23dd372f184c228ab3eb96f88c50bb4fba8319c483aa025a4e45" "checksum glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb" -"checksum glutin 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a9caee44b73388b2b4452ab783b13a1af80edb363bfc6e5292bdb2dd990a3171" +"checksum glsl-layout 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "64f0bc259952d02d3c371b5f1c8a84743742661890647ae976ec3fedfa426a99" +"checksum glsl-layout-derive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5b9806baa9828de873043536e17835e817ec3a0945c23b9edda65384400cc4ca" +"checksum glutin 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)" = "42fb2de780307bd2bedbe013bc585659a683e7c6307d0baa878aec3da9250fc1" "checksum hetseq 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "dbe13b9e03ea85e9efb4cd214c760399619f5e9ad0b36d8656b6649f03645063" "checksum hibitset 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1e9fb2efbf0be917eff1a4d6a26f72b86c187759c2467b25ec55c7f92994ba82" "checksum hound 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8a164bb2ceaeff4f42542bdb847c41517c78a60f5649671b2a07312b6e117549" @@ -2381,14 +2230,15 @@ dependencies = [ "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" "checksum khronos_api 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "037ab472c33f67b5fbd3e9163a2645319e5356fcd355efa6d4eb7fff4bbcb554" "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 lazy_static 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e6412c5e2ad9584b0b8e979393122026cdd6d2a80b933f890dcd694ddbe73739" "checksum lewton 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c1b7b81410f7895d4793bae921cc62317c5500c6ef211c9c24cad778eda77c20" -"checksum libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)" = "6fd41f331ac7c5b8ac259b8bf82c75c0fb2e469bbf37d2becbba9a6a2221965b" +"checksum libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)" = "b685088df2b950fccadf07a7187c8ef846a959c142338a48f9dc0b94517eb5f1" "checksum libloading 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "fd38073de8f7965d0c17d30546d4bb6da311ab428d1c7a3fc71dff7f9d4979b9" "checksum libloading 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9c3ad660d7cb8c5822cd83d10897b0f1f1526792737a179e73896152f85b88c2" "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" -"checksum log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "89f010e843f2b1a31dbd316b3b8d443758bc634bed37aabade59c686d644e0a2" +"checksum log 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6fddaa003a65722a7fb9e26b0ce95921fe4ba590542ced664d8ce2fa26f9f3ac" +"checksum mach 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b549fa8738e27dcf6c8c5d6d35211e786aa02715a22b60c33b9488fdd634a90b" "checksum malloc_buf 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" "checksum memalloc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df39d232f5c40b0891c10216992c2f250c054105cb1e56f0fc9032db6203ecc1" "checksum memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d8b629fb514376c675b98c1421e80b151d3817ac42d7c667717d282761418d20" @@ -2397,22 +2247,24 @@ dependencies = [ "checksum memmap 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e2ffa2c986de11a9df78620c01eeaaf27d94d3ff02bf81bfcca953102dd0c6ff" "checksum memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0f9dc261e2b62d7a622bf416ea3c5245cdd5d9a7fcc428c0d06804dfce1775b3" "checksum midir 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e653b919aca8b5f2697854f1819b33bfe49bcb3378abb0dbd834ce43ede9c7b1" +"checksum minimp3 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9ad362c18021c74cebb299a0ef8a4025ca7c1f5b7769d5efe45511456740f7bd" +"checksum minimp3-sys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "be06a26e75fdb130d68d6f589f32b1c7d2d0351f67fb7d393f0c78a8d6336ee3" "checksum miniz-sys 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "609ce024854aeb19a0ef7567d348aaa5a746b32fb72e336df7fcc16869d7e2b4" -"checksum mint 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)" = "89d8e702feb1eac97f4eb0b70e35b26d0fea77787ee93f27bb1c56e5990df9ce" "checksum mint 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "663bf700dcd81a0f8aac45cd0ca68fe37488becfe3a538f87fdb607a31e3c8ea" -"checksum minterpolate 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "30a447d3e2d2fe0f7ce6208c1a7eb27117bda0e429c4987ba9e8b90cda784204" +"checksum minterpolate 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4145b04ce678850f3470934511e68c0a8f81c06d7db83a710a08ae41c8b4a85e" "checksum mopa 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a785740271256c230f57462d3b83e52f998433a7062fc18f96d5999474a9f915" +"checksum nix 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d37e713a259ff641624b6cb20e3b12b2952313ba36b6823c0f16e6cfd9e5de17" "checksum nix 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a2c5afeb0198ec7be8569d666644b574345aad2e95a53baf3a532da3e0f3fb32" "checksum nodrop 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "9a2228dca57108069a5262f2ed8bd2e82496d2e074a06d1ccc7ce1687b6ae0a2" "checksum nom 3.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05aec50c70fd288702bcd93284a8444607f3292dbdf2a30de5ea5dcdbe72287b" "checksum num 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "4703ad64153382334aa8db57c637364c322d3372e097840c72000dabdcf6156e" -"checksum num-bigint 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)" = "81b483ea42927c463e191802e7334556b48e7875297564c0e9951bd3a0ae53e3" +"checksum num-bigint 0.1.44 (registry+https://github.com/rust-lang/crates.io-index)" = "e63899ad0da84ce718c14936262a41cee2c79c981fc0a0e7c7beb47d5a07e8c1" "checksum num-complex 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)" = "b288631d7878aaf59442cffd36910ea604ecd7745c36054328595114001c9656" -"checksum num-integer 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)" = "2fef16815bb502c6a3be7fd842b7fd6e3371d5fbd33acc8ada7cc6c616cb4798" -"checksum num-iter 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)" = "fb8282dab9e151b14bfe11ee81e5ead059f99e1e604bdd76a7653155ba7d20c5" +"checksum num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "e83d528d2677f0518c570baf2b7abdcf0cd2d248860b68507bdcb3e91d4c0cea" +"checksum num-iter 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)" = "af3fdbbc3291a5464dc57b03860ec37ca6bf915ed6ee385e7c6c052c422b2124" "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.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c22f20a157cb4af265c71e47db525852368feeb4a0013f0f8c68a7f4ef0d0fc1" +"checksum num-traits 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "630de1ef5cc79d0cdd78b7e33b81f083cbfe90de0f4b2b2f07f905867c70e9fe" "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" @@ -2429,49 +2281,53 @@ dependencies = [ "checksum pkg-config 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)" = "110d5ee3593dbb73f56294327fe5668bcc997897097cbc76b51e7aed3f52452f" "checksum proc-macro2 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "cd07deb3c6d1d9ff827999c7f9b04cdfd66b1b17ae508e14fe47b620f2282ae0" "checksum proc-macro2 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "1b06e2f335f48d24442b35a19df506a835fb3547bc3c06ef27340da9acf5cae7" +"checksum proc-macro2 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "effdb53b25cdad54f8f48843d67398f7ef2e14f12c1b4cb4effc549a6462a4d6" "checksum quickcheck 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "02c2411d418cea2364325b18a205664f9ef8252e06b2e911db97c0b0d98b1406" "checksum quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a" "checksum quote 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1eca14c727ad12702eb4b6bfb5a232287dcf8385cb8ca83a3eeaf6519c44c408" "checksum quote 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9949cfe66888ffe1d53e6ec9d9f3b70714083854be20fd5e271b232a017401e8" +"checksum quote 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e44651a0dc4cdd99f71c83b561e221f714912d11af1a4dff0631f923d53af035" "checksum rand 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)" = "15a732abf9d20f0ad8eeb6f909bf6868722d9a06e1e50802b6a70351f40b4eb1" "checksum rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "eba5f8cb59cc50ed56be8880a5c7b496bfd9bd26394e176bc67884094145c2c5" "checksum rayon 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "80e811e76f1dbf68abf87a759083d34600017fc4e10b6bd5ad84a700f9dba4b1" "checksum rayon-core 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9d24ad214285a7729b174ed6d3bcfcb80177807f959d95fafd5bfc5c4f201ac8" -"checksum redox_syscall 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)" = "0d92eecebad22b767915e4d529f89f28ee96dbbf5a4810d2b844373f136417fd" +"checksum redox_syscall 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)" = "c214e91d3ecf43e9a4e41e578973adeb14b474f2bee858742d127af75a0112b1" "checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76" "checksum regex 0.1.80 (registry+https://github.com/rust-lang/crates.io-index)" = "4fd4ace6a8cf7860714a2c2280d6c1f7e6a413486c13298bbc86fd3da019402f" "checksum regex 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9329abc99e39129fcceabd24cf5d85b4671ef7c29c50e972bc5afe32438ec384" "checksum regex-syntax 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "f9ec002c35e86791825ed294b50008eea9ddfc8def4420124fbc6b08db834957" "checksum regex-syntax 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7d707a4fa2637f2dca2ef9fd02225ec7661fe01a53623c1e6515b6916511f7a7" "checksum remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3488ba1b9a2084d38645c4c08276a1752dcbf2c7130d74f1569681ad5d2799c5" -"checksum rodio 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1e2767a246f9b284ec568e45e17ed3e6c52a91a3d42fa11ba00466b6ea5a6b55" -"checksum ron 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "da06feaa07f69125ab9ddc769b11de29090122170b402547f64b86fe16ebc399" -"checksum ron 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f529ed7508da0ac9c2e79289beb5aad2894631799ff655a3092169d205906344" +"checksum rodio 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e724e9a6bf5aab9a4e6aa50bbdf0ef44d82cadabb904ca46c247249ce4197331" +"checksum ron 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "724e7f09f9ee39398f9da98141e7250308dff027f48020d5c41b08bfb2536ee4" "checksum rustc-demangle 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "76d7ba1feafada44f2d38eed812bd2489a03c0f5abb975799251518b68848649" +"checksum rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7540fc8b0c49f096ee9c961cda096467dce8084bec6bdca2fc83895fd9b28cb8" "checksum rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)" = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda" "checksum rustc_version 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "c5f5376ea5e30ce23c03eb77cbe4962b988deead10910c372b226388b594c084" "checksum rustc_version_runtime 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "90811d74046aca9c061fb9f7f2568c61696b7f218a7baad60a0f2ccae90efbd2" -"checksum rusttype 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "11ff03da02f6d340bbee5ec55eed03ff9abd6ea013b93bc7c35973cc28f65999" +"checksum rusttype 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8cdf9fbea605646f6bab69ad16803170bec56677bcae7a204996edb7bba9c454" "checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27" "checksum semver 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)" = "d4f410fedcf71af0345d7607d246e7ad15faaadd49d240ee3b24e5dc21a820ac" -"checksum serde 1.0.53 (registry+https://github.com/rust-lang/crates.io-index)" = "de4dee3b122edad92d80c66cac8d967ec7f8bf16a3b452247d6eb1dbf83c8f22" -"checksum serde_derive 1.0.53 (registry+https://github.com/rust-lang/crates.io-index)" = "7149ef7af607b09e0e7df38b1fd74264f08a29a67f604d5cb09d3fbdb1e256bc" +"checksum serde 1.0.66 (registry+https://github.com/rust-lang/crates.io-index)" = "e9a2d9a9ac5120e0f768801ca2b58ad6eec929dc9d1d616c162f208869c2ce95" +"checksum serde_derive 1.0.66 (registry+https://github.com/rust-lang/crates.io-index)" = "0a90213fa7e0f5eac3f7afe2d5ff6b088af515052cc7303bd68c7e3b91a3fb79" "checksum shared_library 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8254bf098ce4d8d7cc7cc6de438c5488adc5297e5b7ffef88816c0a91bd289c1" -"checksum shred 0.7.0-alpha5 (registry+https://github.com/rust-lang/crates.io-index)" = "4621228891d68822e59154247e5226af4be7e335c45e7a275cc9876e044ed7e0" -"checksum shred-derive 0.5.0-alpha1 (registry+https://github.com/rust-lang/crates.io-index)" = "38dd238e9335702dca589a7a82ff6a9784961ee053a2940836be3334a7b7d834" -"checksum shrev 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "800971605703aae3a54b739c6bb9ed1939dca3425b9402ff6e88815dfea526e6" +"checksum shred 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d94a47a63681350e0e358f8223045015454c59e34589b930bc721be22602edd1" +"checksum shred-derive 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4b66c7ec6c50c6ef9909dd10faa24c8e571dfda5200786021b36b3fed77ac36c" +"checksum shrev 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ec60ed6f60a4b3cdc2ceacf57215db3408fbd8990f66a38686a31558cd9da482" +"checksum slice-deque 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "38646b3b9537259de5cd971265321b7ece1debac68af1443760f3d40d0af80fe" "checksum smallvec 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "ee4f357e8cd37bf8822e1b964e96fd39e2cb5a0424f8aaa284ccaccc2162411c" -"checksum smallvec 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "03dab98ab5ded3a8b43b2c80751194608d0b2aa0f1d46cf95d1c35e192844aa7" -"checksum smithay-client-toolkit 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "92dd41b4a4a0679e5873f8e58b8191554d4dc0104d32a22ff09b678059327bd2" -"checksum specs 0.11.0-alpha6 (registry+https://github.com/rust-lang/crates.io-index)" = "1b5e6245ecb2ceef91f0095c3ebec8997c10c5232065e54bae317b20ab04f7a0" -"checksum specs-hierarchy 0.1.0-alpha6 (registry+https://github.com/rust-lang/crates.io-index)" = "75795180d8849c0fbf544953dc49faaadbce7a9353b2221ba16a21cc5e49f1cf" -"checksum stable_deref_trait 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "15132e0e364248108c5e2c02e3ab539be8d6f5d52a01ca9bbf27ed657316f02b" +"checksum smallvec 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "312a7df010092e73d6bbaf141957e868d4f30efd2bfd9bb1028ad91abec58514" +"checksum smithay-client-toolkit 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "84c45607482d31161951f4ea11ba2673e3999e1cc6ca2d50a72eaee7eae3cbf1" +"checksum specs 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d4c83d3f2dbe499d2aca1f32ff4e5c781de36aa493d89d6ba9a7a712f6c39904" +"checksum specs-hierarchy 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4b2841a90c03be74e2dcb02cb1820774aff31f49b097e6301342e511f431c922" +"checksum stable_deref_trait 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ffbc596e092fe5f598b12ef46cc03754085ac2f4d8c739ad61c4ae266cc3b3fa" "checksum stb_truetype 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "52ce2b38abdd11cffbc68928810248e0dd003fea489a88a404dc1ba7ae2d5538" "checksum stdweb 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ef5430c8e36b713e13b48a9f709cc21e046723fe44ce34587b73a830203b533e" "checksum strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4f380125926a99e52bc279241539c018323fab05ad6368b56f93d9369ff550" "checksum syn 0.10.8 (registry+https://github.com/rust-lang/crates.io-index)" = "58fd09df59565db3399efbba34ba8a2fec1307511ebd245d0061ff9d42691673" "checksum syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad" -"checksum syn 0.13.8 (registry+https://github.com/rust-lang/crates.io-index)" = "70f57ecb0ad755f810029917826394be7d5d3975e875028ff9d58ac71e640d80" +"checksum syn 0.13.11 (registry+https://github.com/rust-lang/crates.io-index)" = "14f9bf6292f3a61d2c716723fdb789a41bbe104168e6f496dc6497e531ea1b9b" +"checksum syn 0.14.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c67da57e61ebc7b7b6fff56bb34440ca3a83db037320b0507af4c10368deda7d" "checksum synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6" "checksum tempfile 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "47776f63b85777d984a50ce49d6b9e58826b6a3766a449fc95bc66cd5663c15b" "checksum termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096" @@ -2480,13 +2336,12 @@ dependencies = [ "checksum thread_local 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "8576dbbfcaef9641452d5cf0df9b0e7eeab7694956dd33bb61515fb8f18cfdd5" "checksum thread_local 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "279ef31c19ededf577bfd12dfae728040a21f635b06a24cd670ff510edd38963" "checksum time 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)" = "d825be0eb33fda1a7e68012d51e9c7f451dc1a69391e7fdc197060bb8c56667b" -"checksum token_store 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a686838375fc11103b9c1529c6508320b7bd5e2401cd62831ca51b3e82e61849" "checksum tuple_utils 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cbfecd7bb8f0a3e96b3b31c46af2677a55a588767c0091f484601424fcb20e7e" "checksum twox-hash 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "475352206e7a290c5fccc27624a163e8d0d115f7bb60ca18a64fc9ce056d7435" "checksum ucd-util 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "fd2be2d6639d0f8fe6cdda291ad456e23629558d466e2789d2c3e9892bda285d" "checksum unicode-normalization 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "6a0180bc61fc5a987082bfa111f4cc95c4caff7f9799f3e46df09163a937aa25" "checksum unicode-segmentation 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "aa6024fc12ddfd1c6dbc14a80fa2324d4568849869b779f6bd37e5e4c03344d1" -"checksum unicode-width 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "bf3a113775714a22dcb774d8ea3655c53a32debae63a063acc00a91cc586245f" +"checksum unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526" "checksum unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc" "checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" "checksum unreachable 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1f2ae5ddb18e1c92664717616dd9549dde73f539f01bd7b77c2edb2446bdff91" @@ -2497,28 +2352,21 @@ dependencies = [ "checksum vergen 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c3365f36c57e5df714a34be40902b27a992eeddb9996eca52d0584611cf885d" "checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" "checksum wavefront_obj 5.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "33c9cbb65c5aac6493000cdabe11f49588d19b547ccd7501f44fc96a6b9406ff" -"checksum wayland-client 0.12.5 (registry+https://github.com/rust-lang/crates.io-index)" = "2b90adf943117ee4930d7944fe103dcb6f36ba05421f46521cb5adbf6bf0fbc8" -"checksum wayland-client 0.20.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c60981354852f3f4b452bdafab417b5edba37e4c2fb1a079477c784427461af1" -"checksum wayland-commons 0.20.6 (registry+https://github.com/rust-lang/crates.io-index)" = "002c1e02c50dd13bdc283afe336227382fad161014fa256d9db2f4ccad198566" -"checksum wayland-kbd 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4fe0fb1c9917da9529d781659e456d84a693d74fe873d1658109758444616f76" -"checksum wayland-protocols 0.12.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fb5942dd2fc79d934db437c9ea3aabffceb49b546046ea453bcba531005e5537" -"checksum wayland-protocols 0.20.6 (registry+https://github.com/rust-lang/crates.io-index)" = "d7edaf88958aa5c659d3976792177b6d10c2210a9edfedba21a268a5a218a676" -"checksum wayland-scanner 0.12.5 (registry+https://github.com/rust-lang/crates.io-index)" = "dcffa55a621e6f2c3d436de64d840fc325e1d0a467b92ee5e7292e17552e08ad" -"checksum wayland-scanner 0.20.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0ede8b683867d2dd29142bcd95653f9588bb2a79c1045e1b146104ca133a2dfa" -"checksum wayland-sys 0.12.5 (registry+https://github.com/rust-lang/crates.io-index)" = "377a2f83063c463e801ca10ae8cb9666e6e597eecac0049ac36cc7b9a83b0db3" -"checksum wayland-sys 0.20.6 (registry+https://github.com/rust-lang/crates.io-index)" = "06dc03aa4a7b25ad696809bf8d06d24d3db8752218155d7d68a8fa0c50d9c0df" -"checksum wayland-window 0.13.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e5bf431e84f0de9cd06a30b2fb9ab9458f449cb6c36277da703e979ad5c141b1" +"checksum wayland-client 0.20.10 (registry+https://github.com/rust-lang/crates.io-index)" = "0f3ed65542a0be13ea0fdcc55c9a011fcc44c3882e6e1a9b4dfddb25182897dd" +"checksum wayland-commons 0.20.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4ac5c79f1d050f4047a82ddce77acda026c142c0023e7b7e20eea5ad76fb7dbf" +"checksum wayland-protocols 0.20.10 (registry+https://github.com/rust-lang/crates.io-index)" = "be56e3d80559177a70bc78f9396fbe1705b7baed4951ae6e34d28bb59681b1a8" +"checksum wayland-scanner 0.20.10 (registry+https://github.com/rust-lang/crates.io-index)" = "93cf4ef48caedf3fc1a9b2bf0df64e6d425bd628b85830a08432dd25b61de17c" +"checksum wayland-sys 0.20.10 (registry+https://github.com/rust-lang/crates.io-index)" = "d2dbe7b51c16b8a8153806aaa21f346333074482bb57bc5cb059cc828f8c6842" "checksum which 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e84a603e7e0b1ce1aa1ee2b109c7be00155ce52df5081590d1ffb93f4f515cb2" "checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" -"checksum winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "04e3bd221fcbe8a271359c04f21a76db7d0c6028862d1bb5512d85e1e2eb5bb3" +"checksum winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "773ef9dcc5f24b7d850d0ff101e542ff24c3b090a9768e03ff889fdef41f00fd" "checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" "checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" "checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -"checksum winit 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3706b5ba299cc9ed06d39b8021fc5edd5a7d27d8e99355ca09636fddd9b14cc0" -"checksum winit 0.14.0 (git+https://github.com/francesca64/winit?branch=x11-get-prop)" = "<none>" +"checksum winit 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4bb6ea35de8bd722201914b28a33d503ee45b09fcf85fc4bbf574845e41f79e2" "checksum winmm-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "20a57a816b63ca4bf31aec70b4c334be13c4b73a30ab5b546135041627866035" "checksum x11-clipboard 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2e7374c7699210cca7084ca61d57e09640fc744d1391808cb9ae2fe4ca9bd1df" -"checksum x11-dl 2.17.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3235540540fde1ae074c8df49054166c0e070407f1c6e1ee17b8c87c2c7bcc7d" +"checksum x11-dl 2.18.0 (registry+https://github.com/rust-lang/crates.io-index)" = "931d8584b49771143af0c422f372d8aef4280afd5920dad39b0a95a8e51df1e9" "checksum xcb 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5e917a3f24142e9ff8be2414e36c649d47d6cc2ba81f16201cdef96e533e02de" "checksum xi-unicode 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "12ea8eda4b1eb72f02d148402e23832d56a33f55d8c1b2d5bcdde91d79d47cb1" "checksum xml-rs 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3c1cb601d29fe2c2ac60a2b2e5e293994d87a1f6fa9687a31a15270f909be9c2" diff --git a/Cargo.toml b/Cargo.toml @@ -8,7 +8,8 @@ authors = ["Joël Lupien (Jojolepro) <jojolepromain@gmail.com>"] midir = { version = "0.5" } #nom-midi = "0.2.0" ghakuf = "0.5" -#amethyst = { git = "https://github.com/amethyst/amethyst", branch = "develop" } -amethyst = { path = "../amethystwinitfreeze" } +amethyst = { git = "https://github.com/amethyst/amethyst", branch = "develop" } +#amethyst = { path = "../amethystwinitfreeze" } log = "*" amethyst-extra = { path = "../amethyst-extra/" } +lazy_static = "1.0"+ \ No newline at end of file diff --git a/src/data/midi.rs b/src/data/midi.rs @@ -0,0 +1,130 @@ +use midir::{MidiInput,Ignore}; +use std::io::{stdout,stdin,Write}; +use ghakuf::messages::*; +use ghakuf::reader::*; +use ghakuf::messages::MidiEvent::*; +use std::path::Path; + +use amethyst::audio::{AudioBundle, SourceHandle}; +use amethyst::assets::{ProgressCounter,Loader}; +use amethyst::core::frame_limiter::FrameRateLimitStrategy; +use amethyst::core::transform::{Transform,GlobalTransform,TransformBundle}; +use amethyst::core::Time; +use amethyst::core::cgmath::{Matrix4,Vector3}; +use amethyst::input::InputBundle; +use amethyst::prelude::*; +use amethyst::utils::fps_counter::FPSCounterBundle; +use amethyst::renderer::{Camera,DisplayConfig, DrawFlat, Pipeline, PosTex, RenderBundle, + Stage, Projection,Event,Material,MeshHandle,MaterialDefaults}; +use amethyst::shrev::{ReaderId,EventChannel}; +use amethyst::ui::UiEvent; +use amethyst::Application; +use amethyst_extra::*; +use amethyst::ecs::prelude::*; +use amethyst::Error; + +use std::time::Duration; + +use data::notes::Note; + + +#[derive(Default,Debug)] +pub struct MidiSong{ + pub length: f64, + pub bpm: f64, + pub notes: Vec<Note>, +} + +#[derive(Debug)] +pub struct MidiFileHandler{ + pub song: MidiSong, + pub delta_accum: f64, + pub current_bpm: f64, + pub resolution: u16, + pub signature: f64, + pub base_offset: f64, +} + +impl MidiFileHandler{ + pub fn new()->Self{ + let mut h = MidiFileHandler{ + song: MidiSong::default(), + delta_accum: 0.0, + current_bpm: 120.0, + resolution: 0, + signature: 1.0, + base_offset: 3.0, + }; + h.reset_delta_accum(); + h + } + fn end_note(&mut self, note: u8,time: f64){ + if let Some(mut l) = self.song.notes.iter_mut().filter(|n| n.key == note && n.end == 0.0).last().as_mut(){ + if l.end == 0.0{ + l.end = time; + } + }else{ + error!("Could not add NoteOff event to song. Midi file integrity check failed on note key {} at time {}.",note,time); + } + } + + fn time_for(&mut self, delta: u32)->f64{ + //let sec_per_beat = 60.0 / self.current_bpm; + //let sec_per_tick = sec_per_beat / self.resolution as f64; + let sec_per_tick = 60.0 / (self.current_bpm * self.resolution as f64); + let offset = sec_per_tick * delta as f64 /* self.signature*/; + //println!("offset: {}",offset); + self.delta_accum += offset; + self.delta_accum + } + fn reset_delta_accum(&mut self){ + self.delta_accum = self.base_offset; + } +} + +impl Handler for MidiFileHandler { + fn header(&mut self, format: u16, track: u16, time_base: u16) { + self.resolution = time_base; + } + fn meta_event(&mut self, delta_time: u32, event: &MetaEvent, data: &Vec<u8>) { + match event{ + &MetaEvent::SetTempo => { + // TODO: support other time signatures than */4 + let b1 = (data[0] as i32) << 16; + let b2 = (data[1] as i32) << 8; + let b3 = data[2] as i32; + let microsec_per_quarter = b1 + b2 + b3; + self.current_bpm = (60_000_000 / microsec_per_quarter) as f64; + }, + &MetaEvent::TimeSignature => self.signature = data[0] as f64 / data[1] as f64, + &MetaEvent::KeySignature => error!("Midi Key Signature meta event not supported yet!"), + _ => {}, + } + } + fn midi_event(&mut self, delta_time: u32, event: &MidiEvent) { + //println!("Midi event: {:?} at delta time {}",event,delta_time); + let t = self.time_for(delta_time); + match event{ + &NoteOn{ch,note,velocity} => { + if velocity == 0 { + self.end_note(note, t); + } else { + self.song.notes.push(Note { + key: note, + channel: ch, + start: t, + end: 0.0, + velocity, + }); + } + }, + &NoteOff{ch,note,velocity} => self.end_note(note,t), + _ => {}, + } + } + fn sys_ex_event(&mut self, delta_time: u32, event: &SysExEvent, data: &Vec<u8>) { + } + fn track_change(&mut self) { + self.reset_delta_accum(); + } +} diff --git a/src/data/mod.rs b/src/data/mod.rs @@ -0,0 +1,3 @@ +pub mod notes; +pub mod states; +pub mod midi;+ \ No newline at end of file diff --git a/src/data/notes.rs b/src/data/notes.rs @@ -0,0 +1,19 @@ +use amethyst::ecs::{DenseVecStorage,Component}; + +pub struct NoteComponent{ + pub key: u8, + pub time: f64, +} + +impl Component for NoteComponent{ + type Storage = DenseVecStorage<Self>; +} + +#[derive(Default,Debug)] +pub struct Note{ + pub key: u8, + pub channel: u8, + pub start: f64, + pub end: f64, + pub velocity: u8, +}+ \ No newline at end of file diff --git a/src/data/states.rs b/src/data/states.rs @@ -0,0 +1,167 @@ +use midir::{MidiInput,Ignore,MidiInputConnection}; +use std::io::{stdout,stdin,Write}; +use ghakuf::messages::*; +use ghakuf::reader::*; +use ghakuf::messages::MidiEvent::*; +use std::path::Path; + +use amethyst::audio::{AudioBundle, SourceHandle}; +use amethyst::assets::{ProgressCounter,Loader}; +use amethyst::core::frame_limiter::FrameRateLimitStrategy; +use amethyst::core::transform::{Transform,GlobalTransform,TransformBundle}; +use amethyst::core::Time; +use amethyst::core::cgmath::{Matrix4,Vector3}; +use amethyst::input::InputBundle; +use amethyst::prelude::*; +use amethyst::utils::fps_counter::FPSCounterBundle; +use amethyst::renderer::{Camera,DisplayConfig, DrawFlat, Pipeline, PosTex, RenderBundle, + Stage, Projection,Event,Material,MeshHandle,MaterialDefaults}; +use amethyst::shrev::{ReaderId,EventChannel}; +use amethyst::ui::UiEvent; +use amethyst::Application; +use amethyst_extra::*; +use amethyst::ecs::prelude::*; +use amethyst::Error; + +use std::time::Duration; + +use data::midi::*; +use AssetData; +use KEYBOARD_EVENTS; +use std::marker::PhantomData; +use std::sync::Arc; +use std::sync::Mutex; +use std::rc::Rc; +use std::cell::RefCell; + +pub struct GameState{ + pub keyboard_connection: Option<MidiInputConnection<Arc<Mutex<EventChannel<MidiEvent>>>>>, + pub ev: Arc<Mutex<EventChannel<MidiEvent>>>, +} + +impl<'a> GameState{ + pub fn new() -> Self{ + GameState{ + keyboard_connection: None, + ev: Arc::new(Mutex::new(EventChannel::new())), + } + } + + pub fn create_keyboard_connection(&mut self){ + // eventchannel lifetime >= keyboard_connection lifetime + + + // midir = hardware + let mut midi_in = MidiInput::new("Key Fall").expect("Failed to create midi input port."); + midi_in.ignore(Ignore::None); + + + println!("Available input ports:"); + let mut input = String::new(); + for i in 0..midi_in.port_count() { + println!("{}: {}", i, midi_in.port_name(i).expect("Failed to list port name for midi port.")); + } + print!("Please select input port: "); + stdout().flush().unwrap(); + + // TODO: Add input protection, then menu + stdin().read_line(&mut input).unwrap(); + let in_port: usize = input.trim().parse().unwrap(); + + println!("Connecting..."); + + //let mut evch = EventChannel::<MidiEvent>::new(); + + let conn_in = midi_in.connect(in_port, "Midi Input", |stamp, message, ev| { + if message.len() > 1{ + + //println!("{}: {:?} (len = {})", stamp, message, message.len()); + + // [1,2,3] + // 1 = state. 144 = down, 128 = up + // 2 = key. + // 3 = velocity. [0,128?] down, 64 up + + let time_secs = stamp as f64 / 1000000.0; + ev.lock().unwrap().single_write(MidiEvent::NoteOn{ch:5,note:5,velocity:5}); + println!("Time: {} -> {:?}",time_secs,message); + } + }, self.ev.clone()).expect("Failed to open midi connection."); + + // midi event to note + // https://github.com/derekdreery/nom-midi-rs/blob/master/src/parser/event/midi.rs + + + println!("Connection opened..."); + conn_in + } +} + +impl<'a,'b> State<GameData<'a,'b>> for GameState{ + fn on_start(&mut self, data: StateData<GameData>) { + println!("Sample midi file read test"); + //let path = Path::new("test.mid"); + let path = Path::new("xi - akasha.mid"); + //let path = Path::new("Sayonara Heaven.mid"); + let mut handler = MidiFileHandler::new(); + { + let mut reader = Reader::new( + &mut handler, + &path, + ).unwrap(); + let res = reader.read(); + } + + //println!("{:?}",handler); + + data.world.add_resource(handler); + + + let mesh = gen_rectangle_mesh(1.0,1.0,&data.world.read_resource(),&data.world.read_resource()); + let color = data.world.read_resource::<Loader>().load_from_data([0.1,0.5,0.3,1.0].into(), (), &data.world.read_resource()); + + + let mat_defaults = data.world.read_resource::<MaterialDefaults>().0.clone(); + let mat = Material { + albedo: color.clone(), + ..mat_defaults.clone() + }; + + let ad = AssetData{ + mesh, + mat, + }; + + data.world.add_resource(ad); + + + + data.world + .create_entity() + .with(Camera::from(Projection::orthographic( + 0.0, + 1.0, + 1.0, + 0.0, + ))) + .with(GlobalTransform( + Matrix4::from_translation(Vector3::new(0.0, 0.0, 1.0)).into(), + )) + .build(); + + + // CREATE MIDI HARDWARE CONNECTION + let keyboard_connection = self.create_keyboard_connection(); + + + //self.keyboard_connection = Some(keyboard_connection); + //data.world.add_resource(keyboard_connection); + + + } + + fn update(&mut self, data: StateData<GameData>) -> Trans<GameData<'a, 'b>> { + data.data.update(data.world); + Trans::None + } +}+ \ No newline at end of file diff --git a/src/main.rs b/src/main.rs @@ -4,6 +4,9 @@ extern crate ghakuf; extern crate log; extern crate amethyst; extern crate amethyst_extra; +#[macro_use] +extern crate lazy_static; + use midir::{MidiInput,Ignore}; use std::io::{stdout,stdin,Write}; @@ -25,119 +28,24 @@ use amethyst::renderer::{Camera,DisplayConfig, DrawFlat, Pipeline, PosTex, Rende Stage, Projection,Event,Material,MeshHandle,MaterialDefaults}; use amethyst::shrev::{ReaderId,EventChannel}; use amethyst::ui::UiEvent; -use std::time::Duration; use amethyst::Application; use amethyst_extra::*; use amethyst::ecs::prelude::*; +use amethyst::Error; -#[derive(Default,Debug)] -pub struct Note{ - key: u8, - channel: u8, - start: f64, - end: f64, - velocity: u8, -} +use std::time::Duration; -#[derive(Default,Debug)] -pub struct MidiSong{ - length: f64, - bpm: f64, - notes: Vec<Note>, -} +pub mod systems; +pub mod data; +pub use systems::graphics::notes::*; +pub use data::notes::*; +pub use data::midi::*; +pub use data::states::*; -#[derive(Debug)] -pub struct MidiFileHandler{ - song: MidiSong, - delta_accum: f64, - current_bpm: f64, - resolution: u16, - signature: f64, - base_offset: f64, -} -impl MidiFileHandler{ - pub fn new()->Self{ - let mut h = MidiFileHandler{ - song: MidiSong::default(), - delta_accum: 0.0, - current_bpm: 120.0, - resolution: 0, - signature: 1.0, - base_offset: 3.0, - }; - h.reset_delta_accum(); - h - } - fn end_note(&mut self, note: u8,time: f64){ - if let Some(mut l) = self.song.notes.iter_mut().filter(|n| n.key == note && n.end == 0.0).last().as_mut(){ - if l.end == 0.0{ - l.end = time; - } - }else{ - error!("Could not add NoteOff event to song. Midi file integrity check failed on note key {} at time {}.",note,time); - } - } - - fn time_for(&mut self, delta: u32)->f64{ - //let sec_per_beat = 60.0 / self.current_bpm; - //let sec_per_tick = sec_per_beat / self.resolution as f64; - let sec_per_tick = 60.0 / (self.current_bpm * self.resolution as f64); - let offset = sec_per_tick * delta as f64 /* self.signature*/; - //println!("offset: {}",offset); - self.delta_accum += offset; - self.delta_accum - } - fn reset_delta_accum(&mut self){ - self.delta_accum = self.base_offset; - } -} -impl Handler for MidiFileHandler { - fn header(&mut self, format: u16, track: u16, time_base: u16) { - self.resolution = time_base; - } - fn meta_event(&mut self, delta_time: u32, event: &MetaEvent, data: &Vec<u8>) { - match event{ - &MetaEvent::SetTempo => { - // TODO: support other time signatures than */4 - let b1 = (data[0] as i32) << 16; - let b2 = (data[1] as i32) << 8; - let b3 = data[2] as i32; - let microsec_per_quarter = b1 + b2 + b3; - self.current_bpm = (60_000_000 / microsec_per_quarter) as f64; - }, - &MetaEvent::TimeSignature => self.signature = data[0] as f64 / data[1] as f64, - &MetaEvent::KeySignature => error!("Midi Key Signature meta event not supported yet!"), - _ => {}, - } - } - fn midi_event(&mut self, delta_time: u32, event: &MidiEvent) { - //println!("Midi event: {:?} at delta time {}",event,delta_time); - let t = self.time_for(delta_time); - match event{ - &NoteOn{ch,note,velocity} => { - if velocity == 0 { - self.end_note(note, t); - } else { - self.song.notes.push(Note { - key: note, - channel: ch, - start: t, - end: 0.0, - velocity, - }); - } - }, - &NoteOff{ch,note,velocity} => self.end_note(note,t), - _ => {}, - } - } - fn sys_ex_event(&mut self, delta_time: u32, event: &SysExEvent, data: &Vec<u8>) { - } - fn track_change(&mut self) { - self.reset_delta_accum(); - } +lazy_static! { + pub static ref KEYBOARD_EVENTS: EventChannel<MidiEvent> = EventChannel::new(); } @@ -155,8 +63,6 @@ struct DeviceChooserState; struct PauseState; -struct GameState; - /*impl State for LoadState{ fn on_start(&mut self, mut world: &mut World) { @@ -197,65 +103,7 @@ struct GameState; }*/ -impl State for GameState{ - fn on_start(&mut self, mut world: &mut World) { - println!("Sample midi file read test"); - //let path = Path::new("test.mid"); - let path = Path::new("xi - akasha.mid"); - //let path = Path::new("Sayonara Heaven.mid"); - let mut handler = MidiFileHandler::new(); - { - let mut reader = Reader::new( - &mut handler, - &path, - ).unwrap(); - let res = reader.read(); - } - - println!("{:?}",handler); - - world.add_resource(handler); - - - let mesh = gen_rectangle_mesh(1.0,1.0,&world.read_resource(),&world.read_resource()); - let color = world.read_resource::<Loader>().load_from_data([0.1,0.5,0.3,1.0].into(), (), &world.read_resource()); - - - let mat_defaults = world.read_resource::<MaterialDefaults>().0.clone(); - let mat = Material { - albedo: color.clone(), - ..mat_defaults.clone() - }; - - let ad = AssetData{ - mesh, - mat, - }; - - world.add_resource(ad); - - - - world - .create_entity() - .with(Camera::from(Projection::orthographic( - 0.0, - 1.0, - 1.0, - 0.0, - ))) - .with(GlobalTransform( - Matrix4::from_translation(Vector3::new(0.0, 0.0, 1.0)).into(), - )) - .build(); - } - - fn update(&mut self, mut world: &mut World) -> Trans { - Trans::None - } -} - -pub struct NoteDebugSystem; +/*pub struct NoteDebugSystem; impl<'a> System<'a> for NoteDebugSystem { type SystemData = (Read<'a, Time>, ReadExpect<'a, MidiFileHandler>); @@ -268,93 +116,20 @@ impl<'a> System<'a> for NoteDebugSystem { } } } -} +}*/ pub struct AssetData{ mesh: MeshHandle, mat: Material, } -pub struct NoteComponent{ - key: u8, - time: f64, -} - -impl Component for NoteComponent{ - type Storage = DenseVecStorage<Self>; -} -#[derive(Default)] -pub struct NoteSpawnSystem{ - last_spawn: f64, -} - -impl NoteSpawnSystem{ - pub fn can_spawn(&mut self, time: f64, note_time: f64, last_frame: f64)->bool{ - // 1.0 = note scroll delay - note_time < time - 1.0 && note_time > self.last_spawn - } -} - -impl<'a> System<'a> for NoteSpawnSystem { - type SystemData = ( - Entities<'a>, - Read<'a, Time>, - ReadExpect<'a,AssetData>, - ReadExpect<'a, MidiFileHandler>, - WriteStorage<'a,GlobalTransform>, - WriteStorage<'a,Transform>, - WriteStorage<'a,DestroyAtTime>, - WriteStorage<'a,MeshHandle>, - WriteStorage<'a,Material>, - WriteStorage<'a,NoteComponent>,); - fn run(&mut self, (entities,time, asset, midi, mut gt, mut tr, mut dat, mut meshes, mut mats, mut nc): Self::SystemData) { - let lower = time.absolute_time_seconds() - time.delta_seconds() as f64 + 1.0; - let upper = time.absolute_time_seconds() + 1.0; - for n in &midi.song.notes{ - if n.start < upper{ - if n.start >= lower{ - println!("Spawning note: {:?}, scheduled for destruction at: {}, at time: {}",n,n.end + 0.1,time.absolute_time_seconds()); - let e = entities.create(); - gt.insert(e,GlobalTransform::default()); - let mut t = Transform::default(); - t.scale.x = 0.01; - t.scale.y = ((n.end - n.start) / 1.0) as f32; - tr.insert(e,t); - dat.insert(e,DestroyAtTime{ time: n.end + 0.1 }); - meshes.insert(e,asset.mesh.clone()); - mats.insert(e,asset.mat.clone()); - nc.insert(e,NoteComponent{key: n.key,time: n.start}); - } - }else{ - //break; - } - } - } -} - -pub struct NoteMoveSystem; - -impl<'a> System<'a> for NoteMoveSystem { - type SystemData = ( - Read<'a, Time>, - WriteStorage<'a,Transform>, - ReadStorage<'a,NoteComponent>); - fn run(&mut self, (time,mut tr, nc): Self::SystemData) { - for (mut tr, nc) in (&mut tr,&nc).join(){ - tr.translation.x = nc.key as f32 / 100.0; - // 1.0 = scroll speed. - tr.translation.y = ((nc.time - time.absolute_time_seconds()) / 1.0) as f32 + tr.scale.y / 2.0; - } - } -} - -fn main() { +fn main() -> Result<(), Error> { let path = format!("{}/assets/main/config/display.ron", env!("CARGO_MANIFEST_DIR")); let input_path = format!("{}/assets/main/config/input.ron", env!("CARGO_MANIFEST_DIR")); - let display_config = DisplayConfig::load(path); + //let display_config = DisplayConfig::load(path); let pipe = Pipeline::build().with_stage( @@ -363,24 +138,26 @@ fn main() { .with_pass(DrawFlat::<PosTex>::new()), ); //let maps_dir = format!("{}/resources/assets/maps/", env!("CARGO_MANIFEST_DIR")); - let game = Application::build("", GameState) - .unwrap() + + + let game_data = GameDataBuilder::default() + .with_bundle(InputBundle::<String, String>::new().with_bindings_from_file(&input_path))? + .with_bundle(AudioBundle::new(|music: &mut Time| None))? + //.with_bundle(RenderBundle::new(pipe, Some(display_config))) + .with_basic_renderer(path,DrawFlat::<PosTex>::new(),false)? + .with(NoteSpawnSystem::default(),"note_spawn",&[]) + .with(NoteMoveSystem,"note_move",&["note_spawn"]) + .with(TimedDestroySystem,"timed_destroy",&[]) + .with_bundle(TransformBundle::new().with_dep(&["note_move"]))?; + + let game = Application::build("", GameState::new())? .with_frame_limit( FrameRateLimitStrategy::SleepAndYield(Duration::from_millis(2)), 144, ) - .with_bundle(InputBundle::<String, String>::new().with_bindings_from_file(&input_path)) - .expect("Failed to load input bindings") - .with_bundle(AudioBundle::new(|music: &mut Time| None)) - .expect("Failed to build dj bundle") - .with_bundle(RenderBundle::new(pipe, Some(display_config))) - .expect("Failed to load render bundle") - .with(NoteSpawnSystem::default(),"note_spawn",&[]) - .with(NoteMoveSystem,"note_move",&["note_spawn"]) - .with(TimedDestroySystem,"timed_destroy",&[]) - .with_bundle(TransformBundle::new().with_dep(&["note_move"])) - .expect("Failed to build transform bundle"); - game.build().expect("Failed to build game").run(); + .build(game_data)? + .run(); + /*println!("Sample midi file read test"); //let path = Path::new("test.mid"); @@ -396,52 +173,15 @@ fn main() { println!("Midi data: {:?}",handler); - println!("Midi file read end"); - - - let mut midi_in = MidiInput::new("Key Fall").expect("Failed to create midi input"); - midi_in.ignore(Ignore::None); - - - println!("Available input ports:"); - let mut input = String::new(); - for i in 0..midi_in.port_count() { - println!("{}: {}", i, midi_in.port_name(i).unwrap()); - } - print!("Please select input port: "); - stdout().flush().unwrap(); - stdin().read_line(&mut input).unwrap(); - let in_port: usize = input.trim().parse().unwrap(); - - println!("Connecting..."); - let log_all_bytes = Vec::new(); // We use this as an example custom data to pass into the callback - let conn_in = midi_in.connect(in_port, "Midi Input", |stamp, message, log| { - // The last of the three callback parameters is the object that we pass in as last parameter of `connect`. - if message.len() > 1{ - - //println!("{}: {:?} (len = {})", stamp, message, message.len()); - - // [1,2,3] - // 1 = state. 144 = down, 128 = up - // 2 = key. - // 3 = velocity. [0,128?] down, 64 up - - let time_secs = stamp as f64 / 1000000.0; - println!("Time: {} -> {:?}",time_secs,message); - } - log.extend_from_slice(message); - }, log_all_bytes).expect("Failed to open midi connection."); - - - // midi event to note - // https://github.com/derekdreery/nom-midi-rs/blob/master/src/parser/event/midi.rs - + println!("Midi file read end");*/ - println!("Connection opened."); - loop{} + // create midi input from state + // move to EventChannel<ghakuf::messages::MidiEvent::MidiEvent> + // read from the game's systems - println!("Closing connections"); + /*println!("Closing connections"); let (midi_in_, log_all_bytes) = conn_in.close();*/ + Ok(()) } diff --git a/src/systems/graphics/mod.rs b/src/systems/graphics/mod.rs @@ -0,0 +1 @@ +pub mod notes;+ \ No newline at end of file diff --git a/src/systems/graphics/notes.rs b/src/systems/graphics/notes.rs @@ -0,0 +1,93 @@ +use midir::{MidiInput,Ignore}; +use std::io::{stdout,stdin,Write}; +use ghakuf::messages::*; +use ghakuf::reader::*; +use ghakuf::messages::MidiEvent::*; +use std::path::Path; + +use amethyst::audio::{AudioBundle, SourceHandle}; +use amethyst::assets::{ProgressCounter,Loader}; +use amethyst::core::frame_limiter::FrameRateLimitStrategy; +use amethyst::core::transform::{Transform,GlobalTransform,TransformBundle}; +use amethyst::core::Time; +use amethyst::core::cgmath::{Matrix4,Vector3}; +use amethyst::input::InputBundle; +use amethyst::prelude::*; +use amethyst::utils::fps_counter::FPSCounterBundle; +use amethyst::renderer::{Camera,DisplayConfig, DrawFlat, Pipeline, PosTex, RenderBundle, + Stage, Projection,Event,Material,MeshHandle,MaterialDefaults}; +use amethyst::shrev::{ReaderId,EventChannel}; +use amethyst::ui::UiEvent; +use amethyst::Application; +use amethyst_extra::*; +use amethyst::ecs::prelude::*; +use amethyst::Error; + +use std::time::Duration; + +use data::notes::*; +use data::midi::*; +use AssetData; + +#[derive(Default)] +pub struct NoteSpawnSystem{ + last_spawn: f64, +} + +impl NoteSpawnSystem{ + pub fn can_spawn(&mut self, time: f64, note_time: f64, last_frame: f64)->bool{ + // 1.0 = note scroll delay + note_time < time - 1.0 && note_time > self.last_spawn + } +} + +impl<'a> System<'a> for NoteSpawnSystem { + type SystemData = ( + Entities<'a>, + Read<'a, Time>, + ReadExpect<'a,AssetData>, + ReadExpect<'a, MidiFileHandler>, + WriteStorage<'a,GlobalTransform>, + WriteStorage<'a,Transform>, + WriteStorage<'a,DestroyAtTime>, + WriteStorage<'a,MeshHandle>, + WriteStorage<'a,Material>, + WriteStorage<'a,NoteComponent>,); + fn run(&mut self, (entities,time, asset, midi, mut gt, mut tr, mut dat, mut meshes, mut mats, mut nc): Self::SystemData) { + let lower = time.absolute_time_seconds() - time.delta_seconds() as f64 + 1.0; + let upper = time.absolute_time_seconds() + 1.0; + for n in &midi.song.notes{ + if n.start < upper{ + if n.start >= lower{ + println!("Spawning note: {:?}, scheduled for destruction at: {}, at time: {}",n,n.end + 0.1,time.absolute_time_seconds()); + let e = entities.create(); + gt.insert(e,GlobalTransform::default()); + let mut t = Transform::default(); + t.scale.x = 0.01; + t.scale.y = ((n.end - n.start) / 1.0) as f32; + tr.insert(e,t); + dat.insert(e,DestroyAtTime{ time: n.end + 0.1 }); + meshes.insert(e,asset.mesh.clone()); + mats.insert(e,asset.mat.clone()); + nc.insert(e,NoteComponent{key: n.key,time: n.start}); + } + } + } + } +} + +pub struct NoteMoveSystem; + +impl<'a> System<'a> for NoteMoveSystem { + type SystemData = ( + Read<'a, Time>, + WriteStorage<'a,Transform>, + ReadStorage<'a,NoteComponent>); + fn run(&mut self, (time,mut tr, nc): Self::SystemData) { + for (mut tr, nc) in (&mut tr,&nc).join(){ + tr.translation.x = nc.key as f32 / 100.0; + // 1.0 = scroll speed. + tr.translation.y = ((nc.time - time.absolute_time_seconds()) / 1.0) as f32 + tr.scale.y / 2.0; + } + } +}+ \ No newline at end of file diff --git a/src/systems/mod.rs b/src/systems/mod.rs @@ -0,0 +1 @@ +pub mod graphics;