From eab9d82d0c25f6226a37783ca52e66b58ae0863c Mon Sep 17 00:00:00 2001 From: Relintai Date: Tue, 14 Jan 2020 13:40:38 +0100 Subject: [PATCH] Fix matrix multiplication order for the display player, and small tweaks to the menu. --- game/player/EntityModel.gd | 2 +- game/scenes/Menu.tscn | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/game/player/EntityModel.gd b/game/player/EntityModel.gd index 80e4b364..6d003144 100644 --- a/game/player/EntityModel.gd +++ b/game/player/EntityModel.gd @@ -5,7 +5,7 @@ func _enter_tree(): while spat != null: if spat is Spatial: - transform *= (spat as Spatial).transform + transform = (spat as Spatial).transform * transform spat = spat.get_parent() diff --git a/game/scenes/Menu.tscn b/game/scenes/Menu.tscn index b4ecd911..99c60359 100644 --- a/game/scenes/Menu.tscn +++ b/game/scenes/Menu.tscn @@ -550,12 +550,13 @@ margin_bottom = 127.5 visible = false [node name="Char" type="Spatial" parent="."] -transform = Transform( 0.359313, 0, 0.933217, 0, 1, 0, -0.933217, 0, 0.359313, -2.44425, 6.02678, 0 ) +transform = Transform( 0.359313, 0, 0.933217, 0, 1, 0, -0.933217, 0, 0.359313, -2.44425, 2.36948, 0 ) [node name="CharacterDisplay" type="Spatial" parent="Char"] +transform = Transform( 1, 0, 0, 0, 0.990268, -0.139173, 0, 0.139173, 0.990268, 0, 0, 0 ) [node name="Camera" type="Camera" parent="Char"] -transform = Transform( 0.906006, -0.157589, 0.392835, 0.0104413, 0.936144, 0.351461, -0.423137, -0.314324, 0.849797, 0.300506, 1.57764, 2.14719 ) +transform = Transform( 0.907555, -0.0761571, 0.41297, 0.0262364, 0.99178, 0.125239, -0.419113, -0.102827, 0.902093, 0.324024, 1.1984, 2.19226 ) current = true [node name="World" type="VoxelWorld" parent="." groups=[ @@ -565,7 +566,7 @@ use_threads = false max_concurrent_generations = 1 library = ExtResource( 17 ) level_generator = SubResource( 1 ) -voxel_scale = 6.0 +voxel_scale = 3.0 chunk_spawn_range = 1 script = ExtResource( 16 ) show_loading_screen = false