diff options
| -rw-r--r-- | prefab/spinner.tscn | 10 | ||||
| -rw-r--r-- | scripts/level_gen.gd | 2 | ||||
| -rw-r--r-- | scripts/player.gd | 1 | ||||
| -rw-r--r-- | scripts/spinner.gd | 29 |
4 files changed, 25 insertions, 17 deletions
diff --git a/prefab/spinner.tscn b/prefab/spinner.tscn index 321f17b..726b25c 100644 --- a/prefab/spinner.tscn +++ b/prefab/spinner.tscn @@ -1,13 +1,9 @@ [gd_scene load_steps=3 format=3 uid="uid://dup2mu8b8rpo3"] [ext_resource type="Script" path="res://scripts/spinner.gd" id="1_fvki0"] +[ext_resource type="PackedScene" uid="uid://cy44cmw1wn862" path="res://prefab/seed.tscn" id="2_fybqi"] -[sub_resource type="PlaceholderTexture2D" id="PlaceholderTexture2D_xcdpq"] -size = Vector2(256, 256) - -[node name="spinner" type="Node3D"] +[node name="Spinner" type="Node3D"] script = ExtResource("1_fvki0") -[node name="dude" type="Sprite3D" parent="."] -billboard = 1 -texture = SubResource("PlaceholderTexture2D_xcdpq") +[node name="Seed" parent="." instance=ExtResource("2_fybqi")] diff --git a/scripts/level_gen.gd b/scripts/level_gen.gd index 0a171d0..0300817 100644 --- a/scripts/level_gen.gd +++ b/scripts/level_gen.gd @@ -168,11 +168,13 @@ func _ready(): var num_rocks = random.randi_range(5, 15) var seed_tree_prefab = preload("res://prefab/tree_seed.tscn") + var spinner_prefab = preload("res://prefab/spinner.tscn") place_objects(num_trees, tree_prefab) place_objects(num_rocks, rock_prefab) place_objects(5, seed_tree_prefab) + place_objects(3, spinner_prefab) # Called every frame. 'delta' is the elapsed time since the previous frame. func _process(_delta): diff --git a/scripts/player.gd b/scripts/player.gd index 247f5ec..f0886ef 100644 --- a/scripts/player.gd +++ b/scripts/player.gd @@ -38,6 +38,7 @@ func pickup(): var node = current_node node.get_parent().remove_child(node) node.queue_free() + elif holding == null: holding = current_node current_node.get_parent().remove_child(current_node) diff --git a/scripts/spinner.gd b/scripts/spinner.gd index ffeebd7..370518d 100644 --- a/scripts/spinner.gd +++ b/scripts/spinner.gd @@ -1,19 +1,28 @@ extends Node3D - -var positions = [ - Vector3(-1, 0, -1), - Vector3( 1, 0, -1), - Vector3( 1, 0, 1), - Vector3(-1, 0, 1), -] +const SPEED: float = 2.0 +const RADIUS: float = 5.0 +var seed_pos: Vector3 = Vector3(RADIUS, 0, 0) # Called when the node enters the scene tree for the first time. func _ready(): pass # Replace with function body. - # Called every frame. 'delta' is the elapsed time since the previous frame. func _process(delta): - $dude.transform() - pass + if get_node_or_null("Seed") == null: + get_parent().remove_child(self) + queue_free() + return + + seed_pos = seed_pos.rotated(Vector3(0, 1, 0), SPEED*delta) + var real_pos = global_position + seed_pos + var space = get_world_3d().direct_space_state + var cast_pos = Vector3(real_pos.x, 100, real_pos.z) + var cast_dest = Vector3(cast_pos.x, 0, cast_pos.z) + var query = PhysicsRayQueryParameters3D.create(cast_pos, cast_dest) + query.collision_mask = 0b1 + var result = space.intersect_ray(query) + + if result: + $Seed.position = result.position - global_position |