Rework player movement in C++

This commit is contained in:
2021-03-06 00:27:07 -05:00
parent 3dd00eabd3
commit a21e90388e
110 changed files with 570 additions and 162 deletions

View File

@ -1,3 +0,0 @@
source_md5="9f3599f4ed5f050bd5c7966b39434aeb"
dest_md5="d8b8d051422c7cd9a641096cbf8c2f89"

View File

@ -1,3 +0,0 @@
source_md5="e8dabe73b13a84d293485b937c80f448"
dest_md5="4d425793877e102c4abd32ff8888a949"

View File

@ -1,3 +0,0 @@
source_md5="3bfdad86a3348e10ad92dce7a0c7edfb"
dest_md5="b2215c68eec5e82ae3b199c3ebef6ca3"

View File

@ -1,3 +0,0 @@
source_md5="0f187f924d66394184e7b3e6c957fb8c"
dest_md5="c9bfe92d419f5078052bb89139a81b80"

View File

@ -1,3 +0,0 @@
source_md5="424bc2e8a11a2373217678abda0df97e"
dest_md5="917df80dfa039af088b63b9a234e0ced"

View File

@ -1,3 +0,0 @@
source_md5="8aef6de8412026e94480cc71d8d055b6"
dest_md5="f536ce724bbfd6d3eec9c9b681d8bd87"

View File

@ -1,3 +0,0 @@
source_md5="9d92358506b2f630f49d7186a984dda0"
dest_md5="4d5bf56017f00adbc80e9bf5a14a9f50"

View File

@ -1,3 +0,0 @@
source_md5="08fdfe746696263d9157f46fbf6bcae3"
dest_md5="663720fe7a6ed76fff5d90489304ad6b"

View File

@ -1,3 +0,0 @@
source_md5="e857b8bb76d4617adc95c76a5fb540c2"
dest_md5="27ac0f89acdd7606843ba589e23aa7f4"

View File

@ -1,3 +0,0 @@
source_md5="385e8652393bf9a3fa82a062489c5435"
dest_md5="2ca28503838f7dd03b796000ec31111f"

View File

@ -1,3 +0,0 @@
source_md5="34e50c915b51252660db4c26d6f61d92"
dest_md5="284c8f30177baaab7a71e88c2fa18e87"

View File

@ -1,3 +0,0 @@
source_md5="9f8274a56b9edd5fe16c5dcae157c341"
dest_md5="723b7c3af22143822b4ea69f4a5e464d"

View File

@ -1,3 +0,0 @@
source_md5="a2e5738b2c3c72b7747d4619c999f663"
dest_md5="52ebec391e52938a37545ccc6f79cf74"

View File

@ -1,3 +0,0 @@
source_md5="66ca8a87ea50ca711ae82b664f60a2a4"
dest_md5="369b1a9c914d86a94dc9b0795e76649f"

View File

@ -1,3 +0,0 @@
source_md5="130412d800df4b7c2fc9747a6a5805ef"
dest_md5="94ec308054667a107722b55e2203ebfc"

View File

@ -1,3 +0,0 @@
source_md5="130412d800df4b7c2fc9747a6a5805ef"
dest_md5="94ec308054667a107722b55e2203ebfc"

View File

@ -1,3 +0,0 @@
source_md5="b5b713d18d62a88eb579db8fdc12c626"
dest_md5="3fa5aa738a28dc6cdeb9786d5398a721"

View File

@ -1,3 +0,0 @@
source_md5="7dca0d73f2612d088326ffc420d70d33"
dest_md5="4441e90ddb4675a44bc124eeb8d327f5"

View File

@ -1,3 +0,0 @@
source_md5="1c8d163e355ca2143cf1ee7539743095"
dest_md5="f4d70988d33daba683613005dd05abe5"

View File

@ -1,3 +1,3 @@
source_md5="597fbe9ccf6ea4d6483499e0cf0b03d0"
dest_md5="44096b06df43545f31758f2c690ba4dd"
dest_md5="4855047dc51267405dc34ccef9c9fb32"

