Bladeren bron

Remove tween

DricomDragon 5 jaren geleden
bovenliggende
commit
d852357f54
3 gewijzigde bestanden met toevoegingen van 4 en 33 verwijderingen
  1. 0 14
      CharTween.gd
  2. 1 5
      Game.tscn
  3. 3 14
      Player.gd

+ 0 - 14
CharTween.gd

@@ -1,14 +0,0 @@
-extends Tween
-
-# Called when the node enters the scene tree for the first time.
-func _ready():
-	pass # Replace with function body.
-
-func connect_into(o):
-	connect("tween_completed", o, "_on_tween_completed")
-	pass
-
-func move_char(c, t_pos):
-	interpolate_property(c, "position", c.get_position(), t_pos, 0.75, Tween.TRANS_LINEAR, Tween.EASE_IN)
-	start()
-	pass

+ 1 - 5
Game.tscn

@@ -1,9 +1,8 @@
-[gd_scene load_steps=8 format=2]
+[gd_scene load_steps=7 format=2]
 
 [ext_resource path="res://basic.png" type="Texture" id=1]
 [ext_resource path="res://Player.gd" type="Script" id=2]
 [ext_resource path="res://player.png" type="Texture" id=3]
-[ext_resource path="res://CharTween.gd" type="Script" id=4]
 [ext_resource path="res://Obstacle.tscn" type="PackedScene" id=5]
 
 [sub_resource type="TileSet" id=1]
@@ -52,9 +51,6 @@ __meta__ = {
 "_edit_lock_": true
 }
 
-[node name="Tween" type="Tween" parent="Grid/Player"]
-script = ExtResource( 4 )
-
 [node name="CollisionShape2D" type="CollisionShape2D" parent="Grid/Player"]
 shape = SubResource( 2 )
 __meta__ = {

+ 3 - 14
Player.gd

@@ -8,9 +8,6 @@ const DEG_LEFT = 270
 
 var grid
 
-var is_moving = false
-var tween
-var target_pos = Vector2()
 var blocks = []
 var is_blocked:bool = false
 export (NodePath) var rayU
@@ -22,8 +19,6 @@ var raycast
 func _ready():
 	grid = get_parent()
 	
-	tween = $Tween
-	tween.connect_into(self)
 	turn(Vector2(0,1))
 	pass
 
@@ -39,18 +34,12 @@ func _physics_process(delta):
 	elif Input.is_action_pressed("ui_right"):
 		direction.x += 1
 	
-	if !is_moving and direction != Vector2():
+	if direction != Vector2():
 		
 		turn(direction)
 		
 		if !raycast.is_colliding():
-			target_pos = get_position() + direction * grid.get_cell_size()
-			tween.move_char(self, target_pos)
-			is_moving = true
-	pass
-	
-func _on_tween_completed(o, k):
-	is_moving = false
+			position = get_position() + direction * grid.get_cell_size()
 	pass
 
 func _on_area_entered(a):
@@ -74,4 +63,4 @@ func turn(dir:Vector2):
 		raycast=get_node(rayR)
 	else:
 		raycast=get_node(rayD)
-	pass
+	pass