blujai831/stick-the-quick
blujai831
/
stick-the-quick
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: blujai831:1d4dc4b0d4bbd1bdf52b8ae3f8fde3c6c9c9fc1a
Branches Tags
blujai831:main
blujai831:dev
...
compare: blujai831:0ad77a03ec99c5a0efa894b9ddfa709ced53214e
Branches Tags
blujai831:dev
blujai831:main

6 Commits
1d4dc4b0d4 ... 0ad77a03ec

Author SHA1 Message Date
blujai831 0ad77a03ec
Add runway to test map for testing slope entry at max velocity. Raise ground plane horizontality to a configurable exponent before using it to modulate forward acceleration. Experimentally, 1.0 (equivalent to not doing this) is too strict, and the strictest value which is lenient enough seems to be 0.45. 2025-04-01 12:46:01 -07:00
blujai831 846f327a22
Prevent unrealistic climbing by modulating ground acceleration by ground plane horizontality 2025-04-01 12:25:25 -07:00
blujai831 91ead7fb5c
Make hang state resolve faster 2025-04-01 12:15:32 -07:00
blujai831 5d45119a26
Add more test geometry to the test map 2025-04-01 12:10:45 -07:00
blujai831 50bdf9a044
Fix wall-slide state falling through floors 2025-03-31 09:32:10 -07:00
blujai831 0c2083d7dd
Create material crystal3 2025-03-31 09:31:45 -07:00
13 changed files with 812 additions and 8 deletions
Show Stats Expand all files Collapse all files

21
characters/base/character.gd
View File

@ -77,6 +77,15 @@ class_name Character extends RigidBody3D
## then that contact surface is considered a wall or ceiling;
## otherwise, it is ground, and can be walked upon.
@export var _max_slope_angle: float = 1.0
## Forward acceleration is modulated by the absolute dot product
## of the ground plane with Vector3.UP, or in other words,
## by the extent to which the ground plane is horizontal.
## This helps prevent unrealistic slope-climbing.
## Before modulation, the absolute dot product is raised
## to the power of the value given here.
## The closer this value is to 0, the easier it will be
## for the character to climb slopes, and vice versa.
@export var _accel_mod_strictness: float = 0.45
## Friction when standing still.
## [br][br]
## Friction at or above top speed is always 0.0.
@ -295,7 +304,7 @@ func _handle_freeze_lerp_request(delta: float) -> void:
global_position = lerp(
global_position,
_freeze_lerp_target,
1.0 - 0.01**delta
1.0 - 0.0001**delta
)
if (global_position - _freeze_lerp_target).length() < height*0.03125:
global_position = _freeze_lerp_target
@ -611,7 +620,13 @@ func _do_standard_motion(delta: float) -> void:
)
# Then, check which forward acceleration value to use.
var max_accel: float = (
_air_acceleration if use_air_physics else _ground_acceleration
_air_acceleration if use_air_physics else (
# If we're using ground acceleration,
# modulate it by the horizontality of the ground plane.
# This helps prevent unrealistic climbing.
_ground_acceleration *
(abs(ground_normal.dot(Vector3.UP))**_accel_mod_strictness)
)
)
# Then, calculate true forward acceleration as follows:
# from standing at rest,
@ -1179,7 +1194,7 @@ func _on_hit_state_tick(delta: float) -> void:
func _on_hang_state_tick(delta: float) -> void:
global_basis = global_basis.slerp(
Basis.looking_at(-wall_normal, ground_normal),
1.0 - 0.01**delta
1.0 - 0.0001**delta
)
if jump_impetus && !_freeze_lerp_requested:
force_change_state(&'pull-up')

666
maps/textures/crystal3.ptex Normal file
View File