View File

@ -1,3 +0,0 @@
source_md5="597fbe9ccf6ea4d6483499e0cf0b03d0"
dest_md5="44096b06df43545f31758f2c690ba4dd"

View File

@ -1,3 +0,0 @@
source_md5="3be96f8f0b1f368b29579f8fe6c79e53"
dest_md5="fb332b986c94f47353bb21064d61380b"

View File

@ -1,3 +0,0 @@
source_md5="3cf9c5ebe05a91b72f0aebb0ee407a93"
dest_md5="8bd975df2444464ff6174d81fef37888"

View File

@ -1,3 +0,0 @@
source_md5="46a58c40f5b6b62c3a59601b0fb55288"
dest_md5="6c83115f14a9c0acf967eb87bf07fe4b"

View File

@ -1,3 +0,0 @@
source_md5="adff44dac2834f17108b17f4084591a1"
dest_md5="e2e7037a5692f3fe173da14e5c60805a"

View File

@ -1,3 +0,0 @@
source_md5="9161b62a08022547a51cb144c79b83c2"
dest_md5="f5e5412b84c441a6c7bf7f80491ac049"

View File

@ -1,3 +0,0 @@
source_md5="53be14e4ad2f67df62927ebe16450b07"
dest_md5="6d3a87776838f14ee876321be0a815b3"

View File

@ -1,3 +0,0 @@
source_md5="d11fe17c538278732c370ff9a9299c13"
dest_md5="518d32294d74c6b89d656e11ba60fff3"

View File

@ -1,3 +0,0 @@
source_md5="4a4e86688ea9e233c2a97d2091f91210"
dest_md5="0b5f4549065c5a8e08ef3984540c93ea"

View File

@ -1,3 +0,0 @@
source_md5="41d8c79b5c539a2acf771607432eee6f"
dest_md5="317679fa87bca09ebef857482e26c6fb"

View File

@ -1,3 +0,0 @@
source_md5="303f11d3124d1c4e7f84eab94f2eec4e"
dest_md5="c435ad0f5644e639bccd3d8ca358885b"

View File

@ -1,3 +0,0 @@
source_md5="46923f78324d6e9a8e0e4a863d2d42b1"
dest_md5="c9e1f79e69e3f2f812c0be531478bb8e"

View File

@ -1,3 +0,0 @@
source_md5="62170d933feb1791d33e1fc234209ff0"
dest_md5="841cfe9c8cca9b353975fdeca4a6818d"

View File

@ -1,3 +0,0 @@
source_md5="ae3bdb1e531d0d500f6d21de544b2067"
dest_md5="8182b7555a30f5839165eafcca9acd9e"

View File

@ -1,3 +0,0 @@
source_md5="dd34a61f0c64a8b28fbc90958cefa569"
dest_md5="5d38a4263fce6ada9174911d6983e089"

View File

@ -1,3 +0,0 @@
source_md5="1fc89dcdb28dde7f2c550bc7fb764a9a"
dest_md5="43cd0d2da5e6d2246e38223d967eaef9"

View File

@ -1,3 +0,0 @@
source_md5="c1837fe565271833906e8389e7ce7c1c"
dest_md5="3d42ff45cbeda89803fb79710d4f5f99"

View File

@ -1,3 +0,0 @@
source_md5="385e8652393bf9a3fa82a062489c5435"
dest_md5="2ca28503838f7dd03b796000ec31111f"

View File

@ -1,3 +0,0 @@
source_md5="385e8652393bf9a3fa82a062489c5435"
dest_md5="2ca28503838f7dd03b796000ec31111f"

View File

@ -1,3 +0,0 @@
source_md5="b85c7252c4e8b281547c84fdfeaec78d"
dest_md5="ec0b5aba05be1d14ab11983117a481f1"

View File

@ -1,3 +0,0 @@
source_md5="6c5effbee182861293c67eb96f5fb23e"
dest_md5="9a076a710fba7054180bf80ce4546229"

