world-digger-amethyst

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

commit 39bc4b0acffa4e9a6a523a4528e4130c3185398c
parent b9ee5c430a8aa1d72779ff818b37fa51f2a63a5c
Author: Joël Lupien (Jojolepro) <jojolepro@jojolepro.com>
Date:   Mon,  8 Jun 2020 17:18:31 -0400

Added todo file

Diffstat:
M.idea/workspace.xml | 315+++++++++++++++++++++++++++-----------------------------------------------------
MCargo.lock | 47++---------------------------------------------
MCargo.toml | 9++++-----
Msrc/main.rs | 9++++-----
Atodo.txt | 20++++++++++++++++++++
5 files changed, 135 insertions(+), 265 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml @@ -1,7 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4"> <component name="ChangeListManager"> - <list default="true" id="226c5b41-e656-4e92-bd88-7bbe8589318d" name="Default" comment="" /> + <list default="true" id="226c5b41-e656-4e92-bd88-7bbe8589318d" name="Default" comment=""> + <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> + </list> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="TRACKING_ENABLED" value="true" /> <option name="SHOW_DIALOG" value="false" /> @@ -14,18 +16,17 @@ <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="204"> - <caret line="12" column="12" lean-forward="false" selection-start-line="12" selection-start-column="12" selection-end-line="12" selection-end-column="12" /> - <folding /> + <state relative-caret-position="192"> + <caret line="12" column="12" selection-start-line="12" selection-start-column="12" selection-end-line="12" selection-end-column="12" /> </state> </provider> </entry> </file> - <file leaf-file-name="main.rs" pinned="false" current-in-tab="false"> + <file leaf-file-name="main.rs" pinned="false" current-in-tab="true"> <entry file="file://$PROJECT_DIR$/src/main.rs"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="262"> - <caret line="255" column="16" lean-forward="false" selection-start-line="255" selection-start-column="16" selection-end-line="255" selection-end-column="16" /> + <state relative-caret-position="396"> + <caret line="109" column="37" lean-forward="true" selection-start-line="109" selection-start-column="37" selection-end-line="109" selection-end-column="37" /> <folding> <element signature="e#5808#5809#0" expanded="true" /> <element signature="e#5838#5839#0" expanded="true" /> @@ -36,12 +37,11 @@ </provider> </entry> </file> - <file leaf-file-name="ui.rs" pinned="false" current-in-tab="true"> + <file leaf-file-name="ui.rs" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/ui.rs"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="262"> - <caret line="268" column="15" lean-forward="false" selection-start-line="268" selection-start-column="15" selection-end-line="268" selection-end-column="15" /> - <folding /> + <state relative-caret-position="4416"> + <caret line="276" column="28" lean-forward="true" selection-start-line="276" selection-start-column="28" selection-end-line="276" selection-end-column="28" /> </state> </provider> </entry> @@ -49,9 +49,8 @@ <file leaf-file-name="player.rs" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/player.rs"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="952"> - <caret line="56" column="28" lean-forward="false" selection-start-line="56" selection-start-column="28" selection-end-line="56" selection-end-column="28" /> - <folding /> + <state relative-caret-position="896"> + <caret line="56" column="28" selection-start-line="56" selection-start-column="28" selection-end-line="56" selection-end-column="28" /> </state> </provider> </entry> @@ -73,11 +72,6 @@ <component name="Git.Settings"> <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> </component> - <component name="GradleLocalSettings"> - <option name="externalProjectsViewState"> - <projects_view /> - </option> - </component> <component name="IdeDocumentHistory"> <option name="CHANGED_PATHS"> <list> @@ -89,27 +83,16 @@ </option> </component> <component name="ProjectFrameBounds"> - <option name="x" value="1932" /> + <option name="x" value="2885" /> <option name="y" value="15" /> - <option name="width" value="1896" /> + <option name="width" value="943" /> <option name="height" value="1053" /> </component> <component name="ProjectView"> - <navigator currentView="ProjectPane" proportions="" version="1"> - <flattenPackages /> - <showMembers /> - <showModules /> - <showLibraryContents /> - <hideEmptyPackages /> - <abbreviatePackageNames /> - <autoscrollToSource /> - <autoscrollFromSource /> - <sortByType /> - <manualOrder /> + <navigator proportions="" version="1"> <foldersAlwaysOnTop value="true" /> </navigator> <panes> - <pane id="PackagesPane" /> <pane id="ProjectPane"> <subPane> <expand> @@ -126,7 +109,7 @@ <select /> </subPane> </pane> - <pane id="Scratches" /> + <pane id="PackagesPane" /> <pane id="AndroidView" /> <pane id="Scope" /> </panes> @@ -149,29 +132,12 @@ </component> <component name="RunManager"> <configuration default="true" type="Applet" factoryName="Applet"> - <option name="HTML_USED" value="false" /> - <option name="WIDTH" value="400" /> - <option name="HEIGHT" value="300" /> <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" /> - <module /> </configuration> <configuration default="true" type="Application" factoryName="Application"> - <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> - <option name="MAIN_CLASS_NAME" /> - <option name="VM_PARAMETERS" /> - <option name="PROGRAM_PARAMETERS" /> <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> - <option name="ALTERNATIVE_JRE_PATH" /> - <option name="ENABLE_SWING_INSPECTOR" value="false" /> - <option name="ENV_VARIABLES" /> - <option name="PASS_PARENT_ENVS" value="true" /> - <module name="" /> - <envs /> </configuration> <configuration default="true" type="JUnit" factoryName="JUnit"> - <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> - <module name="" /> <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> <option name="ALTERNATIVE_JRE_PATH" /> <option name="PACKAGE_NAME" /> @@ -181,24 +147,13 @@ <option name="VM_PARAMETERS" value="-ea" /> <option name="PARAMETERS" /> <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" /> - <option name="ENV_VARIABLES" /> <option name="PASS_PARENT_ENVS" value="true" /> <option name="TEST_SEARCH_SCOPE"> <value defaultName="singleModule" /> </option> - <envs /> <patterns /> </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="TestNG" factoryName="TestNG"> - <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> - <module name="" /> <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> <option name="ALTERNATIVE_JRE_PATH" /> <option name="SUITE_NAME" /> @@ -211,29 +166,17 @@ <option name="PARAMETERS" /> <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" /> <option name="OUTPUT_DIRECTORY" /> - <option name="ANNOTATION_TYPE" /> - <option name="ENV_VARIABLES" /> <option name="PASS_PARENT_ENVS" value="true" /> <option name="TEST_SEARCH_SCOPE"> <value defaultName="singleModule" /> </option> <option name="USE_DEFAULT_REPORTERS" value="false" /> <option name="PROPERTIES_FILE" /> - <envs /> <properties /> <listeners /> </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="SbtLocalSettings"> - <option name="externalProjectsViewState"> - <projects_view /> - </option> <option name="projectSyncType"> <map> <entry key="$PROJECT_DIR$/../../HoppinWorldBackend" value="PREVIEW" /> @@ -241,9 +184,6 @@ </map> </option> </component> - <component name="ShelveChangesManager" show_recycled="false"> - <option name="remove_strategy" value="false" /> - </component> <component name="SvnConfiguration"> <configuration /> </component> @@ -258,56 +198,52 @@ <servers /> </component> <component name="ToolWindowManager"> - <frame x="1932" y="15" width="1896" height="1053" extended-state="0" /> + <frame x="2885" y="15" width="943" height="1053" extended-state="0" /> + <editor active="true" /> <layout> - <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> - <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> - <window_info id="Cargo" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> - <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> - <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> - <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> - <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" /> - <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> - <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> - <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> - <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> - <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> - <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.14648649" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> - <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> - <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> - <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> - <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> - <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> - <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" /> - <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> - <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> - <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> - <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> - <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> - <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> + <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 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="bottom" id="Run" order="2" /> + <window_info anchor="bottom" id="Version Control" order="7" /> + <window_info anchor="bottom" id="Terminal" order="7" /> + <window_info id="Capture Tool" order="2" /> + <window_info id="Designer" order="2" /> + <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.15719064" /> + <window_info id="Structure" order="1" side_tool="true" weight="0.25" /> + <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 anchor="bottom" id="Debug" order="3" weight="0.4" /> + <window_info id="Favorites" order="2" 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" /> + <window_info anchor="bottom" id="Message" order="0" /> + <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" /> + <window_info anchor="bottom" id="Find" order="1" /> </layout> </component> <component name="VcsContentAnnotationSettings"> <option name="myLimit" value="2678400000" /> </component> - <component name="XDebuggerManager"> - <breakpoint-manager /> - <watches-manager /> - </component> <component name="editorHistoryManager"> <entry file="file://$PROJECT_DIR$/src/player.rs"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="952"> - <caret line="56" column="28" lean-forward="false" selection-start-line="56" selection-start-column="28" selection-end-line="56" selection-end-column="28" /> - <folding /> + <caret line="56" column="28" selection-start-line="56" selection-start-column="28" selection-end-line="56" selection-end-column="28" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main.rs"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="2482"> - <caret line="146" column="0" lean-forward="false" selection-start-line="146" selection-start-column="0" selection-end-line="146" selection-end-column="0" /> + <caret line="146" selection-start-line="146" selection-end-line="146" /> <folding> <element signature="e#5808#5809#0" expanded="true" /> <element signature="e#5838#5839#0" expanded="true" /> @@ -320,31 +256,28 @@ <entry file="file://$PROJECT_DIR$/Cargo.toml"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="119"> - <caret line="7" column="111" lean-forward="false" selection-start-line="7" selection-start-column="111" selection-end-line="7" selection-end-column="111" /> - <folding /> + <caret line="7" column="111" selection-start-line="7" selection-start-column="111" selection-end-line="7" selection-end-column="111" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/ui.rs"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="187"> - <caret line="11" column="4" lean-forward="false" selection-start-line="11" selection-start-column="4" selection-end-line="25" selection-end-column="6" /> - <folding /> + <caret line="11" column="4" selection-start-line="11" selection-start-column="4" selection-end-line="25" selection-end-column="6" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/player.rs"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="952"> - <caret line="56" column="28" lean-forward="false" selection-start-line="56" selection-start-column="28" selection-end-line="56" selection-end-column="28" /> - <folding /> + <caret line="56" column="28" selection-start-line="56" selection-start-column="28" selection-end-line="56" selection-end-column="28" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main.rs"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="2482"> - <caret line="146" column="0" lean-forward="true" selection-start-line="146" selection-start-column="0" selection-end-line="146" selection-end-column="0" /> + <caret line="146" lean-forward="true" selection-start-line="146" selection-end-line="146" /> <folding> <element signature="e#5808#5809#0" expanded="true" /> <element signature="e#5838#5839#0" expanded="true" /> @@ -357,15 +290,14 @@ <entry file="file://$PROJECT_DIR$/Cargo.toml"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="119"> - <caret line="7" column="111" lean-forward="false" selection-start-line="7" selection-start-column="111" selection-end-line="7" selection-end-column="111" /> - <folding /> + <caret line="7" column="111" selection-start-line="7" selection-start-column="111" selection-end-line="7" selection-end-column="111" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main.rs"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="3145"> - <caret line="185" column="12" lean-forward="false" selection-start-line="185" selection-start-column="12" selection-end-line="185" selection-end-column="52" /> + <caret line="185" column="12" selection-start-line="185" selection-start-column="12" selection-end-line="185" selection-end-column="52" /> <folding> <element signature="e#5808#5809#0" expanded="true" /> <element signature="e#5838#5839#0" expanded="true" /> @@ -378,24 +310,21 @@ <entry file="file://$PROJECT_DIR$/src/player.rs"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="952"> - <caret line="56" column="28" lean-forward="false" selection-start-line="56" selection-start-column="28" selection-end-line="56" selection-end-column="28" /> - <folding /> + <caret line="56" column="28" selection-start-line="56" selection-start-column="28" selection-end-line="56" selection-end-column="28" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/ui.rs"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="0"> - <caret line="0" column="37" lean-forward="false" selection-start-line="0" selection-start-column="37" selection-end-line="0" selection-end-column="37" /> - <folding /> + <state> + <caret column="37" selection-start-column="37" selection-end-column="37" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/Cargo.toml"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="119"> - <caret line="7" column="111" lean-forward="false" selection-start-line="7" selection-start-column="111" selection-end-line="7" selection-end-column="111" /> - <folding /> + <caret line="7" column="111" selection-start-line="7" selection-start-column="111" selection-end-line="7" selection-end-column="111" /> </state> </provider> </entry> @@ -415,31 +344,24 @@ <entry file="file://$PROJECT_DIR$/src/player.rs"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="952"> - <caret line="56" column="28" lean-forward="false" selection-start-line="56" selection-start-column="28" selection-end-line="56" selection-end-column="28" /> - <folding /> + <caret line="56" column="28" selection-start-line="56" selection-start-column="28" selection-end-line="56" selection-end-column="28" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/ui.rs"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="0"> - <caret line="0" column="37" lean-forward="true" selection-start-line="0" selection-start-column="37" selection-end-line="0" selection-end-column="37" /> - <folding /> + <state> + <caret column="37" lean-forward="true" selection-start-column="37" selection-end-column="37" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/Cargo.toml"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="0"> - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> - <folding /> - </state> - </provider> + <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"> <state relative-caret-position="5899"> - <caret line="351" column="39" lean-forward="false" selection-start-line="351" selection-start-column="39" selection-end-line="351" selection-end-column="39" /> + <caret line="351" column="39" selection-start-line="351" selection-start-column="39" selection-end-line="351" selection-end-column="39" /> <folding> <element signature="e#5808#5809#0" expanded="true" /> <element signature="e#5838#5839#0" expanded="true" /> @@ -452,18 +374,12 @@ <entry file="file://$PROJECT_DIR$/src/player.rs"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="612"> - <caret line="36" column="4" lean-forward="false" selection-start-line="36" selection-start-column="4" selection-end-line="36" selection-end-column="4" /> - <folding /> + <caret line="36" column="4" selection-start-line="36" selection-start-column="4" selection-end-line="36" selection-end-column="4" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/Cargo.toml"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="0"> - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> - <folding /> - </state> - </provider> + <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"> @@ -481,31 +397,28 @@ <entry file="file://$PROJECT_DIR$/src/player.rs"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="612"> - <caret line="36" column="4" lean-forward="false" selection-start-line="36" selection-start-column="4" selection-end-line="36" selection-end-column="4" /> - <folding /> + <caret line="36" column="4" selection-start-line="36" selection-start-column="4" selection-end-line="36" selection-end-column="4" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/Cargo.toml"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="119"> - <caret line="7" column="93" lean-forward="false" selection-start-line="7" selection-start-column="93" selection-end-line="7" selection-end-column="93" /> - <folding /> + <caret line="7" column="93" selection-start-line="7" selection-start-column="93" selection-end-line="7" selection-end-column="93" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/player.rs"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="612"> - <caret line="36" column="4" lean-forward="false" selection-start-line="36" selection-start-column="4" selection-end-line="36" selection-end-column="4" /> - <folding /> + <caret line="36" column="4" selection-start-line="36" selection-start-column="4" selection-end-line="36" selection-end-column="4" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main.rs"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="3842"> - <caret line="226" column="10" lean-forward="false" selection-start-line="226" selection-start-column="10" selection-end-line="226" selection-end-column="10" /> + <caret line="226" column="10" selection-start-line="226" selection-start-column="10" selection-end-line="226" selection-end-column="10" /> <folding> <element signature="e#5808#5809#0" expanded="true" /> <element signature="e#5838#5839#0" expanded="true" /> @@ -518,23 +431,21 @@ <entry file="file://$PROJECT_DIR$/Cargo.toml"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="119"> - <caret line="7" column="93" lean-forward="false" selection-start-line="7" selection-start-column="93" selection-end-line="7" selection-end-column="93" /> - <folding /> + <caret line="7" column="93" selection-start-line="7" selection-start-column="93" selection-end-line="7" selection-end-column="93" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/player.rs"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="527"> - <caret line="31" column="0" lean-forward="false" selection-start-line="31" selection-start-column="0" selection-end-line="31" selection-end-column="0" /> - <folding /> + <caret line="31" selection-start-line="31" selection-end-line="31" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main.rs"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="4862"> - <caret line="290" column="10" lean-forward="false" selection-start-line="290" selection-start-column="10" selection-end-line="290" selection-end-column="10" /> + <caret line="290" column="10" selection-start-line="290" selection-start-column="10" selection-end-line="290" selection-end-column="10" /> <folding> <element signature="e#5808#5809#0" expanded="true" /> <element signature="e#5838#5839#0" expanded="true" /> @@ -547,23 +458,21 @@ <entry file="file://$PROJECT_DIR$/Cargo.toml"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="119"> - <caret line="7" column="93" lean-forward="false" selection-start-line="7" selection-start-column="93" selection-end-line="7" selection-end-column="93" /> - <folding /> + <caret line="7" column="93" selection-start-line="7" selection-start-column="93" selection-end-line="7" selection-end-column="93" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/player.rs"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="527"> - <caret line="31" column="0" lean-forward="false" selection-start-line="31" selection-start-column="0" selection-end-line="31" selection-end-column="0" /> - <folding /> + <caret line="31" selection-start-line="31" selection-end-line="31" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main.rs"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="4879"> - <caret line="287" column="10" lean-forward="false" selection-start-line="287" selection-start-column="10" selection-end-line="287" selection-end-column="10" /> + <caret line="287" column="10" selection-start-line="287" selection-start-column="10" selection-end-line="287" selection-end-column="10" /> <folding> <element signature="e#5808#5809#0" expanded="true" /> <element signature="e#5838#5839#0" expanded="true" /> @@ -576,15 +485,14 @@ <entry file="file://$PROJECT_DIR$/Cargo.toml"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="119"> - <caret line="7" column="93" lean-forward="false" selection-start-line="7" selection-start-column="93" selection-end-line="7" selection-end-column="93" /> - <folding /> + <caret line="7" column="93" selection-start-line="7" selection-start-column="93" selection-end-line="7" selection-end-column="93" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main.rs"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="1666"> - <caret line="102" column="10" lean-forward="false" selection-start-line="102" selection-start-column="10" selection-end-line="102" selection-end-column="10" /> + <caret line="102" column="10" selection-start-line="102" selection-start-column="10" selection-end-line="102" selection-end-column="10" /> <folding> <element signature="e#5808#5809#0" expanded="true" /> <element signature="e#5838#5839#0" expanded="true" /> @@ -597,31 +505,28 @@ <entry file="file://$PROJECT_DIR$/src/player.rs"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="527"> - <caret line="31" column="0" lean-forward="true" selection-start-line="31" selection-start-column="0" selection-end-line="31" selection-end-column="0" /> - <folding /> + <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/Cargo.toml"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="119"> - <caret line="7" column="93" lean-forward="false" selection-start-line="7" selection-start-column="93" selection-end-line="7" selection-end-column="93" /> - <folding /> + <caret line="7" column="93" selection-start-line="7" selection-start-column="93" selection-end-line="7" selection-end-column="93" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/player.rs"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="102"> - <caret line="6" column="0" lean-forward="false" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" /> - <folding /> + <caret line="6" selection-start-line="6" selection-end-line="6" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main.rs"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="1734"> - <caret line="102" column="10" lean-forward="false" selection-start-line="102" selection-start-column="10" selection-end-line="102" selection-end-column="10" /> + <caret line="102" column="10" selection-start-line="102" selection-start-column="10" selection-end-line="102" selection-end-column="10" /> <folding> <element signature="e#5808#5809#0" expanded="true" /> <element signature="e#5838#5839#0" expanded="true" /> @@ -634,23 +539,21 @@ <entry file="file://$PROJECT_DIR$/Cargo.toml"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="221"> - <caret line="13" column="12" lean-forward="false" selection-start-line="13" selection-start-column="12" selection-end-line="13" selection-end-column="12" /> - <folding /> + <caret line="13" column="12" selection-start-line="13" selection-start-column="12" selection-end-line="13" selection-end-column="12" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/player.rs"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="102"> - <caret line="6" column="0" lean-forward="false" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" /> - <folding /> + <caret line="6" selection-start-line="6" selection-end-line="6" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main.rs"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="3332"> - <caret line="200" column="53" lean-forward="false" selection-start-line="200" selection-start-column="50" selection-end-line="200" selection-end-column="53" /> + <caret line="200" column="53" selection-start-line="200" selection-start-column="50" selection-end-line="200" selection-end-column="53" /> <folding> <element signature="e#5808#5809#0" expanded="true" /> <element signature="e#5838#5839#0" expanded="true" /> @@ -663,23 +566,21 @@ <entry file="file://$PROJECT_DIR$/Cargo.toml"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="221"> - <caret line="13" column="12" lean-forward="false" selection-start-line="13" selection-start-column="12" selection-end-line="13" selection-end-column="12" /> - <folding /> + <caret line="13" column="12" selection-start-line="13" selection-start-column="12" selection-end-line="13" selection-end-column="12" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/player.rs"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="102"> - <caret line="6" column="0" lean-forward="false" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" /> - <folding /> + <caret line="6" selection-start-line="6" selection-end-line="6" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main.rs"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="3400"> - <caret line="200" column="53" lean-forward="false" selection-start-line="200" selection-start-column="50" selection-end-line="200" selection-end-column="53" /> + <caret line="200" column="53" selection-start-line="200" selection-start-column="50" selection-end-line="200" selection-end-column="53" /> <folding> <element signature="e#5808#5809#0" expanded="true" /> <element signature="e#5838#5839#0" expanded="true" /> @@ -692,15 +593,14 @@ <entry file="file://$PROJECT_DIR$/Cargo.toml"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="102"> - <caret line="6" column="87" lean-forward="false" selection-start-line="6" selection-start-column="87" selection-end-line="6" selection-end-column="87" /> - <folding /> + <caret line="6" column="87" selection-start-line="6" selection-start-column="87" selection-end-line="6" selection-end-column="87" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main.rs"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="612"> - <caret line="36" column="31" lean-forward="false" selection-start-line="36" selection-start-column="31" selection-end-line="36" selection-end-column="31" /> + <caret line="36" column="31" selection-start-line="36" selection-start-column="31" selection-end-line="36" selection-end-column="31" /> <folding> <element signature="e#5808#5809#0" expanded="true" /> <element signature="e#5838#5839#0" expanded="true" /> @@ -713,15 +613,14 @@ <entry file="file://$PROJECT_DIR$/Cargo.toml"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="102"> - <caret line="6" column="87" lean-forward="false" selection-start-line="6" selection-start-column="87" selection-end-line="6" selection-end-column="87" /> - <folding /> + <caret line="6" column="87" selection-start-line="6" selection-start-column="87" selection-end-line="6" selection-end-column="87" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main.rs"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="612"> - <caret line="36" column="31" lean-forward="false" selection-start-line="36" selection-start-column="31" selection-end-line="36" selection-end-column="31" /> + <caret line="36" column="31" selection-start-line="36" selection-start-column="31" selection-end-line="36" selection-end-column="31" /> <folding> <element signature="e#5808#5809#0" expanded="true" /> <element signature="e#5838#5839#0" expanded="true" /> @@ -734,15 +633,14 @@ <entry file="file://$PROJECT_DIR$/Cargo.toml"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="102"> - <caret line="6" column="87" lean-forward="false" selection-start-line="6" selection-start-column="87" selection-end-line="6" selection-end-column="87" /> - <folding /> + <caret line="6" column="87" selection-start-line="6" selection-start-column="87" selection-end-line="6" selection-end-column="87" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main.rs"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="2448"> - <caret line="144" column="23" lean-forward="false" selection-start-line="144" selection-start-column="23" selection-end-line="144" selection-end-column="23" /> + <caret line="144" column="23" selection-start-line="144" selection-start-column="23" selection-end-line="144" selection-end-column="23" /> <folding> <element signature="e#5808#5809#0" expanded="true" /> <element signature="e#5838#5839#0" expanded="true" /> @@ -754,24 +652,29 @@ </entry> <entry file="file://$PROJECT_DIR$/src/player.rs"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="952"> - <caret line="56" column="28" lean-forward="false" selection-start-line="56" selection-start-column="28" selection-end-line="56" selection-end-column="28" /> - <folding /> + <state relative-caret-position="896"> + <caret line="56" column="28" selection-start-line="56" selection-start-column="28" selection-end-line="56" selection-end-column="28" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/Cargo.toml"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="204"> - <caret line="12" column="12" lean-forward="false" selection-start-line="12" selection-start-column="12" selection-end-line="12" selection-end-column="12" /> - <folding /> + <state relative-caret-position="192"> + <caret line="12" column="12" selection-start-line="12" selection-start-column="12" selection-end-line="12" selection-end-column="12" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/ui.rs"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="4416"> + <caret line="276" column="28" lean-forward="true" selection-start-line="276" selection-start-column="28" selection-end-line="276" selection-end-column="28" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main.rs"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="262"> - <caret line="255" column="16" lean-forward="false" selection-start-line="255" selection-start-column="16" selection-end-line="255" selection-end-column="16" /> + <state relative-caret-position="396"> + <caret line="109" column="37" lean-forward="true" selection-start-line="109" selection-start-column="37" selection-end-line="109" selection-end-column="37" /> <folding> <element signature="e#5808#5809#0" expanded="true" /> <element signature="e#5838#5839#0" expanded="true" /> @@ -781,13 +684,5 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/ui.rs"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="262"> - <caret line="268" column="15" lean-forward="false" selection-start-line="268" selection-start-column="15" selection-end-line="268" selection-end-column="15" /> - <folding /> - </state> - </provider> - </entry> </component> </project> \ No newline at end of file diff --git a/Cargo.lock b/Cargo.lock @@ -1,3 +1,5 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. [[package]] name = "aho-corasick" version = "0.5.3" @@ -42,19 +44,6 @@ dependencies = [ ] [[package]] -name = "amethyst-rhusics" -version = "0.1.0" -source = "git+https://github.com/jojolepro/amethyst-rhusics?branch=feature/spatial-collision#297763913bdfd983f1ea3b05c94e6dda2dfb74a7" -dependencies = [ - "amethyst_core 0.1.0 (git+https://github.com/jojolepro/amethyst?branch=uilayout)", - "collision 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rhusics-core 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rhusics-ecs 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "shrev 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", - "specs 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] name = "amethyst_assets" version = "0.2.0" source = "git+https://github.com/jojolepro/amethyst?branch=uilayout#47e3bda5abbe58697bc633ed1864be9d9282e8b0" @@ -394,7 +383,6 @@ dependencies = [ "cgmath 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", "num 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.29 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1202,30 +1190,6 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] -name = "rhusics-core" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "cgmath 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", - "collision 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.29 (registry+https://github.com/rust-lang/crates.io-index)", - "specs 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "rhusics-ecs" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "cgmath 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", - "collision 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rhusics-core 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.29 (registry+https://github.com/rust-lang/crates.io-index)", - "shrev 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", - "specs 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] name = "rodio" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1384,7 +1348,6 @@ dependencies = [ "hibitset 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "mopa 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "rayon 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.29 (registry+https://github.com/rust-lang/crates.io-index)", "shred 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "shred-derive 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "tuple_utils 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1659,11 +1622,8 @@ name = "world-digger" version = "0.1.0" dependencies = [ "amethyst 0.6.0 (git+https://github.com/jojolepro/amethyst?branch=uilayout)", - "amethyst-rhusics 0.1.0 (git+https://github.com/jojolepro/amethyst-rhusics?branch=feature/spatial-collision)", "collision 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)", - "rhusics-core 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rhusics-ecs 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "shred 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "shrev 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "specs 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1714,7 +1674,6 @@ dependencies = [ "checksum aho-corasick 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ca972c2ea5f742bfce5687b9aef75506a764f61d37f8f649047846a9686ddb66" "checksum alsa-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9013f855a808ab924a4c08b5c1ec9bd6b04fdb2295b4d570fb723e0ed2802a4f" "checksum amethyst 0.6.0 (git+https://github.com/jojolepro/amethyst?branch=uilayout)" = "<none>" -"checksum amethyst-rhusics 0.1.0 (git+https://github.com/jojolepro/amethyst-rhusics?branch=feature/spatial-collision)" = "<none>" "checksum amethyst_assets 0.2.0 (git+https://github.com/jojolepro/amethyst?branch=uilayout)" = "<none>" "checksum amethyst_audio 0.1.0 (git+https://github.com/jojolepro/amethyst?branch=uilayout)" = "<none>" "checksum amethyst_config 0.5.0 (git+https://github.com/jojolepro/amethyst?branch=uilayout)" = "<none>" @@ -1844,8 +1803,6 @@ dependencies = [ "checksum redox_syscall 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)" = "0d92eecebad22b767915e4d529f89f28ee96dbbf5a4810d2b844373f136417fd" "checksum regex 0.1.80 (registry+https://github.com/rust-lang/crates.io-index)" = "4fd4ace6a8cf7860714a2c2280d6c1f7e6a413486c13298bbc86fd3da019402f" "checksum regex-syntax 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "f9ec002c35e86791825ed294b50008eea9ddfc8def4420124fbc6b08db834957" -"checksum rhusics-core 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ab1311292fa4d03323e9a9cc77dc7f928e5bcb28a728b3a7e5124dcf35d521f0" -"checksum rhusics-ecs 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bcff8ccd736c1017437d9bbef4d40a89f181e0beea0527d628de9769ad884486" "checksum rodio 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d75cd401c68ba027cb0862eb03cabe8bd6d14849e3a76f6dd832b55422a19847" "checksum ron 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "da06feaa07f69125ab9ddc769b11de29090122170b402547f64b86fe16ebc399" "checksum rustc-demangle 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "11fb43a206a04116ffd7cfcf9bcb941f8eb6cc7ff667272246b0a1c74259a3cb" diff --git a/Cargo.toml b/Cargo.toml @@ -5,11 +5,11 @@ authors = ["Joël Lupien (Jojolepro) <jojolepromain@gmail.com>"] [dependencies] amethyst = { git = "https://github.com/jojolepro/amethyst", branch = "uilayout" } -amethyst-rhusics = { git = "https://github.com/jojolepro/amethyst-rhusics", branch = "feature/spatial-collision" } -rhusics-ecs = { version = "0.1", features = ["eders"] } -rhusics-core = { version = "0.1", features = ["specs", "eders"] } +#amethyst-rhusics = { git = "https://github.com/jojolepro/amethyst-rhusics" } +#rhusics-ecs = { version = "0.1", features = ["eders"] } +#rhusics-core = { version = "0.1", features = ["specs", "eders"] } specs = "0.10" shrev = "0.8" shred = "0.5" collision = "0.14" -rand = "0.3"- \ No newline at end of file +rand = "0.3" diff --git a/src/main.rs b/src/main.rs @@ -25,15 +25,15 @@ use amethyst::ui::{Anchor, Anchored, DrawUi, FontAsset, MouseReactive, Stretch, UiTransform,TextEditing}; use amethyst::winit::MouseCursor; -use amethyst_rhusics::{time_sync, DefaultBasicPhysicsBundle3,SpatialPhysicsBundle3}; +//use amethyst_rhusics::{time_sync, DefaultBasicPhysicsBundle3,SpatialPhysicsBundle3}; use collision::{Aabb3,Ray3}; use collision::dbvt::query_ray_closest; use collision::primitive::{Primitive3,Cuboid}; -use rhusics_core::{CollisionShape, RigidBody,Collider,ContactEvent,Velocity,ForceAccumulator}; +/*use rhusics_core::{CollisionShape, RigidBody,Collider,ContactEvent,Velocity,ForceAccumulator}; use rhusics_ecs::WithRigidBody; use rhusics_ecs::physics3d::{register_physics,BodyPose3, CollisionMode, CollisionStrategy, Mass3,DynamicBoundingVolumeTree3,SpatialSortingSystem3,ContactEvent3, - SpatialCollisionSystem3,GJK3,CurrentFrameUpdateSystem3,NextFrameSetupSystem3,ContactResolutionSystem3,Velocity3}; + SpatialCollisionSystem3,GJK3,CurrentFrameUpdateSystem3,NextFrameSetupSystem3,ContactResolutionSystem3,Velocity3};*/ use amethyst::core::cgmath::{Deg, Array, Basis3,Basis2, One, Point3, Quaternion, Vector3,Matrix3,Zero,EuclideanSpace,Rotation}; use shred::{Dispatcher,DispatcherBuilder}; @@ -511,4 +511,4 @@ fn initialise_camera(world: &mut World) { .with(GlobalTransform::default()) .with(FlyControlTag) .build(); -}- \ No newline at end of file +} diff --git a/todo.txt b/todo.txt @@ -0,0 +1,20 @@ +Make Compile +================================================================================ +-Remove rhusics-ecs +-Update code to rust edition="2018" +-Update amethyst to track master + +Feature Parity +================================================================================ +-Add nphysics-ecs + +New Features +================================================================================ +-Integrate movement system from amethyst-extra +-Add physics to world blocks +-Create list of block types and durabilities/hardness to break +-Create list of ressource types +-Create list of ressource type drop chance per block +-Create list of ressource value +-Create list of tools +-Implement mesh optimizer algorithm for voxel based worlds