@ -0,0 +1,666 @@
{
"connections": [
{
"from": "voronoi2",
"from_port": 1,
"to": "warp",
"to_port": 1
},
{
"from": "graph",
"from_port": 0,
"to": "warp",
"to_port": 0
},
{
"from": "voronoi2",
"from_port": 1,
"to": "warp_2",
"to_port": 0
},
{
"from": "graph",
"from_port": 0,
"to": "warp_2",
"to_port": 1
},
{
"from": "warp_2",
"from_port": 0,
"to": "blend2",
"to_port": 1
},
{
"from": "warp",
"from_port": 0,
"to": "blend2",
"to_port": 0
},
{
"from": "normal_map2",
"from_port": 0,
"to": "Material",
"to_port": 4
},
{
"from": "blend2",
"from_port": 0,
"to": "make_tileable_square",
"to_port": 0
},
{
"from": "warp",
"from_port": 0,
"to": "colorize_3",
"to_port": 0
},
{
"from": "colorize_3",
"from_port": 0,
"to": "colorize_2",
"to_port": 0
},
{
"from": "colorize_2",
"from_port": 0,
"to": "make_tileable_square_2",
"to_port": 0
},
{
"from": "make_tileable_square_2",
"from_port": 0,
"to": "Material",
"to_port": 0
},
{
"from": "warp_2",
"from_port": 0,
"to": "colorize_4",
"to_port": 0
},
{
"from": "make_tileable_square",
"from_port": 0,
"to": "blend2_2",
"to_port": 0
},
{
"from": "blend2_2",
"from_port": 0,
"to": "normal_map2",
"to_port": 0
},
{
"from": "blend2_2",
"from_port": 0,
"to": "Material",
"to_port": 5
},
{
"from": "colorize_4",
"from_port": 0,
"to": "blend2_2",
"to_port": 1
},
{
"from": "colorize_4",
"from_port": 0,
"to": "colorize_5",
"to_port": 0
},
{
"from": "colorize_5",
"from_port": 0,
"to": "Material",
"to_port": 1
},
{
"from": "colorize_5",
"from_port": 0,
"to": "Material",
"to_port": 2
}
],
"label": "Graph",
"longdesc": "",
"name": "@Node@491",
"node_position": {
"x": 0.0,
"y": 0.0
},
"nodes": [
{
"export_last_target": "Godot/Godot 4 Standard",
"export_paths": {
"Godot/Godot 4 Standard": "/mnt/userfiles/Documents/Projects/stick-the-quick/maps/textures/crystal3"
},
"name": "Material",
"node_position": {
"x": 1088.0,
"y": 13.0
},
"parameters": {
"albedo_color": {
"a": 1.0,
"b": 1.0,
"g": 1.0,
"r": 1.0,
"type": "Color"
},
"ao": 1.0,
"depth_scale": 0.5,
"emission_energy": 1.0,
"flags_transparent": true,
"metallic": 1.0,
"normal": 1.0,
"roughness": 1.0,
"size": 11,
"sss": 1.0
},
"seed_int": 0,
"type": "material"
},
{
"connections": [
{
"from": "perlin",
"from_port": 0,
"to": "transform",
"to_port": 1
},
{
"from": "transform_2",
"from_port": 0,
"to": "gen_outputs",
"to_port": 0
},
{
"from": "perlin",
"from_port": 0,
"to": "transform",
"to_port": 2
},
{
"from": "perlin",
"from_port": 0,
"to": "transform_2",
"to_port": 0
},
{
"from": "transform",
"from_port": 0,
"to": "transform_2",
"to_port": 1
},
{
"from": "transform",
"from_port": 0,
"to": "transform_2",
"to_port": 2
},
{
"from": "perlin",
"from_port": 0,
"to": "transform",
"to_port": 0
}
],
"label": "Warp 2",
"longdesc": "",
"name": "graph",
"node_position": {
"x": -396.0,
"y": 213.5
},
"nodes": [
{
"name": "transform",
"node_position": {
"x": -292.25,
"y": -629.0
},
"parameters": {
"repeat": true,
"rotate": 0.0,
"scale_x": 1.0,
"scale_y": 1.0,
"translate_x": 0.6,
"translate_y": 0.6
},
"seed": 32047.0,
"type": "transform"
},
{
"name": "perlin",
"node_position": {
"x": -558.25,
"y": -720.0
},
"parameters": {
"iterations": 10.0,
"persistence": 0.5,
"scale_x": 4.0,
"scale_y": 4.0
},
"seed": 55134.0,
"type": "perlin"
},
{
"name": "gen_inputs",
"node_position": {
"x": -802.25,
"y": -655.5
},
"parameters": {
},
"ports": [],
"seed": 32147.0,
"type": "ios"
},
{
"name": "gen_outputs",
"node_position": {
"x": 268.75,
"y": -656.5
},
"parameters": {
},
"ports": [
{
"name": "port0",
"type": "rgba"
}
],
"seed": -38652.0,
"type": "ios"
},
{
"name": "gen_parameters",
"node_position": {
"x": -315.75,
"y": -905.0
},
"parameters": {
"param0": 4.0,
"param1": 4.0,
"param2": 10.0,
"param3": 0.5,
"param4": 0.6,
"param5": 0.6
},
"seed": 18604.0,
"type": "remote",
"widgets": [
{
"label": "Scale X",
"linked_widgets": [
{
"node": "perlin",
"widget": "scale_x"
}
],
"name": "param0",
"type": "linked_control"
},
{
"label": "Scale Y",
"linked_widgets": [
{
"node": "perlin",
"widget": "scale_y"
}
],
"name": "param1",
"type": "linked_control"
},
{
"label": "Iterations",
"linked_widgets": [
{
"node": "perlin",
"widget": "iterations"
}
],
"name": "param2",
"type": "linked_control"
},
{
"label": "Persistance",
"linked_widgets": [
{
"node": "perlin",
"widget": "persistence"
}
],
"name": "param3",
"type": "linked_control"
},
{
"label": "Warp X",
"linked_widgets": [
{
"node": "transform",
"widget": "translate_x"
},
{
"node": "transform_2",
"widget": "translate_x"
}
],
"name": "param4",
"type": "linked_control"
},
{
"label": "Warp Y",
"linked_widgets": [
{
"node": "transform",
"widget": "translate_y"
},
{
"node": "transform_2",
"widget": "translate_y"
}
],
"name": "param5",
"type": "linked_control"
}
]
},
{
"name": "transform_2",
"node_position": {
"x": -32.46240234375,
"y": -714.099975585938
},
"parameters": {
"repeat": true,
"rotate": 0.0,
"scale_x": 1.0,
"scale_y": 1.0,
"translate_x": 0.6,
"translate_y": 0.6
},
"seed": 57622.0,
"type": "transform"
}
],
"parameters": {
"param0": 4.0,
"param1": 4.0,
"param2": 10.0,
"param3": 0.5,
"param4": 0.6,
"param5": 0.6
},
"seed_int": 1611257728,
"shortdesc": "",
"type": "graph"
},
{
"name": "voronoi2",
"node_position": {
"x": -401.0,
"y": -11.5
},
"parameters": {
"intensity": 1.0,
"randomness": 0.85,
"scale_x": 4.0,
"scale_y": 4.0,
"stretch_x": 1.0,
"stretch_y": 1.0
},
"seed_int": 950873088,
"type": "voronoi2"
},
{
"name": "warp",
"node_position": {
"x": -143.0,
"y": 25.5
},
"parameters": {
"amount": 0.1,
"eps": 0.1,
"mode": 0.0
},
"seed_int": 0,
"type": "warp"
},
{
"name": "warp_2",
"node_position": {
"x": -147.0,
"y": 219.5
},
"parameters": {
"amount": 0.1,
"eps": 0.1,
"mode": 0.0
},
"seed_int": 0,
"type": "warp"
},
{
"generic_size": 1,
"name": "blend2",
"node_position": {
"x": 48.0,
"y": 112.5
},
"parameters": {
"amount1": 0.5,
"blend_type1": 0.0
},
"seed_int": 0,
"type": "blend2"
},
{
"name": "normal_map2",
"node_position": {
"x": 837.0,
"y": 227.5
},
"parameters": {
"buffer": 1.0,
"param2": 0.0,
"size": 10.0,
"strength": 1.0
},
"seed_int": 0,
"type": "normal_map2"
},
{
"name": "make_tileable_square",
"node_position": {
"x": 306.0,
"y": 139.5
},
"parameters": {
"fw": 1.0
},
"seed_int": 0,
"type": "make_tileable_square"
},
{
"name": "colorize_2",
"node_position": {
"x": 292.0,
"y": -18.5
},
"parameters": {
"gradient": {
"interpolation": 1,
"points": [
{
"a": 1.0,
"b": 0.59375,
"g": 0.59375,
"pos": 0.0,
"r": 1.0
},
{
"a": 1.0,
"b": 0.62109375,
"g": 0.9881591796875,
"pos": 0.254544999864366,
"r": 1.0
},
{
"a": 1.0,
"b": 0.521484375,
"g": 1.0,
"pos": 0.527273013267988,
"r": 0.453125
},
{
"a": 1.0,
"b": 1.0,
"g": 0.578857421875,
"pos": 0.772726977313006,
"r": 0.55078125
},
{
"a": 1.0,
"b": 1.0,
"g": 0.578125,
"pos": 1.0,
"r": 0.93408203125
}
],
"type": "Gradient"
}
},
"seed_int": 0,
"type": "colorize"
},
{
"name": "colorize_3",
"node_position": {
"x": 95.0,
"y": -11.5
},
"parameters": {
"gradient": {
"interpolation": 1,
"points": [
{
"a": 1.0,
"b": 0.0,
"g": 0.0,
"pos": 0.296296296296296,
"r": 0.0
},
{
"a": 1.0,
"b": 1.0,
"g": 1.0,
"pos": 0.506172839506173,
"r": 1.0
}
],
"type": "Gradient"
}
},
"seed_int": 0,
"type": "colorize"
},
{
"name": "make_tileable_square_2",
"node_position": {
"x": 457.5,
"y": -14.5
},
"parameters": {
"fw": 1.0
},
"seed_int": 0,
"type": "make_tileable_square"
},
{
"name": "colorize_4",
"node_position": {
"x": 164.5,
"y": 280.0
},
"parameters": {
"gradient": {
"interpolation": 1,
"points": [
{
"a": 1.0,
"b": 0.0,
"g": 0.0,
"pos": 0.0,
"r": 0.0
},
{
"a": 1.0,
"b": 1.0,
"g": 1.0,
"pos": 0.240740740740741,
"r": 1.0
}
],
"type": "Gradient"
}
},
"seed_int": 0,
"type": "colorize"
},
{
"generic_size": 1,
"name": "blend2_2",
"node_position": {
"x": 560.0,
"y": 276.5
},
"parameters": {
"amount1": 0.15,
"blend_type1": 0.0
},
"seed_int": 0,
"type": "blend2"
},
{
"name": "colorize_5",
"node_position": {
"x": 619.5,
"y": 156.0
},
"parameters": {
"gradient": {
"interpolation": 1,
"points": [
{
"a": 1.0,
"b": 1.0,
"g": 1.0,
"pos": 0.0,
"r": 1.0
},
{
"a": 1.0,
"b": 0.0,
"g": 0.0,
"pos": 1.0,
"r": 0.0
}
],
"type": "Gradient"
}
},
"seed_int": 0,
"type": "colorize"
}
],
"parameters": {
},
"seed_int": 0,
"shortdesc": "",
"type": "graph"
}

