Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated gdscript code to reflect proto changes. #233

Merged
merged 10 commits into from
Dec 29, 2023
Merged

Updated gdscript code to reflect proto changes. #233

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
33c496e
Updated generated code to reflect proto changes. Slight change to vis…
klingbolt Nov 18, 2023
0d1ed2a
Reworked Icon and Path nodes to be children on Category nodes
klingbolt Nov 29, 2023
f1dc817
Change how children into arrays of categorized nodes
klingbolt Dec 1, 2023
7a287a2
Added class CategoryData to hold refrences to 3d and 2d trees inside …
klingbolt Dec 11, 2023
6548c34
Removed unused code
klingbolt Dec 11, 2023
6082ac9
addressing comments
klingbolt Dec 15, 2023
6af7877
Forgot to save in Godot
klingbolt Dec 15, 2023
cc1e225
Removing node from scene
klingbolt Dec 15, 2023
ce3d01e
Changed variable names of marker collections. Addressed other comments
klingbolt Dec 21, 2023
2dcb0f4
Missed some changes
klingbolt Dec 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Icon.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ const Waypoint = preload("res://waypoint.gd")

var texture_path
var waypoint: Waypoint.Icon
var category: TreeItem
AsherGlick marked this conversation as resolved.
Show resolved Hide resolved

func set_icon_image(texture_path: String):
self.texture_path = texture_path
Expand Down
1 change: 1 addition & 0 deletions Route.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ const Waypoint = preload("res://waypoint.gd")
var texture_path
var color = Color(0.9, 0.1, 0.1)
var waypoint: Waypoint.Trail
var category: TreeItem

var point_list := PoolVector3Array()

Expand Down
6 changes: 4 additions & 2 deletions Spatial.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -502,7 +502,7 @@ func _waypoint_categories_to_godot_nodes(item: TreeItem, category, full_category
category_item.set_metadata(0, "")
print("Category found with no name.")
return
category_item.set_text(0, category.get_display_name())
category_item.set_text(0, category.get_name())
category_item.set_metadata(0, full_category_name)
category_item.set_cell_mode(1, TreeItem.CELL_MODE_CHECK)
category_item.set_checked(1, Settings.local_category_data.get(full_category_name, {}).get("checked", false))
Expand Down Expand Up @@ -564,7 +564,7 @@ func populate_update_dict(category_item: TreeItem, category_visibility_data):
#Updates the visibilty of a node and all children.
func update_node_visibility(cateogry_data, nodes):
for node in nodes.get_children():
var node_name = node.waypoint.get_category().get_name()
var node_name = node.category.get_metadata(0)
if node_name in cateogry_data:
if cateogry_data[node_name]:
node.visible = true
Expand Down Expand Up @@ -616,6 +616,7 @@ func gen_new_path(points: Array, texture_path: String, waypoint_trail, category_
new_route.create_mesh(points_3d)
new_route.set_texture(texture)
new_route.waypoint = waypoint_trail
new_route.category = category_item
if category_item != null:
new_route.visible = is_category_visible(category_item)
else:
Expand Down Expand Up @@ -643,6 +644,7 @@ func gen_new_icon(position: Vector3, texture_path: String, waypoint_icon, catego
new_icon.translation = position
new_icon.set_icon_image(texture_path)
new_icon.waypoint = waypoint_icon
new_icon.category = category_item
if category_item != null:
new_icon.visible = is_category_visible(category_item)
else:
Expand Down
Loading