From 3187c3d35940d5245282a6f73d42cb61d7cecbc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vojte=CC=8Cch=20Struha=CC=81r?= Date: Mon, 24 Feb 2025 17:14:12 +0100 Subject: [PATCH] Clean up debug prints + smooth bezier --- addons/portal_gizmos/gizmo.gd | 11 ++--------- forward_pointer.gd | 12 ------------ forward_pointer.gd.uid | 1 - forward_pointer.tscn | 19 ------------------- levels/level_3_rooms.tscn | 7 +------ 5 files changed, 3 insertions(+), 47 deletions(-) delete mode 100644 forward_pointer.gd delete mode 100644 forward_pointer.gd.uid delete mode 100644 forward_pointer.tscn diff --git a/addons/portal_gizmos/gizmo.gd b/addons/portal_gizmos/gizmo.gd index 29ee077..aca26ba 100644 --- a/addons/portal_gizmos/gizmo.gd +++ b/addons/portal_gizmos/gizmo.gd @@ -4,7 +4,6 @@ extends EditorNode3DGizmoPlugin func _init(): print("[gizmo] _init") create_material("main", Color(1,0,1), false, true, false) - create_material("secondary", Color(1,0,0)) func _get_gizmo_name() -> String: @@ -13,25 +12,20 @@ func _get_gizmo_name() -> String: func _has_gizmo(for_node_3d: Node3D) -> bool: var result: bool = for_node_3d is Portal - if result: print("[gizmo] _has_gizmo: " + for_node_3d.name) return result func _redraw(gizmo): var portal = gizmo.get_node_3d() as Portal - print("[gizmo] _redraw: " + portal.name) gizmo.clear() # Always clear the gizmo if portal not in EditorInterface.get_selection().get_selected_nodes(): return # If not selected, don't draw anything - - + var lines = PackedVector3Array() - if portal.exit_portal != null: - print("[gizmo] Drawing the bezier") # Draw a bezier curve connecting the two portals var exit = portal.exit_portal var D = portal.global_position.distance_to(exit.global_position) @@ -59,10 +53,9 @@ func _redraw(gizmo): + pow(t, 3) * p3 lines.push_back(spline_pos) + lines.push_back(spline_pos) lines.push_back(p3) - - gizmo.add_lines(PackedVector3Array([p0, p3, p1, p2]), get_material("secondary", gizmo)) #var handles = PackedVector3Array() #handles.push_back(Vector3(0, 1, 0)) diff --git a/forward_pointer.gd b/forward_pointer.gd deleted file mode 100644 index 6dcfa59..0000000 --- a/forward_pointer.gd +++ /dev/null @@ -1,12 +0,0 @@ -@tool -extends Node - - -@onready var indicator: MeshInstance3D = $Indicator - - -func _process(delta: float) -> void: - var p = get_parent() as Node3D - if p: - indicator.global_position = p.global_position - indicator.global_position -= p.global_transform.basis.z diff --git a/forward_pointer.gd.uid b/forward_pointer.gd.uid deleted file mode 100644 index a80f818..0000000 --- a/forward_pointer.gd.uid +++ /dev/null @@ -1 +0,0 @@ -uid://cls46uawo3qq diff --git a/forward_pointer.tscn b/forward_pointer.tscn deleted file mode 100644 index 8869feb..0000000 --- a/forward_pointer.tscn +++ /dev/null @@ -1,19 +0,0 @@ -[gd_scene load_steps=4 format=3 uid="uid://b3igtxttykf7i"] - -[ext_resource type="Script" uid="uid://cls46uawo3qq" path="res://forward_pointer.gd" id="1_cde0p"] - -[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_anedn"] -albedo_color = Color(1, 0, 1, 1) -emission_enabled = true -emission = Color(0.425891, 0.000125429, 0.425888, 1) - -[sub_resource type="SphereMesh" id="SphereMesh_n0wat"] -material = SubResource("StandardMaterial3D_anedn") -radius = 0.25 -height = 0.5 - -[node name="ForwardPointer" type="Node"] -script = ExtResource("1_cde0p") - -[node name="Indicator" type="MeshInstance3D" parent="."] -mesh = SubResource("SphereMesh_n0wat") diff --git a/levels/level_3_rooms.tscn b/levels/level_3_rooms.tscn index 86c0c40..cfafe45 100644 --- a/levels/level_3_rooms.tscn +++ b/levels/level_3_rooms.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=13 format=3 uid="uid://27pb62xwsqd8"] +[gd_scene load_steps=12 format=3 uid="uid://27pb62xwsqd8"] [ext_resource type="PackedScene" uid="uid://b5x7fmpwck335" path="res://hud.tscn" id="1_mmt1i"] [ext_resource type="MeshLibrary" uid="uid://bedqgubx1g1uf" path="res://prototypes.tres" id="2_vdsn8"] @@ -6,7 +6,6 @@ [ext_resource type="Script" uid="uid://d2bvvjsibau8c" path="res://addons/simple-portal-system/scripts/portal.gd" id="4_top28"] [ext_resource type="Script" uid="uid://bkv7t4hw21byg" path="res://addons/simple-portal-system/scripts/simple_portal_teleport.gd" id="5_evjit"] [ext_resource type="PackedScene" uid="uid://cgdlowfuuorvi" path="res://player.tscn" id="6_hlt8e"] -[ext_resource type="PackedScene" uid="uid://b3igtxttykf7i" path="res://forward_pointer.tscn" id="6_vdsn8"] [ext_resource type="Script" uid="uid://cili3lyodjqel" path="res://portal_environment_adapter.gd" id="7_2gewm"] [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_b0o0q"] @@ -62,8 +61,6 @@ script = ExtResource("5_evjit") transform = Transform3D(1, 0, 4.72511e-13, 0, 1, 0, -4.72511e-13, 0, 1, 0, 0, -0.250244) shape = SubResource("BoxShape3D_cgnft") -[node name="ForwardPointer" parent="Portal_red" instance=ExtResource("6_vdsn8")] - [node name="Portal_orange" type="MeshInstance3D" parent="." node_paths=PackedStringArray("exit_portal")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3, 2, -0.5) mesh = ExtResource("3_c4jka") @@ -83,8 +80,6 @@ script = ExtResource("5_evjit") transform = Transform3D(1, 0, 4.72511e-13, 0, 1, 0, -4.72511e-13, 0, 1, 0, 0, -0.250244) shape = SubResource("BoxShape3D_cgnft") -[node name="ForwardPointer" parent="Portal_orange" instance=ExtResource("6_vdsn8")] - [node name="Player" parent="." instance=ExtResource("6_hlt8e")] transform = Transform3D(0.727006, 0, 0.686631, 0, 1, 0, -0.686631, 0, 0.727006, 4.51826, 1.08552, 4.0716)