View File

@ -1,3 +0,0 @@
source_md5="e2da7fb14b8d464f2eaa56db492be5df"
dest_md5="9b1d426abdf28a2ad8eba161f0c4bb57"

View File

@ -1,3 +0,0 @@
source_md5="c4e868a40fcea38649d43a73971cf969"
dest_md5="d21853d8744e43202ee3050f2c706feb"

View File

@ -1,3 +0,0 @@
source_md5="a44cdfde3fe6df51cb14453b6f8b1544"
dest_md5="a9ee1a40eb796495a96862aa22a8c4c9"

View File

@ -1,3 +1,3 @@
source_md5="88515d8ae34cca55294e20310b7476c4"
dest_md5="0f70ef32cfa3623874dce680b21fdd79"
dest_md5="a03cb2a5b382f6cb692178ac73231566"

View File

@ -3,7 +3,7 @@
[ext_resource path="res://Assets/Materials/SmoothScaling.tres" type="Material" id=1]
[ext_resource path="res://Assets/Art/Characters/player_parts.png" type="Texture" id=2]
[ext_resource path="res://Assets/Art/basic_light.png" type="Texture" id=3]
[ext_resource path="res://Scripts/Entities/Player.gd" type="Script" id=4]
[ext_resource path="res://bin/Player.gdns" type="Script" id=4]
[ext_resource path="res://Assets/Art/flashlight_map.png" type="Texture" id=5]
[ext_resource path="res://Assets/Art/Objects/flashlight.png" type="Texture" id=6]
[ext_resource path="res://Scripts/Entities/Flashlight.gd" type="Script" id=7]

Binary file not shown.

Binary file not shown.

Binary file not shown.

8
client/bin/Player.gdns Normal file
View File

@ -0,0 +1,8 @@
[gd_resource type="NativeScript" load_steps=2 format=2]
[ext_resource path="res://bin/connection.gdnlib" type="GDNativeLibrary" id=1]
[resource]
resource_name = "player"
class_name = "Player"
library = ExtResource( 1 )

View File

@ -0,0 +1,18 @@
[general]
singleton=false
load_once=true
symbol_prefix="godot_"
reloadable=false
[entry]
X11.64="res://bin/x11/libconnection.so"
Windows.64="res://bin/win64/libconnection.dll"
OSX.64="res://bin/osx/libconnection.dylib"
[dependencies]
X11.64=[ ]
Windows.64=[ ]
OSX.64=[ ]

Binary file not shown.

Binary file not shown.

View File

