Merge branch 'master' of github.com:unfa/jam-01 into master

godot4-port
unfa 2020-09-26 01:07:14 +02:00
commit 6cc02549a6
2 changed files with 8 additions and 8 deletions

View File

@ -53,9 +53,13 @@ func gravity():
if not is_on_floor():
self.velocity.y -= GRAVITY
func get_closest_point(A: Vector3, B: Vector3):
func get_closest_point(_A: Vector3, _B: Vector3):
var A = transform.inverse().xform(_A)
var B = transform.inverse().xform(_B)
var diff = B - A
return A - (A.dot(diff) * diff) / (diff.length_squared())
var result = A - (A.dot(diff) * diff) / (diff.length_squared())
return result.xform(transform)
remote func walk(direction: Vector2):

View File

@ -77,9 +77,9 @@ anchor_top = 0.5
anchor_right = 0.5
anchor_bottom = 0.5
margin_left = -511.401
margin_top = -301.225
margin_top = -300.757
margin_right = 512.599
margin_bottom = 298.775
margin_bottom = 299.243
__meta__ = {
"_edit_use_anchors_": false
}
@ -150,7 +150,6 @@ margin_top = -1.0
margin_right = 16.0
margin_bottom = 1.0
rect_rotation = 45.3067
rect_scale = Vector2( 1, 0.5 )
rect_pivot_offset = Vector2( -8, 1 )
__meta__ = {
"_edit_use_anchors_": false
@ -162,7 +161,6 @@ margin_top = -1.0
margin_right = 16.0
margin_bottom = 1.0
rect_rotation = 135.307
rect_scale = Vector2( 1, 0.5 )
rect_pivot_offset = Vector2( -8, 1 )
__meta__ = {
"_edit_use_anchors_": false
@ -174,7 +172,6 @@ margin_top = -1.0
margin_right = 16.0
margin_bottom = 1.0
rect_rotation = 225.306
rect_scale = Vector2( 1, 0.5 )
rect_pivot_offset = Vector2( -8, 1 )
__meta__ = {
"_edit_use_anchors_": false
@ -186,7 +183,6 @@ margin_top = -1.0
margin_right = 16.0
margin_bottom = 1.0
rect_rotation = -44.6931
rect_scale = Vector2( 1, 0.5 )
rect_pivot_offset = Vector2( -8, 1 )
__meta__ = {
"_edit_use_anchors_": false