18
maps/textures/crystal3.tres Normal file
View File

@ -0,0 +1,18 @@
[gd_resource type="StandardMaterial3D" load_steps=4 format=3 uid="uid://crxt16d81btre"]
[ext_resource type="Texture2D" uid="uid://ccwae27j7o0i1" path="res://maps/textures/crystal3_albedo.png" id="1"]
[ext_resource type="Texture2D" uid="uid://bkfw8suhhp2ti" path="res://maps/textures/crystal3_orm.png" id="2"]
[ext_resource type="Texture2D" uid="uid://4e6hbmskqb51" path="res://maps/textures/crystal3_normal.png" id="3"]
[resource]
albedo_texture = ExtResource("1")
metallic = 1.0
metallic_texture = ExtResource("2")
metallic_texture_channel = 2
roughness_texture = ExtResource("2")
roughness_texture_channel = 1
normal_enabled = true
normal_texture = ExtResource("3")
ao_enabled = true
ao_texture = ExtResource("2")
uv1_triplanar = true

BIN
maps/textures/crystal3_albedo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.8 MiB

35
maps/textures/crystal3_albedo.png.import Normal file
View File

@ -0,0 +1,35 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://ccwae27j7o0i1"
path.s3tc="res://.godot/imported/crystal3_albedo.png-f3113d3a5ff6bc1314764e8f601dc47e.s3tc.ctex"
metadata={
"imported_formats": ["s3tc_bptc"],
"vram_texture": true
}
[deps]
source_file="res://maps/textures/crystal3_albedo.png"
dest_files=["res://.godot/imported/crystal3_albedo.png-f3113d3a5ff6bc1314764e8f601dc47e.s3tc.ctex"]
[params]
compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=0