@ -8,21 +8,20 @@ export_filter="all_resources"
include_filter="*"
exclude_filter=""
export_path=""
patch_list=PoolStringArray( )
script_export_mode=1
script_encryption_key=""
[preset.0.options]
custom_template/debug=""
custom_template/release=""
binary_format/64_bits=false
binary_format/embed_pck=false
texture_format/bptc=false
texture_format/s3tc=true
texture_format/etc=false
texture_format/etc2=false
texture_format/no_bptc_fallbacks=true
binary_format/64_bits=false
binary_format/embed_pck=false
custom_template/release=""
custom_template/debug=""
codesign/enable=false
codesign/identity=""
codesign/password=""
@ -50,21 +49,20 @@ export_filter="all_resources"
include_filter="*"
exclude_filter=""
export_path=""
patch_list=PoolStringArray( )
script_export_mode=1
script_encryption_key=""
[preset.1.options]
custom_template/debug=""
custom_template/release=""
binary_format/64_bits=false
binary_format/embed_pck=false
texture_format/bptc=false
texture_format/s3tc=true
texture_format/etc=false
texture_format/etc2=false
texture_format/no_bptc_fallbacks=true
binary_format/64_bits=false
binary_format/embed_pck=false
custom_template/release=""
custom_template/debug=""
codesign/enable=false
codesign/identity=""
codesign/password=""
@ -91,22 +89,21 @@ custom_features=""
export_filter="all_resources"
include_filter="*"
exclude_filter=""
export_path="../../../Downloads/build/The Connection.x86_64"
patch_list=PoolStringArray( )
export_path="builds/The Connection.x86_64"
script_export_mode=1
script_encryption_key=""
[preset.2.options]
custom_template/debug=""
custom_template/release=""
binary_format/64_bits=true
binary_format/embed_pck=false
texture_format/bptc=false
texture_format/s3tc=true
texture_format/etc=false
texture_format/etc2=false
texture_format/no_bptc_fallbacks=true
binary_format/64_bits=true
binary_format/embed_pck=false
custom_template/release=""
custom_template/debug=""
[preset.3]
@ -118,18 +115,19 @@ export_filter="all_resources"
include_filter="*"
exclude_filter=""
export_path=""
patch_list=PoolStringArray( )
script_export_mode=1
script_encryption_key=""
[preset.3.options]
custom_template/debug=""
custom_template/release=""
variant/export_type=0
vram_texture_compression/for_desktop=true
vram_texture_compression/for_mobile=false
html/custom_html_shell=""
html/head_include=""
custom_template/release=""
custom_template/debug=""
html/full_window_size=true
[preset.4]
@ -141,7 +139,6 @@ export_filter="all_resources"
include_filter="*"
exclude_filter=""
export_path=""
patch_list=PoolStringArray( )
script_export_mode=1
script_encryption_key=""

View File

@ -8,11 +8,6 @@
config_version=4
_global_script_classes=[ ]
_global_script_class_icons={
}
[application]
config/name="The Connection"
@ -38,32 +33,41 @@ enabled=PoolStringArray( "EXP-System-Dialog" )
[input]
ui_accept={
"deadzone": 0.5,
"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777221,"unicode":0,"echo":false,"script":null)
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777222,"unicode":0,"echo":false,"script":null)
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":32,"unicode":0,"echo":false,"script":null)
, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":1,"pressure":0.0,"pressed":false,"script":null)
, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":0,"pressure":0.0,"pressed":false,"script":null)
]
}
ui_left={
"deadzone": 0.5,
"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777231,"unicode":0,"echo":false,"script":null)
, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":14,"pressure":0.0,"pressed":false,"script":null)
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":65,"unicode":0,"echo":false,"script":null)
, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":0,"axis_value":-1.0,"script":null)
]
}
ui_right={
"deadzone": 0.5,
"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777233,"unicode":0,"echo":false,"script":null)
, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":15,"pressure":0.0,"pressed":false,"script":null)
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":68,"unicode":0,"echo":false,"script":null)
, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":0,"axis_value":1.0,"script":null)
]
}
ui_up={
"deadzone": 0.5,
"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777232,"unicode":0,"echo":false,"script":null)
, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":12,"pressure":0.0,"pressed":false,"script":null)
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":32,"unicode":0,"echo":false,"script":null)
, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":0,"pressure":0.0,"pressed":false,"script":null)
]
}
ui_down={
"deadzone": 0.5,
"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777234,"unicode":0,"echo":false,"script":null)
, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":13,"pressure":0.0,"pressed":false,"script":null)
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":83,"unicode":0,"echo":false,"script":null)
, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":1,"axis_value":1.0,"script":null)
]
}
toggle_flashlight={
@ -76,6 +80,22 @@ interact={
"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":69,"unicode":0,"echo":false,"script":null)
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":88,"unicode":0,"echo":false,"script":null)
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777221,"unicode":0,"echo":false,"script":null)
, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":1,"pressure":0.0,"pressed":false,"script":null)
]
}
move_left={
"deadzone": 0.5,
"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":65,"unicode":0,"echo":false,"script":null)
]
}
move_right={
"deadzone": 0.5,
"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":68,"unicode":0,"echo":false,"script":null)
]
}
jump={
"deadzone": 0.5,
"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":32,"unicode":0,"echo":false,"script":null)
]
}