BIN
maps/textures/crystal3_normal.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 MiB

35
maps/textures/crystal3_normal.png.import Normal file
View File

@ -0,0 +1,35 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://4e6hbmskqb51"
path.s3tc="res://.godot/imported/crystal3_normal.png-1c0255dc92b520036a186fb64ffac07a.s3tc.ctex"
metadata={
"imported_formats": ["s3tc_bptc"],
"vram_texture": true
}
[deps]
source_file="res://maps/textures/crystal3_normal.png"
dest_files=["res://.godot/imported/crystal3_normal.png-1c0255dc92b520036a186fb64ffac07a.s3tc.ctex"]
[params]
compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=1
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=1
roughness/src_normal="res://maps/textures/crystal3_normal.png"
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=0

BIN
maps/textures/crystal3_orm.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.1 MiB

35
maps/textures/crystal3_orm.png.import Normal file
View File

@ -0,0 +1,35 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://bkfw8suhhp2ti"
path.s3tc="res://.godot/imported/crystal3_orm.png-897e0cc81930720a13d5c4f9f6355346.s3tc.ctex"
metadata={
"imported_formats": ["s3tc_bptc"],
"vram_texture": true
}
[deps]
source_file="res://maps/textures/crystal3_orm.png"
dest_files=["res://.godot/imported/crystal3_orm.png-897e0cc81930720a13d5c4f9f6355346.s3tc.ctex"]
[params]
compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=8
roughness/src_normal="res://maps/textures/crystal3_normal.png"
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=0

BIN
test/blender_test_map.blend
View File

Binary file not shown.

BIN
test/blender_test_map.blend1 Normal file
View File

Binary file not shown.

8
test/blender_test_map.tscn
View File

File diff suppressed because one or more lines are too long

2
test/test_stick.tscn
View File

@ -731,7 +731,7 @@ animation_speedup_with_velocity = 0.0
audio = ExtResource("5_1n8td")
audio_volume_db = 0.0
collider_length = 1.3
collider_radius = 0.05
collider_radius = 0.18
collider_horizontal = false
yaw_orientation = 3
pitch_orientation = 3