Adds missing data

addons/cyclops_level_builder/tools/block_alignment.gd

@@ -0,0 +1,39 @@
+# MIT License
+#
+# Copyright (c) 2023 Mark McKay
+# https://github.com/blackears/cyclopsLevelBuilder
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+@tool
+class_name BlockAlignment
+
+enum Type { ALIGN_TO_SURFACE, XY_PLANE, XZ_PLANE, YZ_PLANE }
+
+static func get_plane_normal(type:Type)->Vector3:
+	match type:
+		BlockAlignment.Type.XY_PLANE:
+			return Vector3(0, 0, 1)
+		BlockAlignment.Type.XZ_PLANE:
+			return Vector3(0, 1, 0)
+		BlockAlignment.Type.YZ_PLANE:
+			return Vector3(1, 0, 0)
+		_:
+			return Vector3(0, 1, 0)
+			

addons/cyclops_level_builder/tools/cyclops_tool.gd

@@ -0,0 +1,189 @@
+# MIT License
+#
+# Copyright (c) 2023 Mark McKay
+# https://github.com/blackears/cyclopsLevelBuilder
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+@tool
+extends Resource
+class_name CyclopsTool
+
+var builder:CyclopsLevelBuilder
+
+#func _init(_editorPlugin:EditorPlugin):
+#	editorPlugin = _editorPlugin
+
+func _activate(builder:CyclopsLevelBuilder):
+	self.builder = builder
+	
+func _deactivate():
+	pass
+
+func _get_tool_id()->String:
+	return ""
+
+func _draw_tool(viewport_camera:Camera3D):
+	pass
+
+func _get_tool_properties_editor()->Control:
+	return null
+
+func _gui_input(viewport_camera:Camera3D, event:InputEvent)->bool:
+	if event is InputEventKey:
+		var e:InputEventKey = event
+
+		if e.keycode == KEY_X:
+			if e.is_pressed():
+				#print("cyc tool X")
+				var action:ActionDeleteSelectedBlocks = ActionDeleteSelectedBlocks.new(builder)
+				action._execute()
+			
+			return true
+				
+		if e.keycode == KEY_D:
+			if e.is_pressed():
+				if e.shift_pressed && !Input.is_mouse_button_pressed(MOUSE_BUTTON_RIGHT):
+					
+					var sel_blocks:Array[CyclopsBlock] = builder.get_selected_blocks()
+					if !sel_blocks.is_empty():
+											
+						builder.switch_to_tool(ToolDuplicate.new())
+					
+			return true
+	
+	if event is InputEventMouseButton:
+		var e:InputEventMouseButton = event
+		
+		if e.button_index == MOUSE_BUTTON_MIDDLE:
+			if e.alt_pressed:
+				if e.is_pressed():
+					if builder.get_active_block():
+
+						var origin:Vector3 = viewport_camera.project_ray_origin(e.position)
+						var dir:Vector3 = viewport_camera.project_ray_normal(e.position)
+						
+#						var start_pos:Vector3 = origin + builder.block_create_distance * dir
+#						var w2l = builder.active_node.global_transform.inverse()
+#						var origin_local:Vector3 = w2l * origin
+#						var dir_local:Vector3 = w2l.basis * dir
+						
+						var result:IntersectResults = builder.active_node.intersect_ray_closest(origin, dir)
+						if result:
+							var ed_iface:EditorInterface = builder.get_editor_interface()
+							var base_control:Control = ed_iface.get_base_control()
+							
+							#viewport_camera
+							var new_cam_origin:Vector3 = result.position + \
+								viewport_camera.global_transform.basis.z * builder.block_create_distance
+							viewport_camera.global_transform.origin = new_cam_origin
+					return true
+	
+	return false
+
+
+
+func to_local(point:Vector3, world_to_local:Transform3D, grid_step_size:float)->Vector3:
+	var p_local:Vector3 = world_to_local * point
+
+	return MathUtil.snap_to_grid(p_local, grid_step_size)
+	
+
+func calc_empty_space_draw_plane_origin(viewport_camera:Camera3D, draw_plane_point:Vector3 = Vector3.ZERO, draw_plane_normal:Vector3 = Vector3.UP):
+	var active_block:CyclopsBlock = builder.get_active_block()
+	var block_xfrom:Transform3D = active_block.global_transform
+	if active_block:
+		var vol:ConvexVolume = active_block.control_mesh
+		var bounds:AABB = vol.calc_bounds_xform(block_xfrom)
+		var plane:Plane = Plane(draw_plane_normal, bounds.get_center())
+		
+		var p0:Vector3 = bounds.position
+		var p1:Vector3 = bounds.position + bounds.size
+		if plane.is_point_over(viewport_camera.global_transform.origin):
+			if plane.is_point_over(p0):
+				draw_plane_point = p1
+			else:
+				draw_plane_point = p0
+		else:
+			if plane.is_point_over(p0):
+				draw_plane_point = p0
+			else:
+				draw_plane_point = p1
+				
+	return draw_plane_point
+
+func calc_hit_point_empty_space(origin:Vector3, dir:Vector3, viewport_camera:Camera3D = null, base_plane_origin:Vector3 = Vector3.ZERO, drag_floor_normal:Vector3 = Vector3.UP):
+		#print("Miss")
+		var drag_angle_limit:float = builder.get_global_scene().drag_angle_limit
+
+		var angle_y_axis:float = acos(dir.dot(Vector3.UP))
+		if angle_y_axis > PI / 2 - drag_angle_limit && angle_y_axis < PI / 2 + drag_angle_limit:
+			#Nearly parallel with ground plane
+			if abs(dir.z) > abs(dir.x):
+				drag_floor_normal = Vector3.FORWARD
+			else:
+				drag_floor_normal = Vector3.LEFT
+
+		#print("base_plane_normal ", base_plane_normal)
+
+		var hit_base:Vector3 = MathUtil.intersect_plane(origin, dir, base_plane_origin, drag_floor_normal)
+		#print("hit_base 1 ", hit_base)
+
+		if (hit_base - origin).dot(dir) < 0:
+			#Hit point is behind camera
+			var plane_offset:Vector3 = origin.project(drag_floor_normal)
+			base_plane_origin += plane_offset * 2
+			hit_base = MathUtil.intersect_plane(origin, dir, base_plane_origin, drag_floor_normal)
+
+		#print("base_plane_origin ", base_plane_origin)
+		#print("hit_base ", hit_base)
+
+		var block_drag_p0:Vector3 = builder.get_snapping_manager().snap_point(hit_base, SnappingQuery.new(viewport_camera))
+		
+		return [block_drag_p0, drag_floor_normal]
+
+func calc_active_block_orthogonal_height(plane_origin:Vector3, drag_floor_normal:Vector3)->float:
+	var active_block:CyclopsBlock = builder.get_active_block()
+	var block_bounds:AABB = active_block.control_mesh.calc_bounds_xform(active_block.global_transform)
+	var plane:Plane = Plane(drag_floor_normal, block_bounds.get_center())
+	var p0_over:bool = plane.is_point_over(plane_origin)
+
+	var height:float = abs(block_bounds.size.dot(drag_floor_normal))
+	if p0_over:
+		height = -height
+		
+	return height
+
+func select_block_under_cursor(viewport_camera:Camera3D, mouse_pos:Vector2):
+	var origin:Vector3 = viewport_camera.project_ray_origin(mouse_pos)
+	var dir:Vector3 = viewport_camera.project_ray_normal(mouse_pos)
+
+	var result:IntersectResults = builder.intersect_ray_closest(origin, dir)
+	if result:
+		var cmd:CommandSelectBlocks = CommandSelectBlocks.new()
+		cmd.builder = builder
+		cmd.block_paths.append(result.object.get_path())
+		
+		if cmd.will_change_anything():
+			var undo:EditorUndoRedoManager = builder.get_undo_redo()
+			cmd.add_to_undo_manager(undo)
+			
+			_deactivate()
+			_activate(builder)
+	

addons/cyclops_level_builder/tools/gizmos/gizmo_base.gd

@@ -0,0 +1,92 @@
+# MIT License
+#
+# Copyright (c) 2023 Mark McKay
+# https://github.com/blackears/cyclopsLevelBuilder
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+
+@tool
+extends Node3D
+class_name GizmoBase
+
+
+# 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):
+	pass
+
+
+func intersect_part(ray_origin:Vector3, ray_dir:Vector3, viewport_camera:Camera3D, mesh_inst:MeshInstance3D)->MathUtil.IntersectTriangleResult:
+	var proj:Projection = viewport_camera.get_camera_projection()
+	
+	#Calc modelview matrix
+	var view_inv_matrix:Transform3D = viewport_camera.global_transform.affine_inverse()
+	var mv:Projection = Projection(view_inv_matrix * mesh_inst.global_transform)
+	#Static size adjustment
+	if proj[3][3] != 0:
+		var h:float = abs(1 / (2 * proj[1][1]))
+		var sc = h * 2
+		mv[0] *= sc
+		mv[1] *= sc
+		mv[2] *= sc
+	else:
+		var sc:float = -mv[3].z
+		mv[0] *= sc
+		mv[1] *= sc
+		mv[2] *= sc
+	
+	var model_mtx:Projection = Projection(viewport_camera.global_transform) * mv
+
+	var mesh:Mesh = mesh_inst.mesh
+	var tris:PackedVector3Array = mesh.get_faces()
+	for i in range(0, tris.size(), 3):
+		var p0:Vector3 = tris[i]
+		var p1:Vector3 = tris[i + 1]
+		var p2:Vector3 = tris[i + 2]
+		
+		var p0_t:Vector3 = proj_mul_point(model_mtx, p0)
+		var p1_t:Vector3 = proj_mul_point(model_mtx, p1)
+		var p2_t:Vector3 = proj_mul_point(model_mtx, p2)
+		
+		#print("tri world %s %s %s" % [p0_t, p1_t, p2_t])
+		var res = MathUtil.intersect_triangle(ray_origin, ray_dir, p0_t, p1_t, p2_t)
+		
+		if res:
+			return res
+		
+	return null
+	
+
+func proj_mul_point(m:Projection, p:Vector3)->Vector3:
+	var p4:Vector4 = Vector4(p.x, p.y, p.z, 1)
+	var p4_t = m * p4
+	p4_t /= p4_t.w
+	return Vector3(p4_t.x, p4_t.y, p4_t.z)
+
+
+func proj_mul_vec(m:Projection, p:Vector3)->Vector3:
+	var p4:Vector4 = Vector4(p.x, p.y, p.z, 0)
+	var p4_t = m * p4
+	p4_t /= p4_t.w
+	return Vector3(p4_t.x, p4_t.y, p4_t.z)

addons/cyclops_level_builder/tools/gizmos/gizmo_rotate.gd

@@ -0,0 +1,72 @@
+# MIT License
+#
+# Copyright (c) 2023 Mark McKay
+# https://github.com/blackears/cyclopsLevelBuilder
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+
+@tool
+extends GizmoBase
+class_name GizmoRotate
+
+enum Part { NONE, PLANE_XY, PLANE_XZ, PLANE_YZ, VIEWPORT, TRACKBALL }
+
+
+class IntersectResult:
+	var part:Part
+	var pos_world:Vector3
+	
+	
+# Called when the node enters the scene tree for the first time.
+func _ready():
+	$gizmo_rotate/rot_axis_viewport.visible = false
+	pass # Replace with function body.
+
+
+# Called every frame. 'delta' is the elapsed time since the previous frame.
+func _process(delta):
+	get_viewport()
+	pass
+
+
+func intersect(ray_origin:Vector3, ray_dir:Vector3, viewport_camera:Camera3D)->IntersectResult:
+	var result:IntersectResult = IntersectResult.new()
+	result.part = Part.NONE
+
+	for child in $gizmo_rotate.get_children():
+		var part_res:MathUtil.IntersectTriangleResult = intersect_part(ray_origin, ray_dir, viewport_camera, child)
+		
+		if part_res:
+			result.pos_world = part_res.position
+			match child.name:
+				"rot_axis_x":
+					result.part = Part.PLANE_YZ
+				"rot_axis_y":
+					result.part = Part.PLANE_XZ
+				"rot_axis_z":
+					result.part = Part.PLANE_XY
+					
+			return result
+#			print("hit " + child.name)
+#			return
+	
+	return null
+
+

addons/cyclops_level_builder/tools/gizmos/gizmo_rotate.tscn

@@ -0,0 +1,37 @@
+[gd_scene load_steps=7 format=3 uid="uid://cyi4s4loi2i15"]
+
+[ext_resource type="PackedScene" uid="uid://p26cj0m5amq0" path="res://addons/cyclops_level_builder/art/gizmos/gizmo_rotate.glb" id="1_knqem"]
+[ext_resource type="Script" path="res://addons/cyclops_level_builder/tools/gizmos/gizmo_rotate.gd" id="1_vhpbh"]
+[ext_resource type="Material" uid="uid://bv4k8o22vl6ub" path="res://addons/cyclops_level_builder/materials/gizmo_axis_y_material.tres" id="2_538x0"]
+[ext_resource type="Material" uid="uid://drodm0wf41vin" path="res://addons/cyclops_level_builder/materials/gizmo_axis_x_material.tres" id="3_7q6t6"]
+[ext_resource type="Material" uid="uid://divsg4lq712rw" path="res://addons/cyclops_level_builder/materials/gizmo_axis_z_material.tres" id="4_eibo1"]
+[ext_resource type="Material" uid="uid://cqvh1j2n71fej" path="res://addons/cyclops_level_builder/materials/gizmo_axis_special_material.tres" id="5_ib271"]
+
+[node name="GizmoRotate" type="Node3D"]
+script = ExtResource("1_vhpbh")
+
+[node name="gizmo_rotate" parent="." instance=ExtResource("1_knqem")]
+transform = Transform3D(0.2, 0, 0, 0, 0.2, 0, 0, 0, 0.2, 0, 0, 0)
+
+[node name="rot_axis_y" parent="gizmo_rotate" index="0"]
+lod_bias = 128.0
+ignore_occlusion_culling = true
+surface_material_override/0 = ExtResource("2_538x0")
+
+[node name="rot_axis_x" parent="gizmo_rotate" index="1"]
+lod_bias = 128.0
+ignore_occlusion_culling = true
+surface_material_override/0 = ExtResource("3_7q6t6")
+
+[node name="rot_axis_z" parent="gizmo_rotate" index="2"]
+lod_bias = 128.0
+ignore_occlusion_culling = true
+surface_material_override/0 = ExtResource("4_eibo1")
+
+[node name="rot_axis_viewport" parent="gizmo_rotate" index="3"]
+visible = false
+lod_bias = 128.0
+ignore_occlusion_culling = true
+surface_material_override/0 = ExtResource("5_ib271")
+
+[editable path="gizmo_rotate"]

addons/cyclops_level_builder/tools/gizmos/gizmo_test.gd

@@ -0,0 +1,23 @@
+extends Node3D
+
+func _input(event):
+	if event is InputEventMouseButton:
+		var e:InputEventMouseButton = event
+		
+		if e.is_pressed():
+	
+			var cam:Camera3D = %Camera3D
+			var ray_norm:Vector3 = cam.project_ray_normal(e.position)
+			var ray_orig:Vector3 = cam.project_ray_origin(e.position)
+			%gizmo_translate.intersect(ray_orig, ray_norm, cam)
+	
+	pass
+
+# 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):
+	pass

addons/cyclops_level_builder/tools/gizmos/gizmo_test.tscn

@@ -0,0 +1,37 @@
+[gd_scene load_steps=4 format=3 uid="uid://bykffnaq3h1ar"]
+
+[ext_resource type="Script" path="res://addons/cyclops_level_builder/tools/gizmos/gizmo_test.gd" id="1_0e45b"]
+[ext_resource type="PackedScene" uid="uid://2pi622xycrd6" path="res://addons/cyclops_level_builder/tools/gizmos/gizmo_translate.tscn" id="2_2n1ok"]
+
+[sub_resource type="SphereMesh" id="SphereMesh_off5f"]
+radius = 0.02
+height = 0.04
+
+[node name="gizmo_test" type="Node3D"]
+script = ExtResource("1_0e45b")
+
+[node name="gizmo_translate" parent="." instance=ExtResource("2_2n1ok")]
+unique_name_in_owner = true
+
+[node name="Camera3D" type="Camera3D" parent="."]
+unique_name_in_owner = true
+transform = Transform3D(0.930759, 0.202432, -0.30448, -0.0272565, 0.868848, 0.494329, 0.364615, -0.451802, 0.814206, -0.279477, 1.02398, 1.38375)
+
+[node name="MeshInstance3D" type="MeshInstance3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.126, 0, 0.266)
+mesh = SubResource("SphereMesh_off5f")
+
+[node name="MeshInstance3D2" type="MeshInstance3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.266, 0, 0.126)
+mesh = SubResource("SphereMesh_off5f")
+
+[node name="MeshInstance3D3" type="MeshInstance3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.266, 0, 0.266)
+mesh = SubResource("SphereMesh_off5f")
+
+[node name="MeshInstance3D4" type="MeshInstance3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.126, 0, 0.126)
+mesh = SubResource("SphereMesh_off5f")
+
+[editable path="gizmo_translate"]
+[editable path="gizmo_translate/gizmo_translate"]

addons/cyclops_level_builder/tools/gizmos/gizmo_translate.gd

@@ -0,0 +1,73 @@
+# MIT License
+#
+# Copyright (c) 2023 Mark McKay
+# https://github.com/blackears/cyclopsLevelBuilder
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+
+@tool
+extends GizmoBase
+class_name GizmoTranslate
+
+enum Part { NONE, AXIS_X, AXIS_Y, AXIS_Z, PLANE_XY, PLANE_XZ, PLANE_YZ }
+
+# 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):
+	pass
+
+class IntersectResult:
+	var part:Part
+	var pos_world:Vector3
+
+func intersect(ray_origin:Vector3, ray_dir:Vector3, viewport_camera:Camera3D)->IntersectResult:
+	var result:IntersectResult = IntersectResult.new()
+	result.part = Part.NONE
+#	if intersect_part(ray_origin, ray_dir, viewport_camera, $gizmo_translate/axis_y):
+	for child in $gizmo_translate.get_children():
+		var part_res:MathUtil.IntersectTriangleResult = intersect_part(ray_origin, ray_dir, viewport_camera, child)
+		
+		if part_res:
+			result.pos_world = part_res.position
+			match child.name:
+				"axis_x":
+					result.part = Part.AXIS_X
+				"axis_y":
+					result.part = Part.AXIS_Y
+				"axis_z":
+					result.part = Part.AXIS_Z
+				"plane_xy":
+					result.part = Part.PLANE_XY
+				"plane_xz":
+					result.part = Part.PLANE_XZ
+				"plane_yz":
+					result.part = Part.PLANE_YZ
+					
+			return result
+#			print("hit " + child.name)
+#			return
+	
+	return null
+
+	

addons/cyclops_level_builder/tools/gizmos/gizmo_translate.tscn

@@ -0,0 +1,45 @@
+[gd_scene load_steps=6 format=3 uid="uid://2pi622xycrd6"]
+
+[ext_resource type="Script" path="res://addons/cyclops_level_builder/tools/gizmos/gizmo_translate.gd" id="1_fyqe0"]
+[ext_resource type="PackedScene" uid="uid://ujq3kes2sdfu" path="res://addons/cyclops_level_builder/art/gizmos/gizmo_translate.glb" id="1_ljs46"]
+[ext_resource type="Material" uid="uid://bv4k8o22vl6ub" path="res://addons/cyclops_level_builder/materials/gizmo_axis_y_material.tres" id="3_tsii4"]
+[ext_resource type="Material" uid="uid://divsg4lq712rw" path="res://addons/cyclops_level_builder/materials/gizmo_axis_z_material.tres" id="4_0qd8v"]
+[ext_resource type="Material" uid="uid://drodm0wf41vin" path="res://addons/cyclops_level_builder/materials/gizmo_axis_x_material.tres" id="5_xvd3e"]
+
+[node name="gizmo_translate" type="Node3D"]
+script = ExtResource("1_fyqe0")
+
+[node name="gizmo_translate" parent="." instance=ExtResource("1_ljs46")]
+transform = Transform3D(0.2, 0, 0, 0, 0.2, 0, 0, 0, 0.2, 0, 0, 0)
+
+[node name="axis_y" parent="gizmo_translate" index="0"]
+lod_bias = 128.0
+ignore_occlusion_culling = true
+surface_material_override/0 = ExtResource("3_tsii4")
+
+[node name="axis_z" parent="gizmo_translate" index="1"]
+lod_bias = 128.0
+ignore_occlusion_culling = true
+surface_material_override/0 = ExtResource("4_0qd8v")
+
+[node name="axis_x" parent="gizmo_translate" index="2"]
+lod_bias = 128.0
+ignore_occlusion_culling = true
+surface_material_override/0 = ExtResource("5_xvd3e")
+
+[node name="plane_xz" parent="gizmo_translate" index="3"]
+lod_bias = 128.0
+ignore_occlusion_culling = true
+surface_material_override/0 = ExtResource("3_tsii4")
+
+[node name="plane_yz" parent="gizmo_translate" index="4"]
+lod_bias = 128.0
+ignore_occlusion_culling = true
+surface_material_override/0 = ExtResource("5_xvd3e")
+
+[node name="plane_xy" parent="gizmo_translate" index="5"]
+lod_bias = 128.0
+ignore_occlusion_culling = true
+surface_material_override/0 = ExtResource("4_0qd8v")
+
+[editable path="gizmo_translate"]

addons/cyclops_level_builder/tools/tool_block.gd

@@ -0,0 +1,360 @@
+# MIT License
+#
+# Copyright (c) 2023 Mark McKay
+# https://github.com/blackears/cyclopsLevelBuilder
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+@tool
+extends CyclopsTool
+class_name ToolBlock
+
+const TOOL_ID:String = "block"
+
+enum ToolState { NONE, READY, BLOCK_BASE, BLOCK_HEIGHT, MOVE_FACE }
+var tool_state:ToolState = ToolState.NONE
+
+#enum BlockAlign { ALIGN_TO_SURFACE, XY_PLANE, XZ_PLANE, YZ_PLANE }
+
+#var drag_angle_limit:float = deg_to_rad(5)
+
+var viewport_camera_start:Camera3D
+var event_start:InputEventMouseButton
+
+var block_drag_cur:Vector3
+var block_drag_p0:Vector3
+var block_drag_p1:Vector3
+var block_drag_p2:Vector3
+
+var drag_floor_normal:Vector3
+
+var settings:ToolBlockSettings = ToolBlockSettings.new()
+
+#Keep a copy of move command here while we are building it
+var cmd_move_face:CommandMoveFacePlanar
+var move_face_origin:Vector3 #Kep track of the origin when moving a face
+
+var base_points:PackedVector3Array
+
+var mouse_hover_pos:Vector2
+
+func _get_tool_id()->String:
+	return TOOL_ID
+
+func _get_tool_properties_editor()->Control:
+	var ed:ToolBlockSettingsEditor = preload("res://addons/cyclops_level_builder/tools/tool_block_settings_editor.tscn").instantiate()
+	
+	ed.settings = settings
+	
+	return ed
+
+func start_block_drag(viewport_camera:Camera3D, event:InputEvent):
+	var blocks_root:Node = builder.get_block_add_parent()
+	var e:InputEventMouseButton = event
+	
+	var origin:Vector3 = viewport_camera.project_ray_origin(e.position)
+	var dir:Vector3 = viewport_camera.project_ray_normal(e.position)
+
+	#print("origin %s  dir %s" % [origin, dir])
+
+	var result:IntersectResults = builder.intersect_ray_closest(origin, dir)
+	#print("result %s" % result)
+	
+	if result && settings.block_alignment == BlockAlignment.Type.ALIGN_TO_SURFACE:
+		#print("Hit! %s" % result)
+		drag_floor_normal = MathUtil.snap_to_best_axis_normal(result.get_world_normal())
+				
+		var start_pos:Vector3 = result.get_world_position()
+
+		#var grid_step_size:float = pow(2, builder.get_global_scene().grid_size)
+		#block_drag_p0 = MathUtil.snap_to_grid(start_pos, grid_step_size)
+
+		block_drag_p0 = builder.get_snapping_manager().snap_point(start_pos, SnappingQuery.new(viewport_camera))
+
+		
+		if e.ctrl_pressed:
+			tool_state = ToolState.MOVE_FACE
+			
+			cmd_move_face = CommandMoveFacePlanar.new()
+			cmd_move_face.builder = builder
+			cmd_move_face.blocks_root_path = builder.get_block_add_parent().get_path()
+			cmd_move_face.block_path = result.object.get_path()
+			cmd_move_face.face_index = result.face_index
+			cmd_move_face.lock_uvs = builder.lock_uvs
+			cmd_move_face.move_dir_normal = result.object.control_mesh.faces[result.face_id].normal
+
+			move_face_origin = result.object.global_transform * result.position
+			#print("moving face move_face_origin %s" % move_face_origin)
+			
+		else:
+			tool_state = ToolState.BLOCK_BASE
+
+		
+	else:
+		#print("Miss")
+		var draw_plane_point:Vector3 = Vector3.ZERO
+		var draw_plane_normal:Vector3 = BlockAlignment.get_plane_normal(settings.block_alignment)
+		
+		if settings.match_selected_block:
+			draw_plane_point = calc_empty_space_draw_plane_origin(viewport_camera, draw_plane_point, draw_plane_normal)
+			
+		var hit_result = calc_hit_point_empty_space(origin, dir, viewport_camera, draw_plane_point, draw_plane_normal)
+		block_drag_p0 = hit_result[0]
+		drag_floor_normal = hit_result[1]
+		
+		tool_state = ToolState.BLOCK_BASE
+
+func _draw_tool(viewport_camera:Camera3D):
+	var global_scene:CyclopsGlobalScene = builder.get_global_scene()
+	global_scene.clear_tool_mesh()
+	global_scene.draw_selected_blocks(viewport_camera)
+
+	if tool_state == ToolState.BLOCK_BASE:
+		global_scene.draw_loop(base_points, true, global_scene.tool_material)
+		global_scene.draw_points(base_points, global_scene.vertex_tool_material)
+		
+	if tool_state == ToolState.BLOCK_HEIGHT:
+		global_scene.draw_cube(block_drag_p0, block_drag_p1, block_drag_cur, global_scene.tool_material, global_scene.vertex_tool_material)
+
+
+func create_block():
+	block_drag_p2 = block_drag_cur
+#	print("Adding block %s %s %s" % [block_drag_p0, block_drag_p1, block_drag_p2])
+
+	var bounds:AABB = AABB(block_drag_p0, Vector3.ZERO)
+	bounds = bounds.expand(block_drag_p1)
+	bounds = bounds.expand(block_drag_p2)
+	
+	if bounds.has_volume():
+		var blocks_root:Node = builder.get_block_add_parent()
+	
+		var command:CommandAddBlock = CommandAddBlock.new()
+		
+		command.builder = builder
+		command.blocks_root_path = blocks_root.get_path()
+		command.block_name = GeneralUtil.find_unique_name(blocks_root, "Block_")						
+		command.bounds = bounds
+#						command.origin = block_drag_p0
+		command.uv_transform = builder.tool_uv_transform
+		command.material_path = builder.tool_material_path
+		command.collision_type = settings.collision_type
+		command.collision_layers = settings.collision_layer
+		command.collision_mask = settings.collision_mask
+
+		var undo:EditorUndoRedoManager = builder.get_undo_redo()
+
+		command.add_to_undo_manager(undo)
+
+
+func _gui_input(viewport_camera:Camera3D, event:InputEvent)->bool:
+	#print("tool_block gui_input %s" % event)
+	
+	var blocks_root:Node = builder.get_block_add_parent()
+
+	if event is InputEventKey:
+		var e:InputEventKey = event
+		
+		if e.keycode == KEY_ESCAPE:
+			if e.is_pressed():
+				tool_state = ToolState.NONE
+			return true
+		
+		if e.keycode == KEY_Q && e.alt_pressed:
+			if e.is_pressed():
+				select_block_under_cursor(viewport_camera, mouse_hover_pos)
+				#var origin:Vector3 = viewport_camera.project_ray_origin(mouse_hover_pos)
+				#var dir:Vector3 = viewport_camera.project_ray_normal(mouse_hover_pos)
+			#
+				#var result:IntersectResults = builder.intersect_ray_closest(origin, dir)
+				#if result:
+					#var cmd:CommandSelectBlocks = CommandSelectBlocks.new()
+					#cmd.builder = builder
+					#cmd.block_paths.append(result.object.get_path())
+					#
+					#if cmd.will_change_anything():
+						#var undo:EditorUndoRedoManager = builder.get_undo_redo()
+						#cmd.add_to_undo_manager(undo)
+						#
+						#_deactivate()
+						#_activate(builder)
+				
+			return true
+	
+	elif event is InputEventMouseButton:
+		
+		var e:InputEventMouseButton = event
+		if e.button_index == MOUSE_BUTTON_LEFT:
+
+			if e.is_pressed():
+				if tool_state == ToolState.NONE:
+					event_start = event
+					viewport_camera_start = viewport_camera
+					
+					tool_state = ToolState.READY
+				
+			else:
+				if tool_state == ToolState.READY:
+					
+					tool_state = ToolState.NONE
+					
+				elif tool_state == ToolState.BLOCK_BASE:
+					block_drag_p1 = block_drag_cur
+					
+					var camera_dir:Vector3 = viewport_camera.project_ray_normal(e.position)
+					var angle_with_base:float = acos(drag_floor_normal.dot(camera_dir))
+
+					var drag_angle_limit:float = builder.get_global_scene().drag_angle_limit
+
+					if angle_with_base < drag_angle_limit || angle_with_base > PI - drag_angle_limit:
+						var height = settings.default_block_height
+						if settings.match_selected_block:
+							height = calc_active_block_orthogonal_height(block_drag_p0, drag_floor_normal)
+							
+						block_drag_cur = block_drag_p1 + drag_floor_normal * height
+						
+						create_block()
+						
+						tool_state = ToolState.NONE
+					else:
+					
+						tool_state = ToolState.BLOCK_HEIGHT
+					
+				elif tool_state == ToolState.BLOCK_HEIGHT:
+					create_block()
+
+					tool_state = ToolState.NONE
+
+
+				elif tool_state == ToolState.MOVE_FACE:
+
+					var undo:EditorUndoRedoManager = builder.get_undo_redo()
+					cmd_move_face.add_to_undo_manager(undo)
+					
+					tool_state = ToolState.NONE			
+				
+			return true
+		
+		#elif e.button_index == MOUSE_BUTTON_RIGHT:
+			#if tool_state == ToolState.BLOCK_BASE || tool_state == ToolState.BLOCK_HEIGHT:
+				#if e.is_pressed():
+					#tool_state = ToolState.NONE
+				#return true
+			
+			
+	elif event is InputEventMouseMotion:
+		
+		var e:InputEventMouseMotion = event
+
+		mouse_hover_pos = e.position
+
+		var origin:Vector3 = viewport_camera.project_ray_origin(e.position)
+		var dir:Vector3 = viewport_camera.project_ray_normal(e.position)
+		
+		var start_pos:Vector3 = origin + builder.block_create_distance * dir
+		
+		#print("tool_state %s" % tool_state)
+		if (e.button_mask & MOUSE_BUTTON_MASK_MIDDLE):
+			return super._gui_input(viewport_camera, event)
+		
+		if tool_state == ToolState.NONE:
+			if e.ctrl_pressed:
+				#block_drag_cur = MathUtil.intersect_plane(origin_local, dir_local, block_drag_p0_local, drag_floor_normal)
+				var result:IntersectResults = builder.intersect_ray_closest(origin, dir)
+				#print("picked result %s" % result)
+				if result:
+					var block:CyclopsBlock = result.object
+					var convex_mesh:ConvexVolume = block.control_mesh
+					base_points = convex_mesh.get_face(result.face_index).get_points()
+					return true
+			
+			return false
+				
+		elif tool_state == ToolState.READY:
+			var offset:Vector2 = e.position - event_start.position
+			if offset.length_squared() > MathUtil.square(builder.drag_start_radius):
+				start_block_drag(viewport_camera_start, event_start)
+
+			return true
+				
+		elif tool_state == ToolState.BLOCK_BASE:
+
+			block_drag_cur = MathUtil.intersect_plane(origin, dir, block_drag_p0, drag_floor_normal)
+			
+			#print("block_drag_cur %s" % block_drag_cur)
+
+			block_drag_cur = builder.get_snapping_manager().snap_point(block_drag_cur, SnappingQuery.new(viewport_camera))
+
+			#print("block_drag_cur snapped %s" % block_drag_cur)
+			
+			#Draw tool
+			var p01:Vector3
+			var p10:Vector3
+			if abs(drag_floor_normal.x) > abs(drag_floor_normal.y) and abs(drag_floor_normal.x) > abs(drag_floor_normal.z):
+				p01 = Vector3(block_drag_p0.x, block_drag_p0.y, block_drag_cur.z)
+				p10 = Vector3(block_drag_p0.x, block_drag_cur.y, block_drag_p0.z)
+			elif abs(drag_floor_normal.y) > abs(drag_floor_normal.z):
+				p01 = Vector3(block_drag_p0.x, block_drag_p0.y, block_drag_cur.z)
+				p10 = Vector3(block_drag_cur.x, block_drag_p0.y, block_drag_p0.z)
+			else:
+				p01 = Vector3(block_drag_p0.x, block_drag_cur.y, block_drag_p0.z)
+				p10 = Vector3(block_drag_cur.x, block_drag_p0.y, block_drag_p0.z)
+
+			base_points = [block_drag_p0, p01, block_drag_cur, p10]
+
+			return true
+
+		elif tool_state == ToolState.BLOCK_HEIGHT:
+			block_drag_cur = MathUtil.closest_point_on_line(origin, dir, block_drag_p1, drag_floor_normal)
+			
+			block_drag_cur = builder.get_snapping_manager().snap_point(block_drag_cur, SnappingQuery.new(viewport_camera))
+
+			return true
+
+		elif tool_state == ToolState.MOVE_FACE:			
+			var drag_to:Vector3 = MathUtil.closest_point_on_line(origin, dir, move_face_origin, cmd_move_face.move_dir_normal)
+			#print("move_face_origin %s norm %s" % [move_face_origin, cmd_move_face.move_dir_normal])
+
+			drag_to = builder.get_snapping_manager().snap_point(drag_to, SnappingQuery.new(viewport_camera))
+			
+			#print("move_face drag_to %s" % [drag_to])
+			cmd_move_face.move_amount = (drag_to - move_face_origin).dot(cmd_move_face.move_dir_normal)
+			#print("move by %s" % [drag_to - move_face_origin])
+			
+			cmd_move_face.do_it_intermediate()
+		
+			return true
+	
+	return super._gui_input(viewport_camera, event)		
+
+
+func _activate(builder:CyclopsLevelBuilder):
+	super._activate(builder)
+	
+	builder.mode = CyclopsLevelBuilder.Mode.OBJECT
+	var global_scene:CyclopsGlobalScene = builder.get_global_scene()
+	global_scene.clear_tool_mesh()
+	
+	var cache:Dictionary = builder.get_tool_cache(TOOL_ID)
+	#print("loaded cache ", str(cache))
+	settings.load_from_cache(cache)
+
+func _deactivate():
+	var cache:Dictionary = settings.save_to_cache()
+	builder.set_tool_cache(TOOL_ID, cache)
+	

addons/cyclops_level_builder/tools/tool_block_settings.gd

@@ -0,0 +1,54 @@
+# MIT License
+#
+# Copyright (c) 2023 Mark McKay
+# https://github.com/blackears/cyclopsLevelBuilder
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+@tool
+extends Resource
+class_name ToolBlockSettings
+
+@export var block_alignment:BlockAlignment.Type = BlockAlignment.Type.ALIGN_TO_SURFACE
+@export var match_selected_block:bool = true
+@export var default_block_elevation:float = 0
+@export var default_block_height:float = 1
+@export var collision_type:Collision.Type = Collision.Type.STATIC
+@export_flags_3d_physics var collision_layer:int = 1
+@export_flags_3d_physics var collision_mask:int = 1
+
+func load_from_cache(cache:Dictionary):
+	block_alignment = cache.get("block_alignment", BlockAlignment.Type.ALIGN_TO_SURFACE)
+	match_selected_block = cache.get("match_selected_block", true)
+	default_block_elevation = cache.get("default_block_elevation", 0)
+	default_block_height = cache.get("default_block_height", 1)
+	collision_type = cache.get("collision_type", Collision.Type.STATIC)
+	collision_layer = cache.get("collision_layer", 1)
+	collision_mask = cache.get("collision_mask", 1)
+	
+func save_to_cache():
+	return {
+		"block_alignment": block_alignment,
+		"match_selected_block": match_selected_block,
+		"default_block_elevation": default_block_elevation,
+		"default_block_height": default_block_height,
+		"collision_type": collision_type,
+		"collision_layer": collision_layer,
+		"collision_mask": collision_mask,
+	}

addons/cyclops_level_builder/tools/tool_block_settings_editor.gd

@@ -0,0 +1,92 @@
+# MIT License
+#
+# Copyright (c) 2023 Mark McKay
+# https://github.com/blackears/cyclopsLevelBuilder
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+@tool
+extends PanelContainer
+class_name ToolBlockSettingsEditor
+
+var settings:ToolBlockSettings:
+	get:
+		return settings
+	set(value):
+		settings = value
+		dirty = true
+
+var dirty:bool = true
+
+func _ready():
+	%collision_type.clear()
+	for text in Collision.Type.keys():
+		%collision_type.add_item(text)
+
+func _process(delta):
+	if dirty:
+		update()
+		dirty = false
+
+func update():
+	if !settings:
+		%check_match_selected_block.disabled = true
+		%default_block_elevation.disabled = true
+		%default_block_height.disabled = true
+		return
+
+	%check_match_selected_block.disabled = false
+	%check_match_selected_block.button_pressed = settings.match_selected_block
+	%default_block_elevation.disabled = false
+	%default_block_elevation.value = settings.default_block_elevation
+	%default_block_height.disabled = false
+	%default_block_height.value = settings.default_block_height
+	
+	%alignment_type.selected = settings.block_alignment
+	
+	%collision_type.selected = settings.collision_type
+	%collision_layers.value = settings.collision_layer
+	%collision_mask.value = settings.collision_mask
+
+
+func _on_default_block_height_value_changed(value:float):
+	settings.default_block_height = value
+
+
+func _on_default_block_elevation_value_changed(value:float):
+	settings.default_block_elevation = value
+
+
+func _on_check_match_selected_block_toggled(value:bool):
+	settings.match_selected_block = value
+
+
+func _on_collision_layers_value_changed(value):
+	settings.collision_layer = value
+
+
+func _on_collision_mask_value_changed(value):
+	settings.collision_mask = value
+
+func _on_collision_type_item_selected(index):
+	settings.collision_type = index
+
+
+func _on_alignment_type_item_selected(index):
+	settings.block_alignment = index

addons/cyclops_level_builder/tools/tool_block_settings_editor.tscn

@@ -0,0 +1,132 @@
+[gd_scene load_steps=3 format=3 uid="uid://baccfnd0b5yqv"]
+
+[ext_resource type="Script" path="res://addons/cyclops_level_builder/tools/tool_block_settings_editor.gd" id="1_nvmrk"]
+[ext_resource type="PackedScene" uid="uid://diibmlqy1mpqb" path="res://addons/cyclops_level_builder/controls/numeric_line_edit.tscn" id="2_1r7f8"]
+
+[node name="ToolBlockSettings" type="PanelContainer"]
+offset_right = 413.0
+offset_bottom = 232.0
+script = ExtResource("1_nvmrk")
+
+[node name="PanelContainer" type="PanelContainer" parent="."]
+layout_mode = 2
+
+[node name="VBoxContainer" type="VBoxContainer" parent="PanelContainer"]
+layout_mode = 2
+
+[node name="GridContainer" type="GridContainer" parent="PanelContainer/VBoxContainer"]
+layout_mode = 2
+columns = 2
+
+[node name="Label" type="Label" parent="PanelContainer/VBoxContainer/GridContainer"]
+layout_mode = 2
+text = "Collision Type"
+
+[node name="collision_type" type="OptionButton" parent="PanelContainer/VBoxContainer/GridContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+item_count = 4
+selected = 0
+popup/item_0/text = "NONE"
+popup/item_0/id = 0
+popup/item_1/text = "STATIC"
+popup/item_1/id = 1
+popup/item_2/text = "KINEMATIC"
+popup/item_2/id = 2
+popup/item_3/text = "RIGID"
+popup/item_3/id = 3
+
+[node name="Label2" type="Label" parent="PanelContainer/VBoxContainer/GridContainer"]
+layout_mode = 2
+text = "Collision Layers"
+
+[node name="collision_layers" type="SpinBox" parent="PanelContainer/VBoxContainer/GridContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+size_flags_horizontal = 3
+rounded = true
+allow_greater = true
+allow_lesser = true
+
+[node name="Label3" type="Label" parent="PanelContainer/VBoxContainer/GridContainer"]
+layout_mode = 2
+text = "Collision Mask"
+
+[node name="collision_mask" type="SpinBox" parent="PanelContainer/VBoxContainer/GridContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+rounded = true
+allow_greater = true
+allow_lesser = true
+
+[node name="Label5" type="Label" parent="PanelContainer/VBoxContainer/GridContainer"]
+layout_mode = 2
+text = "Alignment"
+
+[node name="alignment_type" type="OptionButton" parent="PanelContainer/VBoxContainer/GridContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+item_count = 4
+selected = 0
+popup/item_0/text = "Align to surface"
+popup/item_0/id = 0
+popup/item_1/text = "XY Plane"
+popup/item_1/id = 1
+popup/item_2/text = "XZ Plane"
+popup/item_2/id = 2
+popup/item_3/text = "YZ Plane"
+popup/item_3/id = 3
+
+[node name="Label4" type="Label" parent="PanelContainer/VBoxContainer/GridContainer"]
+layout_mode = 2
+text = "Match Active Block"
+
+[node name="check_match_selected_block" type="CheckBox" parent="PanelContainer/VBoxContainer/GridContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+tooltip_text = "When drawing in empty space, copy elevation and height properties from currently selected block."
+disabled = true
+text = "On"
+
+[node name="Label" type="Label" parent="PanelContainer/VBoxContainer"]
+layout_mode = 2
+text = "Orthogonal Viewport:"
+
+[node name="MarginContainer" type="MarginContainer" parent="PanelContainer/VBoxContainer"]
+layout_mode = 2
+theme_override_constants/margin_left = 16
+
+[node name="VBoxContainer" type="VBoxContainer" parent="PanelContainer/VBoxContainer/MarginContainer"]
+layout_mode = 2
+
+[node name="GridContainer" type="GridContainer" parent="PanelContainer/VBoxContainer/MarginContainer/VBoxContainer"]
+layout_mode = 2
+columns = 2
+
+[node name="Label" type="Label" parent="PanelContainer/VBoxContainer/MarginContainer/VBoxContainer/GridContainer"]
+layout_mode = 2
+text = "Default Block Elevation"
+
+[node name="default_block_elevation" parent="PanelContainer/VBoxContainer/MarginContainer/VBoxContainer/GridContainer" instance=ExtResource("2_1r7f8")]
+unique_name_in_owner = true
+layout_mode = 2
+size_flags_horizontal = 3
+disabled = true
+
+[node name="Label2" type="Label" parent="PanelContainer/VBoxContainer/MarginContainer/VBoxContainer/GridContainer"]
+layout_mode = 2
+text = "Default Block Height"
+
+[node name="default_block_height" parent="PanelContainer/VBoxContainer/MarginContainer/VBoxContainer/GridContainer" instance=ExtResource("2_1r7f8")]
+unique_name_in_owner = true
+layout_mode = 2
+size_flags_horizontal = 3
+disabled = true
+
+[connection signal="item_selected" from="PanelContainer/VBoxContainer/GridContainer/collision_type" to="." method="_on_collision_type_item_selected"]
+[connection signal="value_changed" from="PanelContainer/VBoxContainer/GridContainer/collision_layers" to="." method="_on_collision_layers_value_changed"]
+[connection signal="value_changed" from="PanelContainer/VBoxContainer/GridContainer/collision_mask" to="." method="_on_collision_mask_value_changed"]
+[connection signal="item_selected" from="PanelContainer/VBoxContainer/GridContainer/alignment_type" to="." method="_on_alignment_type_item_selected"]
+[connection signal="toggled" from="PanelContainer/VBoxContainer/GridContainer/check_match_selected_block" to="." method="_on_check_match_selected_block_toggled"]
+[connection signal="value_changed" from="PanelContainer/VBoxContainer/MarginContainer/VBoxContainer/GridContainer/default_block_elevation" to="." method="_on_default_block_elevation_value_changed"]
+[connection signal="value_changed" from="PanelContainer/VBoxContainer/MarginContainer/VBoxContainer/GridContainer/default_block_height" to="." method="_on_default_block_height_value_changed"]

addons/cyclops_level_builder/tools/tool_clip.gd

@@ -0,0 +1,170 @@
+# MIT License
+#
+# Copyright (c) 2023 Mark McKay
+# https://github.com/blackears/cyclopsLevelBuilder
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+@tool
+extends CyclopsTool
+class_name ToolClip
+
+const TOOL_ID:String = "clip"
+
+enum ToolState { READY, PICK_POINTS, PICK_SIDE }
+var tool_state:ToolState = ToolState.READY
+
+var clip_points:PackedVector3Array
+var clip_normals:PackedVector3Array
+var clip_block:CyclopsBlock
+
+func _get_tool_id()->String:
+	return TOOL_ID
+
+func has_clip_point(point:Vector3)->bool:
+	for p in clip_points:
+		if p.is_equal_approx(point):
+			return true
+	return false
+
+func _draw_tool(viewport_camera:Camera3D):
+	var global_scene:CyclopsGlobalScene = builder.get_global_scene()
+	global_scene.clear_tool_mesh()
+	global_scene.draw_selected_blocks(viewport_camera)
+
+	if !clip_points.is_empty():
+		global_scene.draw_points(clip_points, global_scene.vertex_tool_material)
+		
+	if clip_points.size() >= 2:
+		global_scene.draw_loop(clip_points, false, global_scene.tool_material)
+	
+
+func _gui_input(viewport_camera:Camera3D, event:InputEvent)->bool:	
+		
+	var blocks_root:Node = builder.get_block_add_parent()
+	#var grid_step_size:float = pow(2, builder.get_global_scene().grid_size)
+
+
+	if event is InputEventKey:
+		var e:InputEventKey = event
+
+		if e.keycode == KEY_BACKSPACE:
+			if e.is_pressed():
+				if !clip_points.is_empty():
+					var count:int = clip_points.size()
+					clip_points.remove_at(count - 1)
+					clip_normals.remove_at(count - 1)
+					if clip_points.is_empty():
+						clip_block = null
+					
+			return true
+			
+		elif e.keycode == KEY_ESCAPE:
+			clip_points.clear()
+			clip_normals.clear()
+			clip_block = null
+#			_draw_tool(viewport_camera)
+			return true
+			
+		elif e.keycode == KEY_ENTER:
+			#Cut at plane
+			var cut_plane:Plane
+			
+			#for p in clip_points:
+				#print("clip ", p)
+			
+			if clip_points.size() == 3:
+				cut_plane = Plane(clip_points[0], clip_points[1], clip_points[2])
+			elif clip_points.size() == 2:
+				var dir:Vector3 = clip_points[1] - clip_points[0]
+				var face_dir:Vector3 = clip_normals[0].cross(dir)
+				cut_plane = Plane(face_dir.normalized(), clip_points[0])
+			else:
+				#Cannot cut with fewer than 2 points
+				return true
+			
+			var cmd:CommandClipBlock = CommandClipBlock.new()
+			cmd.builder = builder
+			cmd.blocks_root_path = blocks_root.get_path()
+			cmd.block_path = clip_block.get_path()
+			cmd.block_sibling_name = GeneralUtil.find_unique_name(blocks_root, "Block_")
+			cmd.cut_plane = cut_plane
+			cmd.material_path = builder.tool_material_path
+			cmd.uv_transform = builder.tool_uv_transform
+			
+			var undo:EditorUndoRedoManager = builder.get_undo_redo()
+			cmd.add_to_undo_manager(undo)
+			
+			#Clean up
+			clip_points.clear()
+			clip_normals.clear()
+			clip_block = null
+
+#			_draw_tool(viewport_camera)
+			
+			return true
+
+	if event is InputEventMouseButton:
+		
+		var e:InputEventMouseButton = event
+		
+		if (e.button_mask & MOUSE_BUTTON_MASK_MIDDLE):
+			return false
+		
+		if e.button_index == MOUSE_BUTTON_LEFT:
+
+			if e.is_pressed():
+				
+				var origin:Vector3 = viewport_camera.project_ray_origin(e.position)
+				var dir:Vector3 = viewport_camera.project_ray_normal(e.position)				
+				
+				var result:IntersectResults = builder.intersect_ray_closest(origin, dir)
+				
+				if result:
+					#var p:Vector3 = to_local(result.position, blocks_root.global_transform.inverse(), grid_step_size)
+#					var p:Vector3 = MathUtil.snap_to_grid(result.get_world_position(), grid_step_size)
+					var p_hit:Vector3 = result.get_world_position()
+					var p_norm:Vector3 = result.get_world_normal()
+					var p:Vector3 = builder.get_snapping_manager().snap_point(p_hit, SnappingQuery.new(viewport_camera))
+					p = MathUtil.closest_point_on_plane(p, p_hit, p_norm)
+					
+					if !has_clip_point(p):
+						if clip_points.is_empty():
+							clip_block = result.object
+							
+						if clip_points.size() < 3:
+							clip_points.append(p)
+							clip_normals.append(p_norm)
+						else:
+							clip_points[2] = p
+							clip_normals[2] = p_norm
+							
+#						_draw_tool(viewport_camera)
+						
+			return true
+
+	return false
+
+
+func _activate(builder:CyclopsLevelBuilder):
+	super._activate(builder)
+
+	builder.mode = CyclopsLevelBuilder.Mode.OBJECT
+	var global_scene:CyclopsGlobalScene = builder.get_global_scene()
+	global_scene.clear_tool_mesh()

addons/cyclops_level_builder/tools/tool_cylinder.gd

@@ -0,0 +1,297 @@
+# MIT License
+#
+# Copyright (c) 2023 Mark McKay
+# https://github.com/blackears/cyclopsLevelBuilder
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+@tool
+extends CyclopsTool
+class_name ToolCylinder
+
+const TOOL_ID:String = "cylinder"
+
+enum ToolState { READY, FIRST_RING, SECOND_RING, DRAG_HEIGHT }
+var tool_state:ToolState = ToolState.READY
+
+#@export var segments:int = 16
+#@export var tube:bool = false
+var settings:ToolCylinderSettings = ToolCylinderSettings.new()
+
+var floor_normal:Vector3
+var base_center:Vector3
+var block_drag_cur:Vector3
+var drag_offset:Vector3
+var first_ring_radius:float
+var second_ring_radius:float
+
+
+
+func _activate(builder:CyclopsLevelBuilder):
+	super._activate(builder)
+
+	builder.mode = CyclopsLevelBuilder.Mode.OBJECT
+	var global_scene:CyclopsGlobalScene = builder.get_global_scene()
+	global_scene.clear_tool_mesh()
+	
+	var cache:Dictionary = builder.get_tool_cache(TOOL_ID)
+	settings.load_from_cache(cache)
+
+func _deactivate():
+	var cache:Dictionary = settings.save_to_cache()
+	builder.set_tool_cache(TOOL_ID, cache)
+	
+
+func _get_tool_properties_editor()->Control:
+#	var res_insp:ResourceInspector = preload("res://addons/cyclops_level_builder/controls/resource_inspector/resource_inspector.tscn").instantiate()
+	var ed:ToolCylinderSettingsEditor = preload("res://addons/cyclops_level_builder/tools/tool_cylinder_settings_editor.tscn").instantiate()
+	
+	ed.settings = settings
+	
+	return ed
+
+func _draw_tool(viewport_camera:Camera3D):
+	var global_scene:CyclopsGlobalScene = builder.get_global_scene()
+	global_scene.clear_tool_mesh()
+	global_scene.draw_selected_blocks(viewport_camera)
+
+	if tool_state == ToolState.FIRST_RING:
+		var bounding_points:PackedVector3Array = MathUtil.create_circle_points(base_center, floor_normal, first_ring_radius, settings.segments)
+		global_scene.draw_loop(bounding_points, true, global_scene.tool_material)
+		global_scene.draw_points(bounding_points, global_scene.vertex_tool_material)
+		
+	elif tool_state == ToolState.SECOND_RING:
+		for radius in [first_ring_radius, second_ring_radius]:
+			var bounding_points:PackedVector3Array = MathUtil.create_circle_points(base_center, floor_normal, radius, settings.segments)
+			global_scene.draw_loop(bounding_points, true, global_scene.tool_material)
+			global_scene.draw_points(bounding_points, global_scene.vertex_tool_material)
+
+	elif tool_state == ToolState.DRAG_HEIGHT:	
+		var bounding_points:PackedVector3Array = MathUtil.create_circle_points(base_center, floor_normal, first_ring_radius, settings.segments)
+		global_scene.draw_prism(bounding_points, drag_offset, global_scene.tool_material, global_scene.vertex_tool_material)
+		
+		if settings.tube:
+			bounding_points = MathUtil.create_circle_points(base_center, floor_normal, second_ring_radius, settings.segments)
+			global_scene.draw_prism(bounding_points, drag_offset, global_scene.tool_material, global_scene.vertex_tool_material)
+		
+
+func _gui_input(viewport_camera:Camera3D, event:InputEvent)->bool:	
+
+	var blocks_root:Node = builder.get_block_add_parent()
+	#var grid_step_size:float = pow(2, builder.get_global_scene().grid_size)
+
+	if event is InputEventKey:
+		var e:InputEventKey = event
+		
+		if e.keycode == KEY_ESCAPE:
+			if e.is_pressed():
+				tool_state = ToolState.READY
+			return true
+	
+	elif event is InputEventMouseButton:
+		
+		var e:InputEventMouseButton = event
+		if e.button_index == MOUSE_BUTTON_LEFT:
+
+			if e.is_pressed():
+				
+				var origin:Vector3 = viewport_camera.project_ray_origin(e.position)
+				var dir:Vector3 = viewport_camera.project_ray_normal(e.position)
+				
+				
+				if tool_state == ToolState.READY:
+					tool_state = ToolState.FIRST_RING
+
+					first_ring_radius = 0
+					second_ring_radius = 0
+					
+					var result:IntersectResults = builder.intersect_ray_closest(origin, dir)
+					if result && settings.block_alignment == BlockAlignment.Type.ALIGN_TO_SURFACE:
+						#print("init base point block")
+#						floor_normal = result.normal
+						floor_normal = result.get_world_normal()
+
+#						var p:Vector3 = to_local(result.position, blocks_root.global_transform.inverse(), grid_step_size)
+						var p:Vector3 = builder.get_snapping_manager().snap_point(result.get_world_position(), SnappingQuery.new(viewport_camera))
+						base_center = p
+
+						return true
+						
+					else:
+						#print("init base point empty space")
+						var draw_plane_point:Vector3 = Vector3.ZERO
+						var draw_plane_normal:Vector3 = BlockAlignment.get_plane_normal(settings.block_alignment)
+						if settings.match_selected_block:
+							draw_plane_point = calc_empty_space_draw_plane_origin(viewport_camera, draw_plane_point, draw_plane_normal)
+							
+						var hit_result = calc_hit_point_empty_space(origin, dir, viewport_camera, draw_plane_point, draw_plane_normal)
+						var start_pos:Vector3 = hit_result[0]
+						floor_normal = hit_result[1]
+
+						var p:Vector3 = builder.get_snapping_manager().snap_point(start_pos, SnappingQuery.new(viewport_camera))
+						base_center = p
+						
+						return true	
+			else:
+				if tool_state == ToolState.FIRST_RING:
+					if settings.tube:
+						tool_state = ToolState.SECOND_RING
+					else:
+						var camera_dir:Vector3 = viewport_camera.project_ray_normal(e.position)
+						var angle_with_base:float = acos(floor_normal.dot(camera_dir))
+						var drag_angle_limit:float = builder.get_global_scene().drag_angle_limit
+						if angle_with_base < drag_angle_limit || angle_with_base > PI - drag_angle_limit:
+							#block_drag_cur = base_center + floor_normal
+							var height = settings.default_block_height
+							
+							if settings.match_selected_block:
+								height = calc_active_block_orthogonal_height(base_center, floor_normal)
+								
+							block_drag_cur = base_center + floor_normal * height
+							drag_offset = block_drag_cur - base_center
+							
+							create_block()
+							
+							tool_state = ToolState.READY
+						else:
+							tool_state = ToolState.DRAG_HEIGHT
+					return true
+				
+				elif tool_state == ToolState.SECOND_RING:
+					var camera_dir:Vector3 = viewport_camera.project_ray_normal(e.position)
+					var angle_with_base:float = acos(floor_normal.dot(camera_dir))
+					var drag_angle_limit:float = builder.get_global_scene().drag_angle_limit
+					if angle_with_base < drag_angle_limit || angle_with_base > PI - drag_angle_limit:
+						#block_drag_cur = base_center + floor_normal
+						var height = settings.default_block_height
+						if settings.match_selected_block:
+							height = calc_active_block_orthogonal_height(base_center, floor_normal)
+							
+						block_drag_cur = base_center + floor_normal * height
+						drag_offset = block_drag_cur - base_center
+						
+						create_block()
+						
+						tool_state = ToolState.READY
+					else:
+					
+						tool_state = ToolState.DRAG_HEIGHT
+					return true
+
+				elif tool_state == ToolState.DRAG_HEIGHT:
+
+					create_block()
+										
+					tool_state = ToolState.READY
+					return true
+		
+		#elif e.button_index == MOUSE_BUTTON_RIGHT:
+			#if tool_state == ToolState.FIRST_RING || tool_state == ToolState.SECOND_RING || tool_state == ToolState.DRAG_HEIGHT:
+				#if e.is_pressed():
+					#tool_state = ToolState.READY
+				#return true
+					
+		elif e.button_index == MOUSE_BUTTON_WHEEL_UP:
+			if tool_state == ToolState.FIRST_RING || tool_state == ToolState.SECOND_RING || tool_state == ToolState.DRAG_HEIGHT:
+				if e.pressed:
+					settings.segments += 1
+				return true
+					
+		elif e.button_index == MOUSE_BUTTON_WHEEL_DOWN:
+			if tool_state == ToolState.FIRST_RING || tool_state == ToolState.SECOND_RING || tool_state == ToolState.DRAG_HEIGHT:
+				if e.pressed:
+					settings.segments = max(settings.segments - 1, 3)
+				return true
+
+	elif event is InputEventMouseMotion:
+		var e:InputEventMouseMotion = event
+
+		if (e.button_mask & MOUSE_BUTTON_MASK_MIDDLE):
+			return false		
+
+		var origin:Vector3 = viewport_camera.project_ray_origin(e.position)
+		var dir:Vector3 = viewport_camera.project_ray_normal(e.position)
+
+		var start_pos:Vector3 = origin + builder.block_create_distance * dir
+#		var w2l = blocks_root.global_transform.inverse()
+#		var origin_local:Vector3 = w2l * origin
+#		var dir_local:Vector3 = w2l.basis * dir
+
+		if tool_state == ToolState.FIRST_RING:
+			var p_isect:Vector3 = MathUtil.intersect_plane(origin, dir, base_center, floor_normal)
+			#var p_snapped = to_local(p_isect, blocks_root.global_transform.inverse(), grid_step_size)
+			#var p_snapped = MathUtil.snap_to_grid(p_isect, grid_step_size)
+			var p_snapped:Vector3 = builder.get_snapping_manager().snap_point(p_isect, SnappingQuery.new(viewport_camera))
+			first_ring_radius = (p_snapped - base_center).length()
+
+			return true
+			
+		elif tool_state == ToolState.SECOND_RING:
+			var p_isect:Vector3 = MathUtil.intersect_plane(origin, dir, base_center, floor_normal)
+			#var p_snapped = to_local(p_isect, blocks_root.global_transform.inverse(), grid_step_size)
+#			var p_snapped = MathUtil.snap_to_grid(p_isect, grid_step_size)
+			var p_snapped:Vector3 = builder.get_snapping_manager().snap_point(p_isect, SnappingQuery.new(viewport_camera))
+			second_ring_radius = (p_snapped - base_center).length()
+
+			return true
+			
+		elif tool_state == ToolState.DRAG_HEIGHT:
+			block_drag_cur = MathUtil.closest_point_on_line(origin, dir, base_center, floor_normal)
+			
+			block_drag_cur = builder.get_snapping_manager().snap_point(block_drag_cur, SnappingQuery.new(viewport_camera))
+			
+			drag_offset = block_drag_cur - base_center
+#			var bounding_points:PackedVector3Array = MathUtil.bounding_polygon_3d(base_points, floor_normal)
+			
+#			global_scene.clear_tool_mesh()
+#			global_scene.draw_prism(bounding_points, drag_offset, global_scene.tool_material)
+
+			return true
+
+	return super._gui_input(viewport_camera, event)		
+
+func create_block():
+	var blocks_root:Node = builder.get_block_add_parent()
+	
+	var cmd:CommandAddCylinder = CommandAddCylinder.new()
+	cmd.builder = builder
+	cmd.block_name_prefix = "Block_"
+	cmd.blocks_root_path = blocks_root.get_path()
+	cmd.tube = settings.tube
+	cmd.origin = base_center
+	cmd.axis_normal = floor_normal
+	var height:float = drag_offset.length() if drag_offset.dot(floor_normal) > 0 else - drag_offset.length()
+	cmd.height = height
+	cmd.collision_type = settings.collision_type
+	cmd.collision_layers = settings.collision_layer
+	cmd.collision_mask = settings.collision_mask
+	
+	if settings.tube:
+		cmd.radius_inner = min(first_ring_radius, second_ring_radius)
+		cmd.radius_outer = max(first_ring_radius, second_ring_radius)
+	else:
+		cmd.radius_inner = first_ring_radius
+		cmd.radius_outer = first_ring_radius
+	cmd.segments = settings.segments
+	cmd.uv_transform = builder.tool_uv_transform
+	cmd.material_path = builder.tool_material_path
+
+	var undo:EditorUndoRedoManager = builder.get_undo_redo()
+
+	cmd.add_to_undo_manager(undo)

addons/cyclops_level_builder/tools/tool_cylinder_settings.gd

@@ -0,0 +1,62 @@
+# MIT License
+#
+# Copyright (c) 2023 Mark McKay
+# https://github.com/blackears/cyclopsLevelBuilder
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+@tool
+extends Resource
+class_name ToolCylinderSettings
+
+@export var block_alignment:BlockAlignment.Type = BlockAlignment.Type.ALIGN_TO_SURFACE
+@export var match_selected_block:bool = true
+@export var default_block_elevation:float = 0
+@export var default_block_height:float = 1
+@export var collision_type:Collision.Type = Collision.Type.STATIC
+@export_flags_3d_physics var collision_layer:int = 1
+@export_flags_3d_physics var collision_mask:int = 1
+
+@export var segments:int = 16
+@export var tube:bool = false
+
+func load_from_cache(cache:Dictionary):
+	block_alignment = cache.get("block_alignment", BlockAlignment.Type.ALIGN_TO_SURFACE)
+	match_selected_block = cache.get("match_selected_block", true)
+	default_block_elevation = cache.get("default_block_elevation", 0)
+	default_block_height = cache.get("default_block_height", 1)
+	collision_type = cache.get("collision_type", Collision.Type.STATIC)
+	collision_layer = cache.get("collision_layer", 1)
+	collision_mask = cache.get("collision_mask", 1)
+		
+	segments = cache.get("segments", 16)
+	tube = cache.get("tube", false)
+	
+func save_to_cache():
+	return {
+		"block_alignment": block_alignment,
+		"match_selected_block": match_selected_block,
+		"default_block_elevation": default_block_elevation,
+		"default_block_height": default_block_height,
+		"collision_type": collision_type,
+		"collision_layer": collision_layer,
+		"collision_mask": collision_mask,
+		"segments": segments,
+		"tube": tube,
+	}

addons/cyclops_level_builder/tools/tool_cylinder_settings_editor.gd

@@ -0,0 +1,104 @@
+# MIT License
+#
+# Copyright (c) 2023 Mark McKay
+# https://github.com/blackears/cyclopsLevelBuilder
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+@tool
+extends PanelContainer
+class_name ToolCylinderSettingsEditor
+
+
+var settings:ToolCylinderSettings:
+	get:
+		return settings
+	set(value):
+		settings = value
+		dirty = true
+
+var dirty:bool = true
+
+func _ready():
+	%collision_type.clear()
+	for text in Collision.Type.keys():
+		%collision_type.add_item(text)
+
+func _process(delta):
+	if dirty:
+		update()
+		dirty = false
+
+
+func update():
+	if !settings:
+		%check_tube.disabled = true
+		%check_match_selected_block.disabled = true
+		%default_block_elevation.disabled = true
+		%default_block_height.disabled = true
+		return
+
+	%spin_segments.value = settings.segments
+	%check_tube.disabled = false
+	%check_tube.button_pressed = settings.match_selected_block
+	%check_match_selected_block.disabled = false
+	%check_match_selected_block.button_pressed = settings.match_selected_block
+	%default_block_elevation.disabled = false
+	%default_block_elevation.value = settings.default_block_elevation
+	%default_block_height.disabled = false
+	%default_block_height.value = settings.default_block_height
+
+	%alignment_type.selected = settings.block_alignment
+
+	%collision_type.selected = settings.collision_type
+	%collision_layers.value = settings.collision_layer
+	%collision_mask.value = settings.collision_mask
+
+func _on_check_match_selected_block_toggled(value):
+	settings.match_selected_block = value
+
+
+func _on_default_block_elevation_value_changed(value):
+	settings.default_block_elevation = value
+
+
+func _on_default_block_height_value_changed(value):
+	settings.default_block_height = value
+
+
+func _on_check_tube_toggled(value):
+	settings.tube = value
+
+
+func _on_spin_segments_value_changed(value):
+	settings.segments = value
+
+func _on_collision_layers_value_changed(value):
+	settings.collision_layer = value
+
+
+func _on_collision_mask_value_changed(value):
+	settings.collision_mask = value
+
+func _on_collision_type_item_selected(index):
+	settings.collision_type = index
+
+
+func _on_alignment_type_item_selected(index):
+	settings.block_alignment = index

addons/cyclops_level_builder/tools/tool_cylinder_settings_editor.tscn

@@ -0,0 +1,157 @@
+[gd_scene load_steps=3 format=3 uid="uid://dx804lkvek177"]
+
+[ext_resource type="Script" path="res://addons/cyclops_level_builder/tools/tool_cylinder_settings_editor.gd" id="1_oyugv"]
+[ext_resource type="PackedScene" uid="uid://diibmlqy1mpqb" path="res://addons/cyclops_level_builder/controls/numeric_line_edit.tscn" id="2_wm7rv"]
+
+[node name="ToolCylinderSettings" type="PanelContainer"]
+offset_right = 413.0
+offset_bottom = 232.0
+script = ExtResource("1_oyugv")
+
+[node name="PanelContainer" type="PanelContainer" parent="."]
+layout_mode = 2
+
+[node name="VBoxContainer" type="VBoxContainer" parent="PanelContainer"]
+layout_mode = 2
+
+[node name="GridContainer" type="GridContainer" parent="PanelContainer/VBoxContainer"]
+layout_mode = 2
+columns = 2
+
+[node name="Label4" type="Label" parent="PanelContainer/VBoxContainer/GridContainer"]
+layout_mode = 2
+text = "Collision Type"
+
+[node name="collision_type" type="OptionButton" parent="PanelContainer/VBoxContainer/GridContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+item_count = 4
+selected = 0
+popup/item_0/text = "NONE"
+popup/item_0/id = 0
+popup/item_1/text = "STATIC"
+popup/item_1/id = 1
+popup/item_2/text = "KINEMATIC"
+popup/item_2/id = 2
+popup/item_3/text = "RIGID"
+popup/item_3/id = 3
+
+[node name="Label5" type="Label" parent="PanelContainer/VBoxContainer/GridContainer"]
+layout_mode = 2
+text = "Collision Layers"
+
+[node name="collision_layers" type="SpinBox" parent="PanelContainer/VBoxContainer/GridContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+size_flags_horizontal = 3
+rounded = true
+allow_greater = true
+allow_lesser = true
+
+[node name="Label6" type="Label" parent="PanelContainer/VBoxContainer/GridContainer"]
+layout_mode = 2
+text = "Collision Mask"
+
+[node name="collision_mask" type="SpinBox" parent="PanelContainer/VBoxContainer/GridContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+rounded = true
+allow_greater = true
+allow_lesser = true
+
+[node name="Label" type="Label" parent="PanelContainer/VBoxContainer/GridContainer"]
+layout_mode = 2
+text = "Segments"
+
+[node name="spin_segments" type="SpinBox" parent="PanelContainer/VBoxContainer/GridContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+min_value = 3.0
+max_value = 20.0
+value = 3.0
+rounded = true
+allow_greater = true
+
+[node name="Label2" type="Label" parent="PanelContainer/VBoxContainer/GridContainer"]
+layout_mode = 2
+text = "Tube"
+
+[node name="check_tube" type="CheckBox" parent="PanelContainer/VBoxContainer/GridContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+disabled = true
+text = "On"
+
+[node name="Label7" type="Label" parent="PanelContainer/VBoxContainer/GridContainer"]
+layout_mode = 2
+text = "Alignment"
+
+[node name="alignment_type" type="OptionButton" parent="PanelContainer/VBoxContainer/GridContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+item_count = 4
+selected = 0
+popup/item_0/text = "Align to surface"
+popup/item_0/id = 0
+popup/item_1/text = "XY Plane"
+popup/item_1/id = 1
+popup/item_2/text = "XZ Plane"
+popup/item_2/id = 2
+popup/item_3/text = "YZ Plane"
+popup/item_3/id = 3
+
+[node name="Label3" type="Label" parent="PanelContainer/VBoxContainer/GridContainer"]
+layout_mode = 2
+text = "Match selected block"
+
+[node name="check_match_selected_block" type="CheckBox" parent="PanelContainer/VBoxContainer/GridContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+tooltip_text = "When drawing in empty space, copy elevation and height properties from currently selected block."
+disabled = true
+text = "On"
+
+[node name="Label" type="Label" parent="PanelContainer/VBoxContainer"]
+layout_mode = 2
+text = "Orthogonal Viewport:"
+
+[node name="MarginContainer" type="MarginContainer" parent="PanelContainer/VBoxContainer"]
+layout_mode = 2
+theme_override_constants/margin_left = 16
+
+[node name="VBoxContainer" type="VBoxContainer" parent="PanelContainer/VBoxContainer/MarginContainer"]
+layout_mode = 2
+
+[node name="GridContainer" type="GridContainer" parent="PanelContainer/VBoxContainer/MarginContainer/VBoxContainer"]
+layout_mode = 2
+columns = 2
+
+[node name="Label" type="Label" parent="PanelContainer/VBoxContainer/MarginContainer/VBoxContainer/GridContainer"]
+layout_mode = 2
+text = "Default Block Elevation"
+
+[node name="default_block_elevation" parent="PanelContainer/VBoxContainer/MarginContainer/VBoxContainer/GridContainer" instance=ExtResource("2_wm7rv")]
+unique_name_in_owner = true
+layout_mode = 2
+size_flags_horizontal = 3
+disabled = true
+
+[node name="Label2" type="Label" parent="PanelContainer/VBoxContainer/MarginContainer/VBoxContainer/GridContainer"]
+layout_mode = 2
+text = "Default Block Height"
+
+[node name="default_block_height" parent="PanelContainer/VBoxContainer/MarginContainer/VBoxContainer/GridContainer" instance=ExtResource("2_wm7rv")]
+unique_name_in_owner = true
+layout_mode = 2
+size_flags_horizontal = 3
+disabled = true
+
+[connection signal="item_selected" from="PanelContainer/VBoxContainer/GridContainer/collision_type" to="." method="_on_collision_type_item_selected"]
+[connection signal="value_changed" from="PanelContainer/VBoxContainer/GridContainer/collision_layers" to="." method="_on_collision_layers_value_changed"]
+[connection signal="value_changed" from="PanelContainer/VBoxContainer/GridContainer/collision_mask" to="." method="_on_collision_mask_value_changed"]
+[connection signal="value_changed" from="PanelContainer/VBoxContainer/GridContainer/spin_segments" to="." method="_on_spin_segments_value_changed"]
+[connection signal="toggled" from="PanelContainer/VBoxContainer/GridContainer/check_tube" to="." method="_on_check_tube_toggled"]
+[connection signal="item_selected" from="PanelContainer/VBoxContainer/GridContainer/alignment_type" to="." method="_on_alignment_type_item_selected"]
+[connection signal="toggled" from="PanelContainer/VBoxContainer/GridContainer/check_match_selected_block" to="." method="_on_check_match_selected_block_toggled"]
+[connection signal="value_changed" from="PanelContainer/VBoxContainer/MarginContainer/VBoxContainer/GridContainer/default_block_elevation" to="." method="_on_default_block_elevation_value_changed"]
+[connection signal="value_changed" from="PanelContainer/VBoxContainer/MarginContainer/VBoxContainer/GridContainer/default_block_height" to="." method="_on_default_block_height_value_changed"]

addons/cyclops_level_builder/tools/tool_duplicate.gd

@@ -0,0 +1,124 @@
+# MIT License
+#
+# Copyright (c) 2023 Mark McKay
+# https://github.com/blackears/cyclopsLevelBuilder
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+@tool
+extends CyclopsTool
+class_name ToolDuplicate
+
+const TOOL_ID:String = "duplicate"
+
+var drag_start_point:Vector3
+var cmd_duplicate:CommandDuplicateBlocks
+
+enum ToolState { READY, DRAGGING, DONE }
+var tool_state:ToolState = ToolState.READY
+
+func _get_tool_id()->String:
+	return TOOL_ID
+
+func _draw_tool(viewport_camera:Camera3D):
+	var global_scene:CyclopsGlobalScene = builder.get_global_scene()
+	global_scene.clear_tool_mesh()
+	global_scene.draw_selected_blocks(viewport_camera)
+
+func _gui_input(viewport_camera:Camera3D, event:InputEvent)->bool:	
+	
+	if event is InputEventMouseButton:
+		
+		var e:InputEventMouseButton = event
+		if e.button_index == MOUSE_BUTTON_LEFT:
+
+			if !e.is_pressed():
+				if tool_state == ToolState.DRAGGING:
+					#print("committing duplicate")
+					var undo:EditorUndoRedoManager = builder.get_undo_redo()
+
+					if cmd_duplicate.will_change_anything():
+						cmd_duplicate.add_to_undo_manager(undo)
+					
+					tool_state = ToolState.DONE
+					builder.switch_to_tool(ToolBlock.new())
+					
+		return true
+					
+	elif event is InputEventMouseMotion:
+		var e:InputEventMouseMotion = event
+
+		if (e.button_mask & MOUSE_BUTTON_MASK_MIDDLE):
+			return super._gui_input(viewport_camera, event)		
+
+		var origin:Vector3 = viewport_camera.project_ray_origin(e.position)
+		var dir:Vector3 = viewport_camera.project_ray_normal(e.position)
+		
+		if tool_state == ToolState.DRAGGING:
+			var drag_to:Vector3
+			if e.alt_pressed:
+				drag_to = MathUtil.closest_point_on_line(origin, dir, drag_start_point, Vector3.UP)
+			else:
+				drag_to = MathUtil.intersect_plane(origin, dir, drag_start_point, Vector3.UP)
+			
+			var offset:Vector3 = drag_to - drag_start_point
+			offset = builder.get_snapping_manager().snap_point(offset, SnappingQuery.new(viewport_camera))
+			#print("drag offset %s" % offset)
+
+			#print("duplicate drag by %s" % offset)
+			
+			cmd_duplicate.move_offset = offset
+			cmd_duplicate.do_it()
+		
+		return true
+			
+	
+	return false
+	
+
+func _activate(builder:CyclopsLevelBuilder):
+	super._activate(builder)
+
+	var global_scene:CyclopsGlobalScene = builder.get_global_scene()
+	global_scene.clear_tool_mesh()
+	
+	#Invoke command immediately
+	cmd_duplicate = CommandDuplicateBlocks.new()
+	cmd_duplicate.builder = builder
+	var blocks_root:Node = builder.get_block_add_parent()
+	cmd_duplicate.blocks_root_path = blocks_root.get_path()
+	var centroid:Vector3
+	var count:int = 0
+	
+	var sel_blocks:Array[CyclopsBlock] = builder.get_selected_blocks()
+	for block in sel_blocks:
+		cmd_duplicate.blocks_to_duplicate.append(block.get_path())
+		centroid += block.global_transform * block.control_mesh.bounds.get_center()
+		count += 1
+	
+	cmd_duplicate.lock_uvs = builder.lock_uvs
+	
+	centroid /= count
+	drag_start_point = centroid
+	tool_state = ToolState.DRAGGING
+	
+	cmd_duplicate.do_it()
+	
+
+

addons/cyclops_level_builder/tools/tool_edit_base.gd

@@ -0,0 +1,100 @@
+# MIT License
+#
+# Copyright (c) 2023 Mark McKay
+# https://github.com/blackears/cyclopsLevelBuilder
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+@tool
+extends CyclopsTool
+class_name ToolEditBase
+
+var mouse_hover_pos:Vector2
+
+var drag_select_start_pos:Vector2
+var drag_select_to_pos:Vector2
+
+func _gui_input(viewport_camera:Camera3D, event:InputEvent)->bool:	
+	
+	if event is InputEventKey:
+		var e:InputEventKey = event
+		
+		if e.keycode == KEY_Q && e.alt_pressed:
+			select_block_under_cursor(viewport_camera, mouse_hover_pos)
+				
+			return true
+	
+	
+	elif event is InputEventMouseButton:
+		var e:InputEventMouseButton = event
+		mouse_hover_pos = e.position
+		return false
+		
+	elif event is InputEventMouseMotion:
+		var e:InputEventMouseMotion = event
+		mouse_hover_pos = e.position		
+		return false
+		
+	return false
+
+func pick_material(global_scene:CyclopsGlobalScene, selected:bool = false, active = false)->Material:
+	if active:
+		return global_scene.tool_edit_active_material
+	if selected:
+		return global_scene.tool_edit_selected_material
+	return global_scene.tool_edit_unselected_material
+
+func pick_vertex_material(global_scene:CyclopsGlobalScene, selected:bool = false, active = false)->Material:
+	if active:
+		return global_scene.vertex_active_material
+	if selected:
+		return global_scene.vertex_selected_material
+	return global_scene.vertex_unselected_material
+	
+	
+func calc_gizmo_basis(average_normal:Vector3, active_block:Node3D, viewport_camera:Camera3D, orientation:TransformSpace.Type)->Basis:
+	var result:Basis
+	
+	match orientation:
+		TransformSpace.Type.GLOBAL:
+			result = Basis.IDENTITY
+		TransformSpace.Type.LOCAL:
+			result = active_block.global_basis
+			
+			#var xform:Transform3D = active_block.global_transform
+			#gizmo_translate.global_transform = xform
+			#gizmo_translate.global_position = origin
+		TransformSpace.Type.NORMAL:
+			var up:Vector3 = Vector3.UP
+			var x:Vector3 = up.cross(average_normal).normalized()
+			var y:Vector3 = average_normal.cross(x)
+			#gizmo_translate.global_basis = Basis(x, y, average_normal)
+			#gizmo_translate.global_position = origin
+			result = Basis(x, y, average_normal)
+		TransformSpace.Type.VIEW:
+			#gizmo_translate.global_basis = viewport_camera.global_basis
+			#gizmo_translate.global_position = origin
+			
+			result = viewport_camera.global_basis
+		TransformSpace.Type.PARENT:
+			result = active_block.get_parent_node_3d().global_basis
+			#var xform:Transform3D = active_block.get_parent_node_3d().global_transform
+			#gizmo_translate.global_transform = xform
+
+	return result	

addons/cyclops_level_builder/tools/tool_edit_edge.gd

@@ -0,0 +1,646 @@
+# MIT License
+#
+# Copyright (c) 2023 Mark McKay
+# https://github.com/blackears/cyclopsLevelBuilder
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+@tool
+extends ToolEditBase
+class_name ToolEditEdge
+
+const TOOL_ID:String = "edit_edge"
+
+var handles:Array[HandleEdge] = []
+
+enum ToolState { NONE, READY, DRAGGING, MOVE_HANDLES_CLICK, DRAG_SELECTION }
+var tool_state:ToolState = ToolState.NONE
+
+#var drag_handle:HandleEdge
+var drag_mouse_start_pos:Vector2
+var drag_handle_start_pos:Vector3
+
+#enum MoveConstraint { NONE, AXIS_X, AXIS_Y, AXIS_Z, PLANE_XY, PLANE_XZ, PLANE_YZ, PLANE_VIEWPORT }
+var move_constraint:MoveConstraint.Type = MoveConstraint.Type.NONE
+
+var gizmo_translate:Node3D
+
+var cmd_move_edge:CommandMoveEdges
+
+
+class PickHandleResult extends RefCounted:
+	var handle:HandleEdge
+	var position:Vector3
+	
+	
+var settings:ToolEditEdgeSettings = ToolEditEdgeSettings.new()
+
+var average_normal:Vector3 = Vector3.UP
+
+func _get_tool_id()->String:
+	return TOOL_ID
+
+func _get_tool_properties_editor()->Control:
+	var ed:ToolEditEdgeSettingsEditor = preload("res://addons/cyclops_level_builder/tools/tool_edit_edge_settings_editor.tscn").instantiate()
+	
+	ed.settings = settings
+	
+	return ed
+	
+func draw_gizmo(viewport_camera:Camera3D):
+	var global_scene:CyclopsGlobalScene = builder.get_global_scene()
+	if !gizmo_translate:
+		gizmo_translate = preload("res://addons/cyclops_level_builder/tools/gizmos/gizmo_translate.tscn").instantiate()
+	
+	var origin:Vector3
+	var count:int = 0
+	for h in handles:
+		var block:CyclopsBlock = builder.get_node(h.block_path)
+		var l2w:Transform3D = block.global_transform
+		
+		if h.edge_index >= block.control_mesh.edges.size():
+			continue
+		var e:ConvexVolume.EdgeInfo = block.control_mesh.edges[h.edge_index]
+		if e.selected:
+#			print("adding midpoint ", e.get_midpoint())
+			origin += l2w * e.get_midpoint()
+			count += 1
+
+	if count == 0:
+		global_scene.set_custom_gizmo(null)
+	else:
+		origin /= count
+		global_scene.set_custom_gizmo(gizmo_translate)
+#		gizmo_translate.global_transform.origin = origin
+		var active_block:Node3D = builder.get_active_block()
+		
+		gizmo_translate.global_basis = calc_gizmo_basis(average_normal, active_block, viewport_camera, settings.transform_space)
+		gizmo_translate.global_position = origin
+		
+		#match settings.transform_space:
+			#TransformSpace.Type.GLOBAL:
+				#var xform:Transform3D = Transform3D.IDENTITY
+				#xform.origin = origin
+				#gizmo_translate.global_transform = xform
+			#TransformSpace.Type.LOCAL:
+				#var xform:Transform3D = active_block.global_transform
+				#gizmo_translate.global_transform = xform
+				#gizmo_translate.global_position = origin
+			#TransformSpace.Type.NORMAL:
+				#var up:Vector3 = Vector3.UP
+				#var x:Vector3 = up.cross(average_normal).normalized()
+				#var y:Vector3 = average_normal.cross(x)
+				#gizmo_translate.global_basis = Basis(x, y, average_normal)
+				#gizmo_translate.global_position = origin
+			#TransformSpace.Type.VIEW:
+				#gizmo_translate.global_basis = viewport_camera.global_basis
+				#gizmo_translate.global_position = origin
+			#TransformSpace.Type.PARENT:
+				#var xform:Transform3D = active_block.get_parent_node_3d().global_transform
+				#gizmo_translate.global_transform = xform
+#
+
+func _draw_tool(viewport_camera:Camera3D):
+	var global_scene:CyclopsGlobalScene = builder.get_global_scene()
+	global_scene.clear_tool_mesh()	
+
+	if tool_state == ToolState.DRAG_SELECTION:
+		global_scene.draw_screen_rect(viewport_camera, drag_select_start_pos, drag_select_to_pos, global_scene.selection_rect_material)
+	
+	for h in handles:
+		var block:CyclopsBlock = builder.get_node(h.block_path)
+		if h.edge_index >= block.control_mesh.edges.size():
+			#TODO: Sometimes we are retaining handles that do not corepond to the correct edges after an undo operation.
+			continue
+		var e:ConvexVolume.EdgeInfo = block.control_mesh.edges[h.edge_index]
+		var p0:Vector3 = block.global_transform * block.control_mesh.vertices[e.start_index].point
+		var p1:Vector3 = block.global_transform * block.control_mesh.vertices[e.end_index].point
+
+		var active:bool = block.control_mesh.active_edge == h.edge_index		
+		global_scene.draw_vertex((p0 + p1) / 2, pick_vertex_material(global_scene, e.selected, active))
+		global_scene.draw_line(p0, p1, pick_material(global_scene, e.selected, active))
+
+	draw_gizmo(viewport_camera)
+	
+func setup_tool():
+	handles = []
+
+	average_normal = Vector3.ZERO
+	#print("setup_tool")
+	var sel_blocks:Array[CyclopsBlock] = builder.get_selected_blocks()
+	for block in sel_blocks:
+		var l2w:Transform3D = block.global_transform
+
+		var l2w_normal:Basis = l2w.basis.transposed().inverse()
+		
+		for e_idx in block.control_mesh.edges.size():
+			var ctl_mesh:ConvexVolume = block.control_mesh
+			var e:ConvexVolume.EdgeInfo = ctl_mesh.edges[e_idx]
+
+			var handle:HandleEdge = HandleEdge.new()
+			handle.edge_index = e_idx
+			handle.block_path = block.get_path()
+			handles.append(handle)
+	
+			if e.selected:
+				var edge_normal:Vector3 = Vector3.ZERO
+				for f_idx in e.face_indices:
+					#print("f_idx ", f_idx)
+					var f:ConvexVolume.FaceInfo = ctl_mesh.faces[f_idx]
+					#print("f.normal ", f.normal)
+					edge_normal += f.get_area_vector_x2().normalized()
+				
+				average_normal += l2w_normal * edge_normal.normalized()
+				#print("average_normal ", average_normal)
+	
+	average_normal = average_normal.normalized()
+	#print("setup_tool handles.size() ", handles.size())
+	
+func pick_closest_handle(viewport_camera:Camera3D, position:Vector2, radius:float)->PickHandleResult:
+	var best_dist:float = INF
+	var best_handle:HandleEdge = null
+	var best_pick_position:Vector3
+	
+	var pick_origin:Vector3 = viewport_camera.project_ray_origin(position)
+	var pick_dir:Vector3 = viewport_camera.project_ray_normal(position)
+	
+	#print("pick_closest_handle")
+	for h in handles:
+		#print("<<0>>")
+		#print("h ", h)
+		var block:CyclopsBlock = builder.get_node(h.block_path)
+		#print("<<0.1>>")
+		var ctl_mesh:ConvexVolume = block.control_mesh
+		#print("<<0.2>>")
+		if ctl_mesh.edges.size() <= h.edge_index:
+			continue
+		var edge:ConvexVolume.EdgeInfo = ctl_mesh.edges[h.edge_index]
+		#print("<<1>>")
+
+		var p0 = ctl_mesh.vertices[edge.start_index].point
+		var p1 = ctl_mesh.vertices[edge.end_index].point
+		var p0_world:Vector3 = block.global_transform * p0
+		var p1_world:Vector3 = block.global_transform * p1
+		
+		var p0_screen:Vector2 = viewport_camera.unproject_position(p0_world)
+		var p1_screen:Vector2 = viewport_camera.unproject_position(p1_world)
+		
+		var dist_to_seg_2d_sq = MathUtil.dist_to_segment_squared_2d(position, p0_screen, p1_screen)
+		
+		#print("<<2>>")
+		if dist_to_seg_2d_sq > radius * radius:
+			#print("<<2.5>>")
+			#Failed handle radius test
+			continue
+		#print("<<3>>")
+
+		var point_on_seg:Vector3 = MathUtil.closest_point_on_segment(pick_origin, pick_dir, p0_world, p1_world)
+		#print("dist_to_seg_2d_sq ", dist_to_seg_2d_sq)
+		
+		var offset:Vector3 = point_on_seg - pick_origin
+		var parallel:Vector3 = offset.project(pick_dir)
+		var dist = parallel.dot(pick_dir)
+		#print("offset ", offset)
+		#print("parallel ", parallel)
+		#print("dist ", dist)
+		#print("<<4>>")
+		if dist <= 0:
+			#Behind camera
+			continue
+		
+		#print("<<5>>")
+		#print("best_dist ", best_dist)
+		#print("h pos %s ray orig %s ray dir %s offset %s para %s dist %s" % [str(h.position), pick_origin, pick_dir, offset, parallel, dist])
+		if dist >= best_dist:
+			continue
+		
+		#print("<<6>>")
+		best_pick_position = point_on_seg
+		best_dist = dist
+		best_handle = h
+		#print("best_handle ", best_handle)
+		#print("<<7>>")
+	
+	#print("bar")
+	if !best_handle:
+		return null
+	
+	#print("foo")
+	var result:PickHandleResult = PickHandleResult.new()
+	result.handle = best_handle
+	result.position = best_pick_position
+	#print("result ", result)
+	return result
+
+func active_node_changed():
+	setup_tool()
+
+func active_node_updated():
+	setup_tool()
+
+func _activate(builder:CyclopsLevelBuilder):
+	super._activate(builder)
+	
+	builder.mode = CyclopsLevelBuilder.Mode.EDIT
+	builder.edit_mode = CyclopsLevelBuilder.EditMode.EDGE
+	builder.active_node_changed.connect(active_node_changed)
+	
+	setup_tool()
+	
+	
+func _deactivate():
+	super._deactivate()
+	builder.active_node_changed.disconnect(active_node_changed)
+
+	var global_scene:CyclopsGlobalScene = builder.get_global_scene()
+	global_scene.set_custom_gizmo(null)
+	
+
+func start_drag(viewport_camera:Camera3D, event:InputEvent):
+	var e:InputEventMouseMotion = event
+	move_constraint = MoveConstraint.Type.NONE
+
+	if gizmo_translate:
+	
+		var origin:Vector3 = viewport_camera.project_ray_origin(e.position)
+		var dir:Vector3 = viewport_camera.project_ray_normal(e.position)
+		
+		var part_res:GizmoTranslate.IntersectResult = gizmo_translate.intersect(origin, dir, viewport_camera)
+		if part_res:
+			#print("Gizmo hit ", part_res.part)
+			match part_res.part:
+				GizmoTranslate.Part.AXIS_X:
+					move_constraint = MoveConstraint.Type.AXIS_X
+				GizmoTranslate.Part.AXIS_Y:
+					move_constraint = MoveConstraint.Type.AXIS_Y
+				GizmoTranslate.Part.AXIS_Z:
+					move_constraint = MoveConstraint.Type.AXIS_Z
+				GizmoTranslate.Part.PLANE_XY:
+					move_constraint = MoveConstraint.Type.PLANE_XY
+				GizmoTranslate.Part.PLANE_XZ:
+					move_constraint = MoveConstraint.Type.PLANE_XZ
+				GizmoTranslate.Part.PLANE_YZ:
+					move_constraint = MoveConstraint.Type.PLANE_YZ
+		
+			drag_handle_start_pos = part_res.pos_world
+#			drag_handle_start_pos = gizmo_translate.global_position
+			#var grid_step_size:float = pow(2, builder.get_global_scene().grid_size)
+
+			#drag_handle_start_pos = MathUtil.snap_to_grid(start_pos, grid_step_size)
+			#drag_handle_start_pos = builder.get_snapping_manager().snap_point(start_pos, SnappingQuery.new(viewport_camera))
+
+	#		print("res obj %s" % result.object.get_path())
+			var sel_blocks:Array[CyclopsBlock] = builder.get_selected_blocks()
+			if !sel_blocks.is_empty():
+				
+				tool_state = ToolState.DRAGGING
+				#print("Move block")
+				
+				cmd_move_edge = CommandMoveEdges.new()
+				cmd_move_edge.builder = builder
+
+				for block in sel_blocks:
+					var vol:ConvexVolume = block.control_mesh
+					for e_idx in vol.edges.size():
+						var edge:ConvexVolume.EdgeInfo = vol.edges[e_idx]
+						if edge.selected:
+							cmd_move_edge.add_edge(block.get_path(), e_idx)
+
+			return
+
+
+	if e.alt_pressed:
+		move_constraint = MoveConstraint.Type.AXIS_Y
+	else:
+		move_constraint = MoveConstraint.Type.PLANE_XZ
+		
+	var res:PickHandleResult = pick_closest_handle(viewport_camera, drag_mouse_start_pos, builder.handle_screen_radius)
+
+	if res:
+		var handle:HandleEdge = res.handle
+#		drag_handle = handle
+#					drag_handle_start_pos = handle.p_ref
+		drag_handle_start_pos = res.position
+		tool_state = ToolState.DRAGGING
+		#print("drag habdle start pos ", drag_handle_start_pos)
+
+		cmd_move_edge = CommandMoveEdges.new()
+		cmd_move_edge.builder = builder
+
+		var handle_block:CyclopsBlock = builder.get_node(handle.block_path)
+		if handle_block.control_mesh.edges[handle.edge_index].selected:
+			var sel_blocks:Array[CyclopsBlock] = builder.get_selected_blocks()
+			for block in sel_blocks:
+				var vol:ConvexVolume = block.control_mesh
+				for e_idx in vol.edges.size():
+					var edge:ConvexVolume.EdgeInfo = vol.edges[e_idx]
+					if edge.selected:
+						cmd_move_edge.add_edge(block.get_path(), e_idx)
+		else:
+			cmd_move_edge.add_edge(handle.block_path, handle.edge_index)
+			
+		return
+	
+	#Drag selectio rectangle
+	tool_state = ToolState.DRAG_SELECTION
+	drag_select_start_pos = e.position
+	drag_select_to_pos = e.position
+
+func _gui_input(viewport_camera:Camera3D, event:InputEvent)->bool:	
+		
+	var gui_result = super._gui_input(viewport_camera, event)
+	if gui_result:
+		return true
+	
+#	var grid_step_size:float = pow(2, builder.get_global_scene().grid_size)
+
+
+	if event is InputEventKey:
+		var e:InputEventKey = event
+		
+		if e.keycode == KEY_ESCAPE:
+			if e.is_pressed():
+				if cmd_move_edge:
+					cmd_move_edge.undo_it()
+					cmd_move_edge = null
+					tool_state = ToolState.NONE
+					
+					setup_tool()
+					
+			return true
+
+		elif e.keycode == KEY_A:
+
+			if e.is_pressed():
+				var cmd:CommandSelectEdges = CommandSelectEdges.new()
+				cmd.builder = builder
+				
+				if e.alt_pressed:
+					var sel_blocks:Array[CyclopsBlock] = builder.get_selected_blocks()
+					for block in sel_blocks:
+						cmd.add_edges(block.get_path(), [])
+						
+				else:
+					var sel_blocks:Array[CyclopsBlock] = builder.get_selected_blocks()
+					for block in sel_blocks:
+						for e_idx in block.control_mesh.edges.size():
+							cmd.add_edge(block.get_path(), e_idx)
+
+				cmd.selection_type = Selection.Type.REPLACE
+
+				if cmd.will_change_anything():
+					var undo:EditorUndoRedoManager = builder.get_undo_redo()
+
+					cmd.add_to_undo_manager(undo)
+								
+		elif e.keycode == KEY_G:
+			
+			if e.is_pressed() && tool_state == ToolState.NONE:
+				var sel_blocks:Array[CyclopsBlock] = builder.get_selected_blocks()
+				if !sel_blocks.is_empty():
+
+					tool_state = ToolState.MOVE_HANDLES_CLICK
+					move_constraint = MoveConstraint.Type.PLANE_VIEWPORT
+
+					drag_handle_start_pos = Vector3.INF
+					
+					cmd_move_edge = CommandMoveEdges.new()
+					cmd_move_edge.builder = builder
+
+					for block in sel_blocks:
+						var vol:ConvexVolume = block.control_mesh
+						for e_idx in vol.edges.size():
+							var edge:ConvexVolume.EdgeInfo = vol.edges[e_idx]
+							if edge.selected:
+								cmd_move_edge.add_edge(block.get_path(), e_idx)
+					
+			return true
+
+		elif e.keycode == KEY_X:
+			if tool_state == ToolState.MOVE_HANDLES_CLICK:
+				if e.shift_pressed:
+					move_constraint = MoveConstraint.Type.PLANE_YZ
+				else:
+					move_constraint = MoveConstraint.Type.AXIS_X
+			return true
+
+		elif e.keycode == KEY_Y:
+			if tool_state == ToolState.MOVE_HANDLES_CLICK:
+				if e.shift_pressed:
+					move_constraint = MoveConstraint.Type.PLANE_XZ
+				else:
+					move_constraint = MoveConstraint.Type.AXIS_Y
+			return true
+
+		elif e.keycode == KEY_Z:
+			if tool_state == ToolState.MOVE_HANDLES_CLICK:
+				if e.shift_pressed:
+					move_constraint = MoveConstraint.Type.PLANE_XY
+				else:
+					move_constraint = MoveConstraint.Type.AXIS_Z
+			return true
+
+	if event is InputEventMouseButton:
+		
+		var e:InputEventMouseButton = event
+		if e.button_index == MOUSE_BUTTON_LEFT:
+
+			if e.is_pressed():
+				
+				if tool_state == ToolState.NONE:
+					drag_mouse_start_pos = e.position
+					tool_state = ToolState.READY
+					
+				return true
+			else:
+#				print("bn up: state %s" % tool_state)
+				if tool_state == ToolState.READY:
+					#print("cmd select")
+					var cmd:CommandSelectEdges = CommandSelectEdges.new()
+					cmd.builder = builder
+					
+					var sel_blocks:Array[CyclopsBlock]
+					for block in sel_blocks:
+						cmd.add_edges(block.get_path(), [])
+
+					cmd.selection_type = Selection.choose_type(e.shift_pressed, e.ctrl_pressed)
+
+					#print("handles.size() ", handles.size())
+					var res:PickHandleResult = pick_closest_handle(viewport_camera, e.position, builder.handle_screen_radius)
+					if res:
+						var handle:HandleEdge = res.handle
+
+						#print("handle %s" % handle)
+
+						cmd.add_edge(handle.block_path, handle.edge_index)
+						#print("selectibg %s" % handle.vertex_index)
+
+					if cmd.will_change_anything():					
+						var undo:EditorUndoRedoManager = builder.get_undo_redo()
+						cmd.add_to_undo_manager(undo)
+										
+					tool_state = ToolState.NONE
+					setup_tool()
+					
+				elif tool_state == ToolState.DRAGGING:
+					#Finish drag
+					#print("cmd finish drag")
+					var undo:EditorUndoRedoManager = builder.get_undo_redo()
+
+					cmd_move_edge.add_to_undo_manager(undo)
+					
+					tool_state = ToolState.NONE
+					cmd_move_edge = null
+
+				elif tool_state == ToolState.MOVE_HANDLES_CLICK:
+					var undo:EditorUndoRedoManager = builder.get_undo_redo()
+					cmd_move_edge.add_to_undo_manager(undo)
+					
+					tool_state = ToolState.NONE
+					cmd_move_edge = null
+
+				elif tool_state == ToolState.DRAG_SELECTION:
+					
+					var frustum:Array[Plane] = MathUtil.calc_frustum_camera_rect(viewport_camera, drag_select_start_pos, drag_select_to_pos)
+
+					var cmd:CommandSelectEdges = CommandSelectEdges.new()
+					cmd.builder = builder
+
+					var sel_blocks:Array[CyclopsBlock] = builder.get_selected_blocks()
+					for block in sel_blocks:
+						
+						for e_idx in block.control_mesh.edges.size():
+							var edge:ConvexVolume.EdgeInfo = block.control_mesh.edges[e_idx]
+							var point_w:Vector3 = block.global_transform * edge.get_midpoint()
+							
+							var origin:Vector3 = viewport_camera.project_ray_origin(e.position)
+#							var dir:Vector3 = viewport_camera.project_ray_normal(e.position)
+
+							var global_scene:CyclopsGlobalScene = builder.get_global_scene()
+
+							#Obstruction check
+							if !global_scene.xray_mode && builder.display_mode != DisplayMode.Type.WIRE:
+								var result:IntersectResults = builder.intersect_ray_closest(origin, point_w - origin)
+								if result:
+									var res_point_w:Vector3 = result.get_world_position()
+									if !res_point_w.is_equal_approx(point_w):
+										continue
+							
+							if MathUtil.frustum_contians_point(frustum, point_w):
+								cmd.add_edge(block.get_path(), e_idx)
+
+					cmd.selection_type = Selection.choose_type(e.shift_pressed, e.ctrl_pressed)
+
+					if cmd.will_change_anything():
+						var undo:EditorUndoRedoManager = builder.get_undo_redo()
+
+						cmd.add_to_undo_manager(undo)
+					
+					tool_state = ToolState.NONE
+					#setup_tool()
+					
+				return true
+				
+		elif e.button_index == MOUSE_BUTTON_RIGHT:
+			if e.is_pressed():
+				#Right click cancel
+				if cmd_move_edge:
+					cmd_move_edge.undo_it()
+					cmd_move_edge = null
+					tool_state = ToolState.NONE
+					
+					setup_tool()
+					return true
+					
+			return false
+				
+	elif event is InputEventMouseMotion:
+		var e:InputEventMouseMotion = event
+
+		if (e.button_mask & MOUSE_BUTTON_MASK_MIDDLE):
+			return false		
+			
+		if tool_state == ToolState.READY:
+			if e.position.distance_squared_to(drag_mouse_start_pos) > MathUtil.square(builder.drag_start_radius):
+				start_drag(viewport_camera, event)
+			
+			return true
+			
+		elif tool_state == ToolState.DRAGGING || tool_state == ToolState.MOVE_HANDLES_CLICK:
+
+			var origin:Vector3 = viewport_camera.project_ray_origin(e.position)
+			var dir:Vector3 = viewport_camera.project_ray_normal(e.position)
+
+			if !drag_handle_start_pos.is_finite():
+				#If start point set to infinite, replace with point along view ray
+				drag_handle_start_pos = origin + dir * 20
+				
+			var active_block:Node3D = builder.get_active_block()
+			var xform_basis:Basis = calc_gizmo_basis(average_normal, active_block, viewport_camera, settings.transform_space)
+			
+			#match settings.transform_space:
+				#TransformSpace.Type.GLOBAL:
+					#xform_basis = Basis.IDENTITY
+				#TransformSpace.Type.LOCAL:
+					#var active_block:Node3D = builder.get_active_block()
+					#xform_basis = active_block.basis
+				#TransformSpace.Type.NORMAL:
+					#var up:Vector3 = Vector3.UP
+					#var x:Vector3 = up.cross(average_normal).normalized()
+					#var y:Vector3 = average_normal.cross(x)
+					#xform_basis = Basis(x, y, average_normal)
+				#TransformSpace.Type.VIEW:
+					#xform_basis = viewport_camera.global_basis
+				#TransformSpace.Type.PARENT:
+					#var active_block:Node3D = builder.get_active_block().get_parent_node_3d()
+					#xform_basis = active_block.basis
+
+			var drag_to:Vector3
+			match move_constraint:
+				MoveConstraint.Type.AXIS_X:
+					drag_to = MathUtil.closest_point_on_line(origin, dir, drag_handle_start_pos, xform_basis.x)
+				MoveConstraint.Type.AXIS_Y:
+					drag_to = MathUtil.closest_point_on_line(origin, dir, drag_handle_start_pos, xform_basis.y)
+				MoveConstraint.Type.AXIS_Z:
+					drag_to = MathUtil.closest_point_on_line(origin, dir, drag_handle_start_pos, xform_basis.z)
+				MoveConstraint.Type.PLANE_XY:
+					drag_to = MathUtil.intersect_plane(origin, dir, drag_handle_start_pos, xform_basis.z)
+				MoveConstraint.Type.PLANE_XZ:
+					drag_to = MathUtil.intersect_plane(origin, dir, drag_handle_start_pos, xform_basis.y)
+				MoveConstraint.Type.PLANE_YZ:
+					drag_to = MathUtil.intersect_plane(origin, dir, drag_handle_start_pos, xform_basis.x)
+				MoveConstraint.Type.PLANE_VIEWPORT:
+					drag_to = MathUtil.intersect_plane(origin, dir, drag_handle_start_pos, viewport_camera.global_transform.basis.z)
+			
+			var offset:Vector3 = drag_to - drag_handle_start_pos
+			offset = builder.get_snapping_manager().snap_point(offset, SnappingQuery.new(viewport_camera))
+			#drag_to = drag_handle_start_pos + offset
+			
+			cmd_move_edge.move_offset = offset
+			cmd_move_edge.do_it()
+
+			setup_tool()
+#			draw_tool()
+			return true
+
+		elif tool_state == ToolState.DRAG_SELECTION:
+			drag_select_to_pos = e.position
+			return true
+					
+	return false

addons/cyclops_level_builder/tools/tool_edit_edge_settings.gd

@@ -0,0 +1,39 @@
+# MIT License
+#
+# Copyright (c) 2023 Mark McKay
+# https://github.com/blackears/cyclopsLevelBuilder
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+@tool
+extends Resource
+class_name ToolEditEdgeSettings
+
+@export var transform_space:TransformSpace.Type = TransformSpace.Type.GLOBAL
+@export var triplanar_lock_uvs:bool = true
+
+func load_from_cache(cache:Dictionary):
+	transform_space = cache.get("transform_space", TransformSpace.Type.GLOBAL)
+	triplanar_lock_uvs = cache.get("triplanar_lock_uvs", true)
+	
+func save_to_cache():
+	return {
+		"transform_space": transform_space,
+		"triplanar_lock_uvs": triplanar_lock_uvs,
+	}

addons/cyclops_level_builder/tools/tool_edit_edge_settings_editor.gd

@@ -0,0 +1,60 @@
+# MIT License
+#
+# Copyright (c) 2023 Mark McKay
+# https://github.com/blackears/cyclopsLevelBuilder
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+@tool
+extends PanelContainer
+class_name ToolEditEdgeSettingsEditor
+
+var settings:ToolEditEdgeSettings:
+	get:
+		return settings
+	set(value):
+		settings = value
+		dirty = true
+
+var dirty:bool = true
+
+
+func _ready():
+	%transform_space.clear()
+	for text in TransformSpace.Type.keys():
+		%transform_space.add_item(text)
+
+func _process(delta):
+	if dirty:
+		update()
+		dirty = false
+
+func update():
+	%transform_space.selected = settings.transform_space
+	%check_correct_uvs.button_pressed = settings.triplanar_lock_uvs
+	
+	pass
+
+
+func _on_transform_space_item_selected(index):
+	settings.transform_space = index
+
+
+func _on_check_correct_uvs_toggled(toggled_on):
+	settings.triplanar_lock_uvs = toggled_on

addons/cyclops_level_builder/tools/tool_edit_edge_settings_editor.tscn

@@ -0,0 +1,49 @@
+[gd_scene load_steps=2 format=3 uid="uid://d3hfpe2pe0ml2"]
+
+[ext_resource type="Script" path="res://addons/cyclops_level_builder/tools/tool_edit_edge_settings_editor.gd" id="1_a1oyt"]
+
+[node name="ToolMoveSettingsEditor" type="PanelContainer"]
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+offset_right = -929.0
+offset_bottom = -415.0
+grow_horizontal = 2
+grow_vertical = 2
+script = ExtResource("1_a1oyt")
+
+[node name="GridContainer" type="GridContainer" parent="."]
+layout_mode = 2
+columns = 2
+
+[node name="Label" type="Label" parent="GridContainer"]
+layout_mode = 2
+text = "Transform space"
+
+[node name="transform_space" type="OptionButton" parent="GridContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+item_count = 5
+selected = 0
+popup/item_0/text = "GLOBAL"
+popup/item_0/id = 0
+popup/item_1/text = "LOCAL"
+popup/item_1/id = 1
+popup/item_2/text = "NORMAL"
+popup/item_2/id = 2
+popup/item_3/text = "VIEW"
+popup/item_3/id = 3
+popup/item_4/text = "PARENT"
+popup/item_4/id = 4
+
+[node name="Label2" type="Label" parent="GridContainer"]
+layout_mode = 2
+text = "Triplanar lock UVs"
+
+[node name="check_correct_uvs" type="CheckBox" parent="GridContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+text = "On"
+
+[connection signal="item_selected" from="GridContainer/transform_space" to="." method="_on_transform_space_item_selected"]
+[connection signal="toggled" from="GridContainer/check_correct_uvs" to="." method="_on_check_correct_uvs_toggled"]

addons/cyclops_level_builder/tools/tool_edit_face.gd

@@ -0,0 +1,642 @@
+# MIT License
+#
+# Copyright (c) 2023 Mark McKay
+# https://github.com/blackears/cyclopsLevelBuilder
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+@tool
+extends ToolEditBase
+class_name ToolEditFace
+
+const TOOL_ID:String = "edit_face"
+
+var handles:Array[HandleFace] = []
+
+enum ToolState { NONE, READY, DRAGGING, MOVE_HANDLES_CLICK, DRAG_SELECTION }
+var tool_state:ToolState = ToolState.NONE
+
+#var drag_handle:HandleFace
+var drag_mouse_start_pos:Vector2
+var drag_handle_start_pos:Vector3
+			
+#enum MoveConstraint { NONE, AXIS_X, AXIS_Y, AXIS_Z, PLANE_XY, PLANE_XZ, PLANE_YZ, PLANE_VIEWPORT }
+var move_constraint:MoveConstraint.Type = MoveConstraint.Type.NONE
+
+var gizmo_translate:Node3D
+
+var cmd_move_face:CommandMoveFaces
+
+
+class PickHandleResult extends RefCounted:
+	var handle:HandleFace
+	var position:Vector3
+	
+var settings:ToolEditFaceSettings = ToolEditFaceSettings.new()
+
+var average_normal:Vector3 = Vector3.UP
+
+func _get_tool_id()->String:
+	return TOOL_ID
+
+func _get_tool_properties_editor()->Control:
+	var ed:ToolEditFaceSettingsEditor = preload("res://addons/cyclops_level_builder/tools/tool_edit_face_settings_editor.tscn").instantiate()
+	
+	ed.settings = settings
+	
+	return ed
+	
+func draw_gizmo(viewport_camera:Camera3D):
+	var global_scene:CyclopsGlobalScene = builder.get_global_scene()
+	if !gizmo_translate:
+		gizmo_translate = preload("res://addons/cyclops_level_builder/tools/gizmos/gizmo_translate.tscn").instantiate()
+	
+	var origin:Vector3
+	var count:int = 0
+	for h in handles:
+		var block:CyclopsBlock = builder.get_node(h.block_path)
+		if !block:
+			continue
+		var l2w:Transform3D = block.global_transform
+		
+		var f:ConvexVolume.FaceInfo = block.control_mesh.faces[h.face_index]
+		if f.selected:
+#			print("adding midpoint ", e.get_midpoint())
+			origin += l2w * f.get_centroid()
+			count += 1
+
+	if count == 0:
+		global_scene.set_custom_gizmo(null)
+	else:
+		origin /= count
+		global_scene.set_custom_gizmo(gizmo_translate)
+#		gizmo_translate.global_transform.origin = origin
+		var active_block:Node3D = builder.get_active_block()
+		
+		gizmo_translate.global_basis = calc_gizmo_basis(average_normal, active_block, viewport_camera, settings.transform_space)
+		gizmo_translate.global_position = origin
+		#match settings.transform_space:
+			#TransformSpace.Type.GLOBAL:
+				#var xform:Transform3D = Transform3D.IDENTITY
+				#xform.origin = origin
+				#gizmo_translate.global_transform = xform
+			#TransformSpace.Type.LOCAL:
+				#var xform:Transform3D = active_block.global_transform
+				#gizmo_translate.global_transform = xform
+				#gizmo_translate.global_position = origin
+			#TransformSpace.Type.NORMAL:
+				#var up:Vector3 = Vector3.UP
+				#var x:Vector3 = up.cross(average_normal).normalized()
+				#var y:Vector3 = average_normal.cross(x)
+				#gizmo_translate.global_basis = Basis(x, y, average_normal)
+				#gizmo_translate.global_position = origin
+			#TransformSpace.Type.VIEW:
+				#gizmo_translate.global_basis = viewport_camera.global_basis
+				#gizmo_translate.global_position = origin
+			#TransformSpace.Type.PARENT:
+				#var xform:Transform3D = active_block.get_parent_node_3d().global_transform
+				#gizmo_translate.global_transform = xform
+
+
+func _draw_tool(viewport_camera:Camera3D):
+	var global_scene:CyclopsGlobalScene = builder.get_global_scene()
+	global_scene.clear_tool_mesh()
+
+	if tool_state == ToolState.DRAG_SELECTION:
+		global_scene.draw_screen_rect(viewport_camera, drag_select_start_pos, drag_select_to_pos, global_scene.selection_rect_material)
+	
+	#var blocks_root:CyclopsBlocks = builder.active_node
+	for h in handles:
+#		print("draw face %s" % h)
+		if Engine.is_editor_hint() && !builder.has_node(h.block_path):
+			continue
+			
+		var block:CyclopsBlock = builder.get_node(h.block_path)
+		var f:ConvexVolume.FaceInfo = block.control_mesh.faces[h.face_index]
+
+		var active:bool = block.control_mesh.active_face == h.face_index		
+		global_scene.draw_vertex(h.p_center, pick_vertex_material(global_scene, f.selected, active))
+		
+		var l2w:Transform3D = block.global_transform
+		#var w2l:Transform3D = block.global_transform.affine_inverse()
+		
+		if f.selected:
+			var edge_loop:PackedVector3Array = f.get_points()
+			for p_idx in edge_loop.size():
+				edge_loop[p_idx] += f.normal * builder.tool_overlay_extrude
+			global_scene.draw_loop(l2w * edge_loop, true, pick_material(global_scene, f.selected, active))
+			
+			var tris:PackedVector3Array = f.get_trianges()
+			for p_idx in tris.size():
+				tris[p_idx] += f.normal * builder.tool_overlay_extrude
+			
+#			print("draw face %s %s %s" % [h.face_index, f.selected, f.active])
+			var mat:Material = global_scene.tool_edit_active_fill_material if active else global_scene.tool_edit_selected_fill_material
+			global_scene.draw_triangles(l2w * tris, mat)
+		
+	draw_gizmo(viewport_camera)
+	
+func setup_tool():
+	handles = []
+	#print("setup_tool")
+	
+	var sel_blocks:Array[CyclopsBlock] = builder.get_selected_blocks()
+	average_normal = Vector3.ZERO
+	
+	for block in sel_blocks:
+		var l2w:Transform3D = block.global_transform
+
+		var l2w_normal:Basis = l2w.basis.transposed().inverse()
+		
+		for f_idx in block.control_mesh.faces.size():
+			
+			var ctl_mesh:ConvexVolume = block.control_mesh
+			var face:ConvexVolume.FaceInfo = ctl_mesh.faces[f_idx]
+
+			var handle:HandleFace = HandleFace.new()
+			
+			var p_start:Vector3 = l2w * face.get_centroid()
+			#print("p_start %s" % p_start)
+
+			handle.p_center = p_start
+			
+			handle.face_index = f_idx
+			handle.block_path = block.get_path()
+			handles.append(handle)
+			
+			if face.selected:
+				average_normal += l2w_normal * face.get_area_vector_x2()
+	
+	average_normal = average_normal.normalized()
+	
+func pick_closest_handle(viewport_camera:Camera3D, position:Vector2, radius:float)->PickHandleResult:
+	
+	var pick_origin:Vector3 = viewport_camera.project_ray_origin(position)
+	var pick_dir:Vector3 = viewport_camera.project_ray_normal(position)
+	
+	if builder.display_mode == DisplayMode.Type.MATERIAL || builder.display_mode == DisplayMode.Type.MESH:
+		var result:IntersectResults = builder.intersect_ray_closest_selected_only(pick_origin, pick_dir)
+		if result:
+			for h in handles:
+				if h.block_path == result.object.get_path() && h.face_index == result.face_index:
+					var ret:PickHandleResult = PickHandleResult.new()
+					ret.handle = h
+					ret.position = result.get_world_position()
+					return ret
+					
+	elif builder.display_mode == DisplayMode.Type.WIRE:
+		var best_dist:float = INF
+		var best_handle:HandleFace = null
+		var best_position:Vector3
+		
+		
+		for h in handles:
+#			var h_world_pos:Vector3 = blocks_root.global_transform * h.p_ref
+			var h_world_pos:Vector3 = h.p_center
+			var h_screen_pos:Vector2 = viewport_camera.unproject_position(h_world_pos)
+			if position.distance_squared_to(h_screen_pos) > radius * radius:
+				#Failed handle radius test
+				continue
+			
+			var offset:Vector3 = h_world_pos - pick_origin
+			var parallel:Vector3 = offset.project(pick_dir)
+			var dist = parallel.dot(pick_dir)
+			if dist <= 0:
+				#Behind camera
+				continue
+			
+			#print("h pos %s ray orig %s ray dir %s offset %s para %s dist %s perp %s" % [h.position, ray_origin, ray_dir, offset, parallel, dist, perp])
+			if dist >= best_dist:
+				continue
+			
+			best_dist = dist
+			best_handle = h
+			best_position = h_world_pos
+		
+		var result:PickHandleResult = PickHandleResult.new()
+		result.handle = best_handle
+		result.position = best_position
+		return result
+	
+	return null	
+	
+
+
+func active_node_changed():
+	setup_tool()
+	
+
+func active_node_updated():
+	setup_tool()
+	#draw_tool()
+
+func _activate(builder:CyclopsLevelBuilder):
+	super._activate(builder)
+	
+	builder.mode = CyclopsLevelBuilder.Mode.EDIT
+	builder.edit_mode = CyclopsLevelBuilder.EditMode.FACE
+	builder.active_node_changed.connect(active_node_changed)
+	
+	setup_tool()
+	
+	
+func _deactivate():
+	super._deactivate()
+	builder.active_node_changed.disconnect(active_node_changed)
+
+	var global_scene:CyclopsGlobalScene = builder.get_global_scene()
+	global_scene.set_custom_gizmo(null)
+
+
+func start_drag(viewport_camera:Camera3D, event:InputEvent):
+	var e:InputEventMouseMotion = event
+	move_constraint = MoveConstraint.Type.NONE
+
+	if gizmo_translate:
+	
+		var origin:Vector3 = viewport_camera.project_ray_origin(e.position)
+		var dir:Vector3 = viewport_camera.project_ray_normal(e.position)
+		
+		var part_res:GizmoTranslate.IntersectResult = gizmo_translate.intersect(origin, dir, viewport_camera)
+		if part_res:
+			#print("Gizmo hit ", part_res.part)
+			match part_res.part:
+				GizmoTranslate.Part.AXIS_X:
+					move_constraint = MoveConstraint.Type.AXIS_X
+				GizmoTranslate.Part.AXIS_Y:
+					move_constraint = MoveConstraint.Type.AXIS_Y
+				GizmoTranslate.Part.AXIS_Z:
+					move_constraint = MoveConstraint.Type.AXIS_Z
+				GizmoTranslate.Part.PLANE_XY:
+					move_constraint = MoveConstraint.Type.PLANE_XY
+				GizmoTranslate.Part.PLANE_XZ:
+					move_constraint = MoveConstraint.Type.PLANE_XZ
+				GizmoTranslate.Part.PLANE_YZ:
+					move_constraint = MoveConstraint.Type.PLANE_YZ
+		
+			var start_pos:Vector3 = part_res.pos_world
+
+			drag_handle_start_pos = start_pos
+
+	#		print("res obj %s" % result.object.get_path())
+			var sel_blocks:Array[CyclopsBlock] = builder.get_selected_blocks()
+			if !sel_blocks.is_empty():
+				
+				tool_state = ToolState.DRAGGING
+				#print("Move block")
+				
+				cmd_move_face = CommandMoveFaces.new()
+				cmd_move_face.builder = builder
+
+				for block in sel_blocks:
+					var vol:ConvexVolume = block.control_mesh
+					for f_idx in vol.faces.size():
+						var face:ConvexVolume.FaceInfo = vol.faces[f_idx]
+						if face.selected:
+							cmd_move_face.add_face(block.get_path(), f_idx)
+
+			return
+
+
+	if e.alt_pressed:
+		move_constraint = MoveConstraint.Type.AXIS_Y
+	else:
+		move_constraint = MoveConstraint.Type.PLANE_XZ
+		
+
+	var res:PickHandleResult = pick_closest_handle(viewport_camera, drag_mouse_start_pos, builder.handle_screen_radius)
+
+	if res && res.handle:
+		#print("pick handle %s" % res.handle)
+		
+		var handle:HandleFace = res.handle
+		#drag_handle = handle
+		drag_handle_start_pos = res.position
+		#print("drag_handle_start_pos %s" % drag_handle_start_pos)
+		tool_state = ToolState.DRAGGING
+
+		cmd_move_face = CommandMoveFaces.new()
+		cmd_move_face.builder = builder
+
+		var handle_block:CyclopsBlock = builder.get_node(handle.block_path)
+		if handle_block.control_mesh.faces[handle.face_index].selected:
+			var sel_blocks:Array[CyclopsBlock] = builder.get_selected_blocks()
+			for block in sel_blocks:
+				var vol:ConvexVolume = block.control_mesh
+				for f_idx in vol.faces.size():
+					var face:ConvexVolume.FaceInfo = vol.faces[f_idx]
+					if face.selected:
+						cmd_move_face.add_face(block.get_path(), f_idx)
+
+		else:
+			cmd_move_face.add_face(handle.block_path, handle.face_index)
+			
+		return
+
+
+	#Drag selectio rectangle
+	tool_state = ToolState.DRAG_SELECTION
+	drag_select_start_pos = e.position
+	drag_select_to_pos = e.position
+	
+func _gui_input(viewport_camera:Camera3D, event:InputEvent)->bool:	
+	var gui_result = super._gui_input(viewport_camera, event)
+	if gui_result:
+		return true
+
+	if event is InputEventKey:
+		var e:InputEventKey = event
+		
+		if e.keycode == KEY_ESCAPE:
+			if e.is_pressed():
+				if cmd_move_face:
+					cmd_move_face.undo_it()
+					cmd_move_face = null
+					tool_state = ToolState.NONE
+					
+					setup_tool()
+					
+			return true
+
+		elif e.keycode == KEY_A:
+
+			if e.is_pressed():
+				var cmd:CommandSelectFaces = CommandSelectFaces.new()
+				cmd.builder = builder
+				
+				if e.alt_pressed:
+					var sel_blocks:Array[CyclopsBlock] = builder.get_selected_blocks()
+					for block in sel_blocks:
+						cmd.add_faces(block.get_path(), [])
+						
+				else:
+					var sel_blocks:Array[CyclopsBlock] = builder.get_selected_blocks()
+					for block in sel_blocks:
+						for f_idx in block.control_mesh.faces.size():
+							cmd.add_face(block.get_path(), f_idx)
+
+				cmd.selection_type = Selection.Type.REPLACE
+
+				if cmd.will_change_anything():
+					var undo:EditorUndoRedoManager = builder.get_undo_redo()
+
+					cmd.add_to_undo_manager(undo)
+					
+		elif e.keycode == KEY_G:
+			
+			if e.is_pressed() && tool_state == ToolState.NONE:
+				var sel_blocks:Array[CyclopsBlock] = builder.get_selected_blocks()
+				if !sel_blocks.is_empty():
+
+					tool_state = ToolState.MOVE_HANDLES_CLICK
+					move_constraint = MoveConstraint.Type.PLANE_VIEWPORT
+
+					drag_handle_start_pos = Vector3.INF
+					
+					cmd_move_face = CommandMoveFaces.new()
+					cmd_move_face.builder = builder
+
+					for block in sel_blocks:
+						var vol:ConvexVolume = block.control_mesh
+						for f_idx in vol.faces.size():
+							var face:ConvexVolume.FaceInfo = vol.faces[f_idx]
+							if face.selected:
+								cmd_move_face.add_face(block.get_path(), f_idx)
+					
+			return true
+
+		elif e.keycode == KEY_X:
+			if tool_state == ToolState.MOVE_HANDLES_CLICK:
+				if e.shift_pressed:
+					move_constraint = MoveConstraint.Type.PLANE_YZ
+				else:
+					move_constraint = MoveConstraint.Type.AXIS_X
+			return true
+
+		elif e.keycode == KEY_Y:
+			if tool_state == ToolState.MOVE_HANDLES_CLICK:
+				if e.shift_pressed:
+					move_constraint = MoveConstraint.Type.PLANE_XZ
+				else:
+					move_constraint = MoveConstraint.Type.AXIS_Y
+			return true
+
+		elif e.keycode == KEY_Z:
+			if tool_state == ToolState.MOVE_HANDLES_CLICK:
+				if e.shift_pressed:
+					move_constraint = MoveConstraint.Type.PLANE_XY
+				else:
+					move_constraint = MoveConstraint.Type.AXIS_Z
+			return true
+
+	if event is InputEventMouseButton:
+		
+		var e:InputEventMouseButton = event
+		if e.button_index == MOUSE_BUTTON_LEFT:
+
+			if e.is_pressed():
+
+				if tool_state == ToolState.NONE:
+					drag_mouse_start_pos = e.position
+					tool_state = ToolState.READY
+					
+				return true
+			else:
+#				print("bn up: state %s" % tool_state)
+				if tool_state == ToolState.READY:
+					#print("cmd select")
+
+					var cmd:CommandSelectFaces = CommandSelectFaces.new()
+					cmd.builder = builder
+					
+					var sel_blocks:Array[CyclopsBlock] = builder.get_selected_blocks()
+					for block in sel_blocks:
+						cmd.add_faces(block.get_path(), [])
+					
+					var res:PickHandleResult = pick_closest_handle(viewport_camera, e.position, builder.handle_screen_radius)
+					if res:
+						var handle:HandleFace = res.handle
+						#print("pick handle %s" % handle)
+							
+						cmd.add_face(handle.block_path, handle.face_index)
+						#print("selecting %s" % handle.face_index)
+						
+					cmd.selection_type = Selection.choose_type(e.shift_pressed, e.ctrl_pressed)
+						
+					if cmd.will_change_anything():
+						var undo:EditorUndoRedoManager = builder.get_undo_redo()
+						cmd.add_to_undo_manager(undo)
+					
+					
+					tool_state = ToolState.NONE
+					setup_tool()
+					
+				elif tool_state == ToolState.DRAGGING:
+					#Finish drag
+					var undo:EditorUndoRedoManager = builder.get_undo_redo()
+
+					cmd_move_face.add_to_undo_manager(undo)
+					
+					tool_state = ToolState.NONE
+					cmd_move_face = null
+					setup_tool()
+				
+
+				elif tool_state == ToolState.MOVE_HANDLES_CLICK:
+					var undo:EditorUndoRedoManager = builder.get_undo_redo()
+					cmd_move_face.add_to_undo_manager(undo)
+					
+					tool_state = ToolState.NONE
+					cmd_move_face = null
+					
+				elif tool_state == ToolState.DRAG_SELECTION:
+					
+					var frustum:Array[Plane] = MathUtil.calc_frustum_camera_rect(viewport_camera, drag_select_start_pos, drag_select_to_pos)
+
+					var cmd:CommandSelectFaces = CommandSelectFaces.new()
+					cmd.builder = builder
+
+					var sel_blocks:Array[CyclopsBlock] = builder.get_selected_blocks()
+					for block in sel_blocks:
+						#print("block ", block.name)
+						
+						for f_idx in block.control_mesh.faces.size():
+							var face:ConvexVolume.FaceInfo = block.control_mesh.faces[f_idx]
+							var point_w:Vector3 = block.global_transform * face.get_centroid()
+							
+							var origin:Vector3 = viewport_camera.project_ray_origin(e.position)
+
+							var global_scene:CyclopsGlobalScene = builder.get_global_scene()
+
+							#print("precheck")
+							#Obstruction check
+							if !global_scene.xray_mode && builder.display_mode != DisplayMode.Type.WIRE:
+								var result:IntersectResults = builder.intersect_ray_closest(origin, point_w - origin)
+								if result:
+									var res_point_w:Vector3 = result.get_world_position()
+									if !res_point_w.is_equal_approx(point_w):
+										continue
+							
+							#print("frustum check ", point_w)
+							if MathUtil.frustum_contians_point(frustum, point_w):
+								#print("frustim hit ", point_w)
+								cmd.add_face(block.get_path(), f_idx)
+
+					cmd.selection_type = Selection.choose_type(e.shift_pressed, e.ctrl_pressed)
+
+					if cmd.will_change_anything():
+						var undo:EditorUndoRedoManager = builder.get_undo_redo()
+
+						cmd.add_to_undo_manager(undo)
+					
+					tool_state = ToolState.NONE
+					
+				return true
+				
+		elif e.button_index == MOUSE_BUTTON_RIGHT:
+			if e.is_pressed():
+				#Right click cancel
+				if cmd_move_face:
+					cmd_move_face.undo_it()
+					cmd_move_face = null
+					tool_state = ToolState.NONE
+					
+					setup_tool()
+					return true
+					
+			return false
+
+	elif event is InputEventMouseMotion:
+		var e:InputEventMouseMotion = event
+
+		if (e.button_mask & MOUSE_BUTTON_MASK_MIDDLE):
+			return false		
+			
+		if tool_state == ToolState.READY:
+			if e.position.distance_squared_to(drag_mouse_start_pos) > MathUtil.square(builder.drag_start_radius):
+				start_drag(viewport_camera, event)
+			return true
+				
+			
+		elif tool_state == ToolState.DRAGGING || tool_state == ToolState.MOVE_HANDLES_CLICK:
+
+			var origin:Vector3 = viewport_camera.project_ray_origin(e.position)
+			var dir:Vector3 = viewport_camera.project_ray_normal(e.position)
+
+
+			if !drag_handle_start_pos.is_finite():
+				#If start point set to infinite, replace with point along view ray
+				drag_handle_start_pos = origin + dir * 20
+				
+			var active_block:Node3D = builder.get_active_block()
+			var xform_basis:Basis = calc_gizmo_basis(average_normal, active_block, viewport_camera, settings.transform_space)
+			
+			#match settings.transform_space:
+				#TransformSpace.Type.GLOBAL:
+					#xform_basis = Basis.IDENTITY
+				#TransformSpace.Type.LOCAL:
+					#var active_block:Node3D = builder.get_active_block()
+					#xform_basis = active_block.basis
+				#TransformSpace.Type.NORMAL:
+					#var up:Vector3 = Vector3.UP
+					#var x:Vector3 = up.cross(average_normal).normalized()
+					#var y:Vector3 = average_normal.cross(x)
+					#xform_basis = Basis(x, y, average_normal)
+				#TransformSpace.Type.VIEW:
+					#xform_basis = viewport_camera.global_basis
+				#TransformSpace.Type.PARENT:
+					#var active_block:Node3D = builder.get_active_block().get_parent_node_3d()
+					#xform_basis = active_block.basis
+
+			var drag_to:Vector3
+			match move_constraint:
+				MoveConstraint.Type.AXIS_X:
+					drag_to = MathUtil.closest_point_on_line(origin, dir, drag_handle_start_pos, xform_basis.x)
+				MoveConstraint.Type.AXIS_Y:
+					drag_to = MathUtil.closest_point_on_line(origin, dir, drag_handle_start_pos, xform_basis.y)
+				MoveConstraint.Type.AXIS_Z:
+					drag_to = MathUtil.closest_point_on_line(origin, dir, drag_handle_start_pos, xform_basis.z)
+				MoveConstraint.Type.PLANE_XY:
+					drag_to = MathUtil.intersect_plane(origin, dir, drag_handle_start_pos, xform_basis.z)
+				MoveConstraint.Type.PLANE_XZ:
+					drag_to = MathUtil.intersect_plane(origin, dir, drag_handle_start_pos, xform_basis.y)
+				MoveConstraint.Type.PLANE_YZ:
+					drag_to = MathUtil.intersect_plane(origin, dir, drag_handle_start_pos, xform_basis.x)
+				MoveConstraint.Type.PLANE_VIEWPORT:
+					drag_to = MathUtil.intersect_plane(origin, dir, drag_handle_start_pos, viewport_camera.global_transform.basis.z)
+
+			
+			var offset = drag_to - drag_handle_start_pos
+#			offset = MathUtil.snap_to_grid(offset, grid_step_size)
+			offset = builder.get_snapping_manager().snap_point(offset, SnappingQuery.new(viewport_camera))
+
+			#print("offset %s" % offset)
+			
+			cmd_move_face.move_offset = offset
+			cmd_move_face.do_it()
+
+			setup_tool()
+			return true
+
+		elif tool_state == ToolState.DRAG_SELECTION:
+			drag_select_to_pos = e.position
+			return true
+		
+	return false				
+				

addons/cyclops_level_builder/tools/tool_edit_face_settings.gd

@@ -0,0 +1,39 @@
+# MIT License
+#
+# Copyright (c) 2023 Mark McKay
+# https://github.com/blackears/cyclopsLevelBuilder
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+@tool
+extends Resource
+class_name ToolEditFaceSettings
+
+@export var transform_space:TransformSpace.Type = TransformSpace.Type.GLOBAL
+@export var triplanar_lock_uvs:bool = true
+
+func load_from_cache(cache:Dictionary):
+	transform_space = cache.get("transform_space", TransformSpace.Type.GLOBAL)
+	triplanar_lock_uvs = cache.get("triplanar_lock_uvs", true)
+	
+func save_to_cache():
+	return {
+		"transform_space": transform_space,
+		"triplanar_lock_uvs": triplanar_lock_uvs,
+	}

addons/cyclops_level_builder/tools/tool_edit_face_settings_editor.gd

@@ -0,0 +1,60 @@
+# MIT License
+#
+# Copyright (c) 2023 Mark McKay
+# https://github.com/blackears/cyclopsLevelBuilder
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+@tool
+extends PanelContainer
+class_name ToolEditFaceSettingsEditor
+
+var settings:ToolEditFaceSettings:
+	get:
+		return settings
+	set(value):
+		settings = value
+		dirty = true
+
+var dirty:bool = true
+
+
+func _ready():
+	%transform_space.clear()
+	for text in TransformSpace.Type.keys():
+		%transform_space.add_item(text)
+
+func _process(delta):
+	if dirty:
+		update()
+		dirty = false
+
+func update():
+	%transform_space.selected = settings.transform_space
+	%check_correct_uvs.button_pressed = settings.triplanar_lock_uvs
+	
+	pass
+
+
+func _on_transform_space_item_selected(index):
+	settings.transform_space = index
+
+
+func _on_check_correct_uvs_toggled(toggled_on):
+	settings.triplanar_lock_uvs = toggled_on

addons/cyclops_level_builder/tools/tool_edit_face_settings_editor.tscn

@@ -0,0 +1,49 @@
+[gd_scene load_steps=2 format=3 uid="uid://bxy3qukjatj4l"]
+
+[ext_resource type="Script" path="res://addons/cyclops_level_builder/tools/tool_edit_face_settings_editor.gd" id="1_i7hy2"]
+
+[node name="ToolMoveSettingsEditor" type="PanelContainer"]
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+offset_right = -929.0
+offset_bottom = -415.0
+grow_horizontal = 2
+grow_vertical = 2
+script = ExtResource("1_i7hy2")
+
+[node name="GridContainer" type="GridContainer" parent="."]
+layout_mode = 2
+columns = 2
+
+[node name="Label" type="Label" parent="GridContainer"]
+layout_mode = 2
+text = "Transform space"
+
+[node name="transform_space" type="OptionButton" parent="GridContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+item_count = 5
+selected = 0
+popup/item_0/text = "GLOBAL"
+popup/item_0/id = 0
+popup/item_1/text = "LOCAL"
+popup/item_1/id = 1
+popup/item_2/text = "NORMAL"
+popup/item_2/id = 2
+popup/item_3/text = "VIEW"
+popup/item_3/id = 3
+popup/item_4/text = "PARENT"
+popup/item_4/id = 4
+
+[node name="Label2" type="Label" parent="GridContainer"]
+layout_mode = 2
+text = "Triplanar lock UVs"
+
+[node name="check_correct_uvs" type="CheckBox" parent="GridContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+text = "On"
+
+[connection signal="item_selected" from="GridContainer/transform_space" to="." method="_on_transform_space_item_selected"]
+[connection signal="toggled" from="GridContainer/check_correct_uvs" to="." method="_on_check_correct_uvs_toggled"]

addons/cyclops_level_builder/tools/tool_edit_vertex.gd

@@ -0,0 +1,632 @@
+# MIT License
+#
+# Copyright (c) 2023 Mark McKay
+# https://github.com/blackears/cyclopsLevelBuilder
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+@tool
+extends ToolEditBase
+class_name ToolEditVertex
+
+const TOOL_ID:String = "edit_vertex"
+
+var handles:Array[HandleVertex] = []
+
+enum ToolState { NONE, READY, DRAGGING, DRAGGING_ADD, MOVE_HANDLES_CLICK, DRAG_SELECTION }
+var tool_state:ToolState = ToolState.NONE
+
+#enum MoveConstraint { NONE, AXIS_X, AXIS_Y, AXIS_Z, PLANE_XY, PLANE_XZ, PLANE_YZ, PLANE_VIEWPORT }
+var move_constraint:MoveConstraint.Type = MoveConstraint.Type.NONE
+
+#var mouse_hover_pos:Vector2
+
+#var drag_handle:HandleVertex
+var drag_mouse_start_pos:Vector2
+var drag_handle_start_pos:Vector3
+var drag_home_block:NodePath
+var added_point_pos:Vector3
+
+var cmd_move_vertex:CommandMoveVertices
+var cmd_add_vertex:CommandAddVertices
+
+var gizmo_translate:Node3D
+	
+var watched_blocks:Array[CyclopsBlock]
+
+var settings:ToolEditVertexSettings = ToolEditVertexSettings.new()
+
+var average_normal:Vector3 = Vector3.UP
+
+func _get_tool_id()->String:
+	return TOOL_ID
+
+func _get_tool_properties_editor()->Control:
+	var ed:ToolEditVertexSettingsEditor = preload("res://addons/cyclops_level_builder/tools/tool_edit_vertex_settings_editor.tscn").instantiate()
+	
+	ed.settings = settings
+	
+	return ed
+	
+func draw_gizmo(viewport_camera:Camera3D):
+	var global_scene:CyclopsGlobalScene = builder.get_global_scene()
+	if !gizmo_translate:
+		gizmo_translate = preload("res://addons/cyclops_level_builder/tools/gizmos/gizmo_translate.tscn").instantiate()
+	
+	var origin:Vector3
+	var count:int = 0
+	for h in handles:
+		var block:CyclopsBlock = builder.get_node(h.block_path)
+		var v:ConvexVolume.VertexInfo = block.control_mesh.vertices[h.vertex_index]
+		if v.selected:
+			origin += h.position
+			count += 1
+
+	if count == 0:
+		global_scene.set_custom_gizmo(null)
+	else:
+		origin /= count
+		#print("gizmo origin ", origin)
+		global_scene.set_custom_gizmo(gizmo_translate)
+		var active_block:Node3D = builder.get_active_block()
+		
+		gizmo_translate.global_basis = calc_gizmo_basis(average_normal, active_block, viewport_camera, settings.transform_space)
+		gizmo_translate.global_position = origin
+		
+func _draw_tool(viewport_camera:Camera3D):
+	var global_scene:CyclopsGlobalScene = builder.get_global_scene()
+	global_scene.clear_tool_mesh()
+
+	if tool_state == ToolState.DRAG_SELECTION:
+		global_scene.draw_screen_rect(viewport_camera, drag_select_start_pos, drag_select_to_pos, global_scene.selection_rect_material)
+	
+	for h in handles:
+		var block:CyclopsBlock = builder.get_node(h.block_path)
+		var v:ConvexVolume.VertexInfo = block.control_mesh.vertices[h.vertex_index]
+		
+		var active:bool = block.control_mesh.active_vertex == h.vertex_index
+		#print("draw vert idx:%s sel:%s active:%s" % [h.vertex_index, v.selected, active])
+		global_scene.draw_vertex(h.position, pick_vertex_material(global_scene, v.selected, active))
+	
+	draw_gizmo(viewport_camera)
+	
+func on_block_changed():
+	setup_tool()
+
+func setup_tool():
+	handles = []
+	#print("setup_tool")
+
+	for block in watched_blocks:
+		block.mesh_changed.disconnect(on_block_changed)
+	watched_blocks.clear()
+	
+	var sel_blocks:Array[CyclopsBlock] = builder.get_selected_blocks()
+	average_normal = Vector3.ZERO
+
+	for block in sel_blocks:
+#		print("block sel %s" % block.block_data.vertex_selected)
+		var l2w:Transform3D = block.global_transform
+		block.mesh_changed.connect(on_block_changed)
+		watched_blocks.append(block)
+		
+		var l2w_normal:Basis = l2w.basis.transposed().inverse()
+		
+		for v_idx in block.control_mesh.vertices.size():
+			var v:ConvexVolume.VertexInfo = block.control_mesh.vertices[v_idx]
+			var handle:HandleVertex = HandleVertex.new()
+			handle.position = l2w * v.point
+			handle.initial_position = handle.position
+			handle.vertex_index = v_idx
+			handle.block_path = block.get_path()
+			handles.append(handle)
+			
+			if v.selected:
+				#print("v.normal ", l2w_normal * v.normal)
+				average_normal += l2w_normal * v.normal
+			
+			#print("adding handle %s" % handle)
+		average_normal = average_normal.normalized()
+
+
+func pick_closest_handle(viewport_camera:Camera3D, position:Vector2, radius:float)->HandleVertex:
+#	print("pick radius ", radius)
+	var best_dist:float = INF
+	var best_handle:HandleVertex = null
+	
+	var origin:Vector3 = viewport_camera.project_ray_origin(position)
+	var dir:Vector3 = viewport_camera.project_ray_normal(position)
+	
+	for h in handles:
+#		var h_world_pos:Vector3 = blocks_root.global_transform * h.position
+		var h_world_pos:Vector3 = h.position
+		var h_screen_pos:Vector2 = viewport_camera.unproject_position(h_world_pos)
+		if position.distance_squared_to(h_screen_pos) > radius * radius:
+			#Failed handle radius test
+			continue
+		
+		var offset:Vector3 = h_world_pos - origin
+		var parallel:Vector3 = offset.project(dir)
+		var dist = parallel.dot(dir)
+		if dist <= 0:
+			#Behind camera
+			continue
+		
+		#print("h pos %s ray orig %s ray dir %s offset %s para %s dist %s perp %s" % [h.position, ray_origin, ray_dir, offset, parallel, dist, perp])
+		if dist >= best_dist:
+			continue
+		
+		best_dist = dist
+		best_handle = h
+
+	return best_handle
+
+func active_node_changed():
+	setup_tool()
+	
+
+func active_node_updated():
+	setup_tool()
+
+func _activate(builder:CyclopsLevelBuilder):
+	super._activate(builder)
+	
+	builder.mode = CyclopsLevelBuilder.Mode.EDIT
+	builder.edit_mode = CyclopsLevelBuilder.EditMode.VERTEX
+	builder.active_node_changed.connect(active_node_changed)
+	
+	setup_tool()
+	
+	
+func _deactivate():
+	super._deactivate()
+	builder.active_node_changed.disconnect(active_node_changed)
+
+	var global_scene:CyclopsGlobalScene = builder.get_global_scene()
+	global_scene.set_custom_gizmo(null)
+
+func start_drag(viewport_camera:Camera3D, event:InputEvent):
+	var e:InputEventMouseMotion = event
+	move_constraint = MoveConstraint.Type.NONE
+
+	if gizmo_translate:
+	
+		var origin:Vector3 = viewport_camera.project_ray_origin(e.position)
+		var dir:Vector3 = viewport_camera.project_ray_normal(e.position)
+		
+		var part_res:GizmoTranslate.IntersectResult = gizmo_translate.intersect(origin, dir, viewport_camera)
+		if part_res:
+#			print("Gizmo hit ", part_res.part)
+			match part_res.part:
+				GizmoTranslate.Part.AXIS_X:
+					move_constraint = MoveConstraint.Type.AXIS_X
+				GizmoTranslate.Part.AXIS_Y:
+					move_constraint = MoveConstraint.Type.AXIS_Y
+				GizmoTranslate.Part.AXIS_Z:
+					move_constraint = MoveConstraint.Type.AXIS_Z
+				GizmoTranslate.Part.PLANE_XY:
+					move_constraint = MoveConstraint.Type.PLANE_XY
+				GizmoTranslate.Part.PLANE_XZ:
+					move_constraint = MoveConstraint.Type.PLANE_XZ
+				GizmoTranslate.Part.PLANE_YZ:
+					move_constraint = MoveConstraint.Type.PLANE_YZ
+		
+			drag_handle_start_pos = gizmo_translate.global_position
+			#print("drag_handle_start_pos ", drag_handle_start_pos)
+#			var grid_step_size:float = pow(2, builder.get_global_scene().grid_size)
+
+	#		print("res obj %s" % result.object.get_path())
+			var sel_blocks:Array[CyclopsBlock] = builder.get_selected_blocks()
+			if !sel_blocks.is_empty():
+				
+				tool_state = ToolState.DRAGGING
+				#print("Move block")
+				
+				cmd_move_vertex = CommandMoveVertices.new()
+				cmd_move_vertex.builder = builder
+				
+				cmd_move_vertex.triplanar_lock_uvs = settings.triplanar_lock_uvs
+
+				for block in sel_blocks:
+					var vol:ConvexVolume = block.control_mesh
+					for v_idx in vol.vertices.size():
+						var v:ConvexVolume.VertexInfo = vol.vertices[v_idx]
+						if v.selected:
+							cmd_move_vertex.add_vertex(block.get_path(), v_idx)
+						if vol.active_vertex == v_idx:
+							#drag_handle_start_pos = block.global_transform * v.point
+							drag_home_block = block.get_path()
+
+			return
+
+	if e.alt_pressed:
+		move_constraint = MoveConstraint.Type.AXIS_Y
+	else:
+		move_constraint = MoveConstraint.Type.PLANE_XZ
+		
+	var handle:HandleVertex = pick_closest_handle(viewport_camera, drag_mouse_start_pos, builder.handle_screen_radius)
+
+	if handle:
+		#drag_handle = handle
+		drag_handle_start_pos = handle.position
+		drag_home_block = handle.block_path
+		tool_state = ToolState.DRAGGING
+
+		cmd_move_vertex = CommandMoveVertices.new()
+		cmd_move_vertex.builder = builder
+
+		var handle_block:CyclopsBlock = builder.get_node(handle.block_path)
+		if handle_block.control_mesh.vertices[handle.vertex_index].selected:
+			var sel_blocks:Array[CyclopsBlock] = builder.get_selected_blocks()
+			for block in sel_blocks:
+				var vol:ConvexVolume = block.control_mesh
+				for v_idx in vol.vertices.size():
+					var v:ConvexVolume.VertexInfo = vol.vertices[v_idx]
+					if v.selected:
+						cmd_move_vertex.add_vertex(block.get_path(), v_idx)
+		else:
+			cmd_move_vertex.add_vertex(handle.block_path, handle.vertex_index)
+			
+		return true
+			
+	else:
+		if e.ctrl_pressed:
+			#Add vertex under cursor
+			var pick_origin:Vector3 = viewport_camera.project_ray_origin(e.position)
+			var pick_dir:Vector3 = viewport_camera.project_ray_normal(e.position)
+			var result:IntersectResults = builder.intersect_ray_closest_selected_only(pick_origin, pick_dir)
+			if result:
+				#print("start drag add")
+				drag_handle_start_pos = result.get_world_position()
+				added_point_pos = result.get_world_position()
+				tool_state = ToolState.DRAGGING_ADD
+
+				cmd_add_vertex = CommandAddVertices.new()
+				cmd_add_vertex.builder = builder
+
+				cmd_add_vertex.block_path = result.object.get_path()
+				cmd_add_vertex.points_to_add = [added_point_pos]
+				#print("init point %s" % added_point_pos)
+			
+			return true
+
+	#Drag selection rectangle
+	tool_state = ToolState.DRAG_SELECTION
+	drag_select_start_pos = e.position
+	drag_select_to_pos = e.position
+
+
+func _gui_input(viewport_camera:Camera3D, event:InputEvent)->bool:	
+	var gui_result = super._gui_input(viewport_camera, event)
+	if gui_result:
+		return true
+	
+#	var grid_step_size:float = pow(2, builder.get_global_scene().grid_size)
+
+	if event is InputEventKey:
+		var e:InputEventKey = event
+		
+		if e.keycode == KEY_ESCAPE:
+			if e.is_pressed():
+				if cmd_move_vertex:
+					cmd_move_vertex.undo_it()
+					cmd_move_vertex = null
+					tool_state = ToolState.NONE
+					
+					setup_tool()
+					
+				if cmd_add_vertex:
+					cmd_add_vertex.undo_it()
+					cmd_add_vertex = null
+					tool_state = ToolState.NONE
+					
+					setup_tool()
+					
+			return true
+
+		elif e.keycode == KEY_A:
+
+			if e.is_pressed():
+				var cmd:CommandSelectVertices = CommandSelectVertices.new()
+				cmd.builder = builder
+				
+				if e.alt_pressed:
+					var sel_blocks:Array[CyclopsBlock] = builder.get_selected_blocks()
+					for block in sel_blocks:
+						cmd.add_vertices(block.get_path(), [])
+						
+				else:
+					var sel_blocks:Array[CyclopsBlock] = builder.get_selected_blocks()
+					for block in sel_blocks:
+						for v_idx in block.control_mesh.vertices.size():
+							cmd.add_vertex(block.get_path(), v_idx)
+
+				cmd.selection_type = Selection.Type.REPLACE
+
+				if cmd.will_change_anything():
+					var undo:EditorUndoRedoManager = builder.get_undo_redo()
+
+					cmd.add_to_undo_manager(undo)
+								
+		elif e.keycode == KEY_G:
+			
+			if e.is_pressed() && tool_state == ToolState.NONE:
+				var sel_blocks:Array[CyclopsBlock] = builder.get_selected_blocks()
+				if !sel_blocks.is_empty():
+
+					tool_state = ToolState.MOVE_HANDLES_CLICK
+					move_constraint = MoveConstraint.Type.PLANE_VIEWPORT
+
+					drag_handle_start_pos = Vector3.INF
+					
+					cmd_move_vertex = CommandMoveVertices.new()
+					cmd_move_vertex.builder = builder
+
+					for block in sel_blocks:
+						var vol:ConvexVolume = block.control_mesh
+						for v_idx in vol.vertices.size():
+							var v:ConvexVolume.VertexInfo = vol.vertices[v_idx]
+							if v.selected:
+								cmd_move_vertex.add_vertex(block.get_path(), v_idx)
+					
+			return true
+
+		elif e.keycode == KEY_X:
+			if tool_state == ToolState.MOVE_HANDLES_CLICK:
+				if e.shift_pressed:
+					move_constraint = MoveConstraint.Type.PLANE_YZ
+				else:
+					move_constraint = MoveConstraint.Type.AXIS_X
+			return true
+
+		elif e.keycode == KEY_Y:
+			if tool_state == ToolState.MOVE_HANDLES_CLICK:
+				if e.shift_pressed:
+					move_constraint = MoveConstraint.Type.PLANE_XZ
+				else:
+					move_constraint = MoveConstraint.Type.AXIS_Y
+			return true
+
+		elif e.keycode == KEY_Z:
+			if tool_state == ToolState.MOVE_HANDLES_CLICK:
+				if e.shift_pressed:
+					move_constraint = MoveConstraint.Type.PLANE_XY
+				else:
+					move_constraint = MoveConstraint.Type.AXIS_Z
+			return true
+
+
+
+	if event is InputEventMouseButton:
+		
+		var e:InputEventMouseButton = event
+		if e.button_index == MOUSE_BUTTON_LEFT:
+
+			if e.is_pressed():
+				
+				if tool_state == ToolState.NONE:
+					drag_mouse_start_pos = e.position
+					tool_state = ToolState.READY
+					#print("Start READY")
+					
+				return true
+			else:
+				if tool_state == ToolState.READY:
+					#print("cmd select")
+					var handle:HandleVertex = pick_closest_handle(viewport_camera, drag_mouse_start_pos, builder.handle_screen_radius)
+
+					var cmd:CommandSelectVertices = CommandSelectVertices.new()
+					cmd.builder = builder
+
+					var sel_blocks:Array[CyclopsBlock] = builder.get_selected_blocks()
+					for block in sel_blocks:
+						cmd.add_vertices(block.get_path(), [])
+						
+
+					cmd.selection_type = Selection.choose_type(e.shift_pressed, e.ctrl_pressed)
+
+					if handle:
+						cmd.add_vertex(handle.block_path, handle.vertex_index)
+						#print("selectibg %s" % handle.vertex_index)
+					
+					if cmd.will_change_anything():
+						var undo:EditorUndoRedoManager = builder.get_undo_redo()
+
+						cmd.add_to_undo_manager(undo)
+					
+					
+					tool_state = ToolState.NONE
+					cmd_move_vertex = null
+					
+				elif tool_state == ToolState.DRAGGING:
+					#Finish drag
+					
+					#print("cmd finish drag")
+					var undo:EditorUndoRedoManager = builder.get_undo_redo()
+
+					cmd_move_vertex.add_to_undo_manager(undo)
+					
+					tool_state = ToolState.NONE
+					cmd_move_vertex = null
+					
+				elif tool_state == ToolState.DRAGGING_ADD:
+					#Finish drag
+					#print("cmd finish drag add")
+					var undo:EditorUndoRedoManager = builder.get_undo_redo()
+
+					cmd_add_vertex.add_to_undo_manager(undo)
+					
+					tool_state = ToolState.NONE
+					cmd_add_vertex = null
+
+				elif tool_state == ToolState.MOVE_HANDLES_CLICK:
+					var undo:EditorUndoRedoManager = builder.get_undo_redo()
+					cmd_move_vertex.add_to_undo_manager(undo)
+					
+					tool_state = ToolState.NONE
+					cmd_add_vertex = null
+					
+
+				elif tool_state == ToolState.DRAG_SELECTION:
+					
+					var frustum:Array[Plane] = MathUtil.calc_frustum_camera_rect(viewport_camera, drag_select_start_pos, drag_select_to_pos)
+
+					var cmd:CommandSelectVertices = CommandSelectVertices.new()
+					cmd.builder = builder
+
+					var sel_blocks:Array[CyclopsBlock] = builder.get_selected_blocks()
+					for block in sel_blocks:
+						
+						for v_idx in block.control_mesh.vertices.size():
+							var v:ConvexVolume.VertexInfo = block.control_mesh.vertices[v_idx]
+							var point_w:Vector3 = block.global_transform * v.point
+							
+							var origin:Vector3 = viewport_camera.project_ray_origin(e.position)
+#							var dir:Vector3 = viewport_camera.project_ray_normal(e.position)
+
+							var global_scene:CyclopsGlobalScene = builder.get_global_scene()
+
+							#Obstruction check
+							if !global_scene.xray_mode && builder.display_mode != DisplayMode.Type.WIRE:
+								var result:IntersectResults = builder.intersect_ray_closest(origin, point_w - origin)
+								if result:
+									var res_point_w:Vector3 = result.get_world_position()
+									if !res_point_w.is_equal_approx(point_w):
+										continue
+							
+							if MathUtil.frustum_contians_point(frustum, point_w):
+								cmd.add_vertex(block.get_path(), v_idx)
+
+					cmd.selection_type = Selection.choose_type(e.shift_pressed, e.ctrl_pressed)
+
+					if cmd.will_change_anything():
+						var undo:EditorUndoRedoManager = builder.get_undo_redo()
+
+						cmd.add_to_undo_manager(undo)
+					
+					tool_state = ToolState.NONE
+
+				return true
+
+		elif e.button_index == MOUSE_BUTTON_RIGHT:
+			if e.is_pressed():
+				#Right click cancel
+				if cmd_move_vertex:
+					cmd_move_vertex.undo_it()
+					cmd_move_vertex = null
+					tool_state = ToolState.NONE
+					
+					setup_tool()
+					return true
+					
+				if cmd_add_vertex:
+					cmd_add_vertex.undo_it()
+					cmd_add_vertex = null
+					tool_state = ToolState.NONE
+
+					setup_tool()
+					return true
+					
+			return false
+								
+	elif event is InputEventMouseMotion:
+		var e:InputEventMouseMotion = event
+		#mouse_hover_pos = e.position
+
+		if (e.button_mask & MOUSE_BUTTON_MASK_MIDDLE):
+			return false		
+			
+		if tool_state == ToolState.READY:
+			if e.position.distance_squared_to(drag_mouse_start_pos) > MathUtil.square(builder.drag_start_radius):
+				start_drag(viewport_camera, event)
+
+			return true
+			
+		elif tool_state == ToolState.DRAGGING || tool_state == ToolState.MOVE_HANDLES_CLICK:
+			var origin:Vector3 = viewport_camera.project_ray_origin(e.position)
+			var dir:Vector3 = viewport_camera.project_ray_normal(e.position)
+			
+			if !drag_handle_start_pos.is_finite():
+				#If start point set to infinite, replace with point along view ray
+				drag_handle_start_pos = origin + dir * 20
+
+			var active_block:Node3D = builder.get_active_block()
+#			var gizmo_global_xform:Transform3D = calc_gizmo_transform(origin, average_normal, active_block, viewport_camera, settings.transform_space)
+			var xform_basis:Basis = calc_gizmo_basis(average_normal, active_block, viewport_camera, settings.transform_space)
+			
+			#print("drag_handle_start_pos ", drag_handle_start_pos)
+			#print("basis ", xform_basis)
+			var drag_to:Vector3
+			match move_constraint:
+				MoveConstraint.Type.AXIS_X:
+					drag_to = MathUtil.closest_point_on_line(origin, dir, drag_handle_start_pos, xform_basis.x)
+				MoveConstraint.Type.AXIS_Y:
+					drag_to = MathUtil.closest_point_on_line(origin, dir, drag_handle_start_pos, xform_basis.y)
+				MoveConstraint.Type.AXIS_Z:
+					drag_to = MathUtil.closest_point_on_line(origin, dir, drag_handle_start_pos, xform_basis.z)
+				MoveConstraint.Type.PLANE_XY:
+					drag_to = MathUtil.intersect_plane(origin, dir, drag_handle_start_pos, xform_basis.z)
+				MoveConstraint.Type.PLANE_XZ:
+					drag_to = MathUtil.intersect_plane(origin, dir, drag_handle_start_pos, xform_basis.y)
+				MoveConstraint.Type.PLANE_YZ:
+					drag_to = MathUtil.intersect_plane(origin, dir, drag_handle_start_pos, xform_basis.x)
+				MoveConstraint.Type.PLANE_VIEWPORT:
+					drag_to = MathUtil.intersect_plane(origin, dir, drag_handle_start_pos, viewport_camera.global_transform.basis.z)
+
+			
+			#print("send snap bock-2- ", drag_home_block)
+			drag_to = builder.get_snapping_manager().snap_point(drag_to, SnappingQuery.new(viewport_camera, [drag_home_block]))
+			#print("drag_to snapped ", drag_to)
+			
+			cmd_move_vertex.move_offset = drag_to - drag_handle_start_pos
+			#print("cmd_move_vertex.move_offset ", cmd_move_vertex.move_offset)
+			cmd_move_vertex.do_it()
+
+			setup_tool()
+			return true
+
+		elif tool_state == ToolState.DRAGGING_ADD:
+
+			var origin:Vector3 = viewport_camera.project_ray_origin(e.position)
+			var dir:Vector3 = viewport_camera.project_ray_normal(e.position)
+			
+			var drag_to:Vector3
+			if e.alt_pressed:
+				drag_to = MathUtil.closest_point_on_line(origin, dir, drag_handle_start_pos, Vector3.UP)
+			else:
+				drag_to = MathUtil.intersect_plane(origin, dir, drag_handle_start_pos, Vector3.UP)
+
+			#drag_to = MathUtil.snap_to_grid(drag_to, grid_step_size)
+			#print("send snap bock ", drag_home_block)
+			drag_to = builder.get_snapping_manager().snap_point(drag_to, SnappingQuery.new(viewport_camera, [drag_home_block]))
+
+			added_point_pos = drag_to
+			#print("drag point to %s" % drag_to)
+
+			cmd_add_vertex.points_to_add = [drag_to]
+			cmd_add_vertex.do_it()
+			
+			setup_tool()
+
+		elif tool_state == ToolState.DRAG_SELECTION:
+			drag_select_to_pos = e.position
+			return true
+								
+	return false
+

addons/cyclops_level_builder/tools/tool_edit_vertex_settings.gd

@@ -0,0 +1,39 @@
+# MIT License
+#
+# Copyright (c) 2023 Mark McKay
+# https://github.com/blackears/cyclopsLevelBuilder
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+@tool
+extends Resource
+class_name ToolEditVertexSettings
+
+@export var transform_space:TransformSpace.Type = TransformSpace.Type.GLOBAL
+@export var triplanar_lock_uvs:bool = true
+
+func load_from_cache(cache:Dictionary):
+	transform_space = cache.get("transform_space", TransformSpace.Type.GLOBAL)
+	triplanar_lock_uvs = cache.get("triplanar_lock_uvs", true)
+	
+func save_to_cache():
+	return {
+		"transform_space": transform_space,
+		"triplanar_lock_uvs": triplanar_lock_uvs,
+	}

addons/cyclops_level_builder/tools/tool_edit_vertex_settings_editor.gd

@@ -0,0 +1,60 @@
+# MIT License
+#
+# Copyright (c) 2023 Mark McKay
+# https://github.com/blackears/cyclopsLevelBuilder
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+@tool
+extends PanelContainer
+class_name ToolEditVertexSettingsEditor
+
+var settings:ToolEditVertexSettings:
+	get:
+		return settings
+	set(value):
+		settings = value
+		dirty = true
+
+var dirty:bool = true
+
+
+func _ready():
+	%transform_space.clear()
+	for text in TransformSpace.Type.keys():
+		%transform_space.add_item(text)
+
+func _process(delta):
+	if dirty:
+		update()
+		dirty = false
+
+func update():
+	%transform_space.selected = settings.transform_space
+	%check_correct_uvs.button_pressed = settings.triplanar_lock_uvs
+	
+	pass
+
+
+func _on_transform_space_item_selected(index):
+	settings.transform_space = index
+
+
+func _on_check_correct_uvs_toggled(toggled_on):
+	settings.triplanar_lock_uvs = toggled_on

addons/cyclops_level_builder/tools/tool_edit_vertex_settings_editor.tscn

@@ -0,0 +1,49 @@
+[gd_scene load_steps=2 format=3 uid="uid://s8gaqniiv1on"]
+
+[ext_resource type="Script" path="res://addons/cyclops_level_builder/tools/tool_edit_vertex_settings_editor.gd" id="1_6qkra"]
+
+[node name="ToolMoveSettingsEditor" type="PanelContainer"]
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+offset_right = -929.0
+offset_bottom = -415.0
+grow_horizontal = 2
+grow_vertical = 2
+script = ExtResource("1_6qkra")
+
+[node name="GridContainer" type="GridContainer" parent="."]
+layout_mode = 2
+columns = 2
+
+[node name="Label" type="Label" parent="GridContainer"]
+layout_mode = 2
+text = "Transform space"
+
+[node name="transform_space" type="OptionButton" parent="GridContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+item_count = 5
+selected = 0
+popup/item_0/text = "GLOBAL"
+popup/item_0/id = 0
+popup/item_1/text = "LOCAL"
+popup/item_1/id = 1
+popup/item_2/text = "NORMAL"
+popup/item_2/id = 2
+popup/item_3/text = "VIEW"
+popup/item_3/id = 3
+popup/item_4/text = "PARENT"
+popup/item_4/id = 4
+
+[node name="Label2" type="Label" parent="GridContainer"]
+layout_mode = 2
+text = "Triplanar lock UVs"
+
+[node name="check_correct_uvs" type="CheckBox" parent="GridContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+text = "On"
+
+[connection signal="item_selected" from="GridContainer/transform_space" to="." method="_on_transform_space_item_selected"]
+[connection signal="toggled" from="GridContainer/check_correct_uvs" to="." method="_on_check_correct_uvs_toggled"]

addons/cyclops_level_builder/tools/tool_material_brush.gd

@@ -0,0 +1,209 @@
+# MIT License
+#
+# Copyright (c) 2023 Mark McKay
+# https://github.com/blackears/cyclopsLevelBuilder
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+@tool
+extends CyclopsTool
+class_name ToolMaterialBrush
+
+enum ToolState { READY, PAINTING }
+var tool_state:ToolState = ToolState.READY
+
+const TOOL_ID:String = "material_brush"
+
+var cmd:CommandSetMaterial
+
+var settings:ToolMaterialBrushSettings = ToolMaterialBrushSettings.new()
+var material_viewer_state:MaterialViewerState = preload("res://addons/cyclops_level_builder/docks/material_palette/material_viewer/material_viewer_state_res.tres")
+
+var last_mouse_pos:Vector2
+
+func _get_tool_id()->String:
+	return TOOL_ID
+
+func _draw_tool(viewport_camera:Camera3D):
+	super._draw_tool(viewport_camera)
+
+	var global_scene:CyclopsGlobalScene = builder.get_global_scene()
+	global_scene.clear_tool_mesh()
+	global_scene.draw_selected_blocks(viewport_camera)
+
+func _get_tool_properties_editor()->Control:
+	var ed:ToolMaterialBrushSettingsEditor = preload("res://addons/cyclops_level_builder/tools/tool_material_brush_settings_editor.tscn").instantiate()
+
+	ed.settings = settings
+
+	return ed
+
+func _gui_input(viewport_camera:Camera3D, event:InputEvent)->bool:
+
+	if event is InputEventKey:
+		var e:InputEventKey = event
+		
+		if e.keycode == KEY_X:
+			if e.shift_pressed:
+				if e.is_pressed():
+					var origin:Vector3 = viewport_camera.project_ray_origin(last_mouse_pos)
+					var dir:Vector3 = viewport_camera.project_ray_normal(last_mouse_pos)
+
+					var result:IntersectResults = builder.intersect_ray_closest(origin, dir)
+
+					if result:
+						var block:CyclopsBlock = result.object
+						result.face_index
+						
+						var vol:ConvexVolume = ConvexVolume.new()
+						vol.init_from_mesh_vector_data(block.mesh_vector_data)
+						
+						var face:ConvexVolume.FaceInfo = vol.faces[result.face_index]
+					
+						#Sample under cursor
+						if settings.paint_materials:
+							if face.material_id != -1:
+								#Pick this material
+								#print("face.material_id ", face.material_id)
+								var mat:Material = block.materials[face.material_id] \
+									if face.material_id >= 0 && face.material_id < block.materials.size() \
+									else null
+								settings.material_path = mat.resource_path if mat else NodePath()
+								#print("settings.material_path ", settings.material_path)
+								
+							
+						if settings.paint_color:
+							settings.color = face.color
+							
+						if settings.paint_visibility:
+							settings.visibility = face.visible
+							
+						if settings.paint_uv:
+							settings.uv_matrix = face.uv_transform
+
+			return true
+			
+	elif event is InputEventMouseButton:
+
+		var e:InputEventMouseButton = event
+		if e.button_index == MOUSE_BUTTON_LEFT:
+
+			if e.is_pressed():
+
+				if tool_state == ToolState.READY:
+					var origin:Vector3 = viewport_camera.project_ray_origin(e.position)
+					var dir:Vector3 = viewport_camera.project_ray_normal(e.position)
+
+					var result:IntersectResults = builder.intersect_ray_closest(origin, dir)
+
+					if result:
+						cmd = CommandSetMaterial.new()
+						cmd.builder = builder
+
+						#print("settings.paint_materials ", settings.paint_materials)
+						cmd.setting_material = settings.paint_materials
+						
+						cmd.material_path = settings.material_path \
+							if !settings.erase_material else ""
+
+						cmd.setting_color = settings.paint_color
+						cmd.color = settings.color
+
+						cmd.setting_visibility = settings.paint_visibility
+						cmd.visibility = settings.visibility
+
+						cmd.painting_uv = settings.paint_uv
+						cmd.uv_matrix = settings.uv_matrix
+
+						var block:CyclopsBlock = result.object
+						
+						if settings.individual_faces:
+							cmd.add_target(block.get_path(), [result.face_index])
+
+						else:
+							cmd.add_target(block.get_path(), block.control_mesh.get_face_indices())
+
+						tool_state = ToolState.PAINTING
+
+			else:
+				
+				if tool_state == ToolState.PAINTING:
+					cmd.undo_it()
+					if cmd.will_change_anything():
+						var undo:EditorUndoRedoManager = builder.get_undo_redo()
+						cmd.add_to_undo_manager(undo)
+
+					tool_state = ToolState.READY
+
+			return true
+
+
+	elif event is InputEventMouseMotion:
+
+		var e:InputEventMouseMotion = event
+
+		last_mouse_pos = e.position
+
+		if tool_state == ToolState.PAINTING:
+			var origin:Vector3 = viewport_camera.project_ray_origin(e.position)
+			var dir:Vector3 = viewport_camera.project_ray_normal(e.position)
+
+			var result:IntersectResults = builder.intersect_ray_closest(origin, dir)
+
+			if result:
+				#print ("hit ", result.object.name)
+				cmd.undo_it()
+				var block:CyclopsBlock = result.object
+				if settings.individual_faces:
+					cmd.add_target(block.get_path(), [result.face_index])
+
+				else:
+					cmd.add_target(block.get_path(), block.control_mesh.get_face_indices())
+				cmd.do_it()
+
+			return true
+
+	return false
+
+
+func on_material_viewer_state_changed():
+	#print("mat changed to ", material_viewer_state.active_material_path)
+	settings.material_path = material_viewer_state.active_material_path
+
+
+func _init():
+	material_viewer_state.changed.connect(on_material_viewer_state_changed)
+
+func _activate(builder:CyclopsLevelBuilder):
+	super._activate(builder)
+
+	var cache:Dictionary = builder.get_tool_cache(TOOL_ID)
+	settings.load_from_cache(cache)
+	settings.material_path = material_viewer_state.active_material_path
+	
+#	material_viewer_state.changed.connect(on_material_viewer_state_changed)
+
+func _deactivate():
+#	material_viewer_state.changed.disconnect(on_material_viewer_state_changed)
+	
+	var cache:Dictionary = settings.save_to_cache()
+	builder.set_tool_cache(TOOL_ID, cache)
+
+
+

addons/cyclops_level_builder/tools/tool_material_brush_settings.gd

@@ -0,0 +1,91 @@
+# MIT License
+#
+# Copyright (c) 2023 Mark McKay
+# https://github.com/blackears/cyclopsLevelBuilder
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+@tool
+extends Resource
+class_name ToolMaterialBrushSettings
+
+@export var paint_materials:bool = true
+@export var paint_color:bool = false
+@export var paint_visibility:bool = false
+@export var paint_uv:bool = false
+@export var uv_matrix:Transform2D = Transform2D.IDENTITY:
+	set(value):
+		if value != uv_matrix:
+			uv_matrix = value
+			emit_changed()
+
+#@export var component_type:GeometryComponentType.Type = GeometryComponentType.Type.OBJECT
+@export var individual_faces:bool = false
+@export var erase_material:bool = false
+
+@export var color:Color = Color.WHITE:
+	set(value):
+		if value != color:
+			color = value
+			emit_changed()
+
+@export var material_path:NodePath:
+	set(value):
+		if value != material_path:
+			material_path = value
+			emit_changed()
+
+@export var visibility:bool = true:
+	set(value):
+		if value != visibility:
+			visibility = value
+			emit_changed()
+
+func load_from_cache(cache:Dictionary):
+	paint_materials = cache.get("paint_materials", true)
+	paint_color = cache.get("paint_color", false)
+	paint_visibility = cache.get("paint_visibility", false)
+	individual_faces = cache.get("individual_faces", false)
+	#component_type = cache.get("component_type", GeometryComponentType.Type.OBJECT)
+	erase_material = cache.get("erase_material", false)
+	material_path = str_to_var(cache.get("material_path", NodePath()))
+	color = str_to_var(cache.get("color", var_to_str(Color.WHITE)))
+	visibility = cache.get("visibility", false)
+	paint_uv = cache.get("paint_uv", false)
+	uv_matrix = str_to_var(cache.get("uv_matrix", var_to_str(Transform2D.IDENTITY)))
+
+func save_to_cache():
+	return {
+		"paint_materials": paint_materials,
+		"paint_color": paint_color,
+		"paint_visibility": paint_visibility,
+		"individual_faces": individual_faces,
+		#"component_type": component_type,
+		"erase_material": erase_material,
+		"material_path": var_to_str(material_path),
+		"color": var_to_str(color),
+		"visibility": visibility,
+		"paint_uv": paint_uv,
+		"uv_matrix": var_to_str(uv_matrix)
+	}
+
+
+
+
+

addons/cyclops_level_builder/tools/tool_material_brush_settings_editor.gd

@@ -0,0 +1,142 @@
+# MIT License
+#
+# Copyright (c) 2023 Mark McKay
+# https://github.com/blackears/cyclopsLevelBuilder
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+@tool
+extends PanelContainer
+class_name ToolMaterialBrushSettingsEditor
+
+@export var settings:ToolMaterialBrushSettings:
+	get:
+		return settings
+		
+	set(value):
+		if settings == value:
+			return
+		
+		if settings:
+			settings.changed.disconnect(on_settings_changed)
+		
+		settings = value
+		
+		if settings:
+			settings.changed.connect(on_settings_changed)
+		
+		update()
+
+func on_settings_changed():
+	update()
+
+func update():
+	if !settings:
+		%check_paint_material.disabled = true
+		%check_individual_faces.disabled = true
+		%check_erase_material.disabled = true
+
+		%check_paint_color.disabled = true
+		%color_button.disabled = true
+
+		%check_paint_visibility.disabled = true
+		%check_visibility.disabled = true
+
+		%check_paint_uv.disabled = true
+
+		return
+
+	%check_paint_material.disabled = false
+	%check_paint_color.disabled = false
+	%check_paint_visibility.disabled = false
+	%check_individual_faces.disabled = false
+
+	%check_individual_faces.button_pressed = settings.individual_faces
+	#%opbn_geom_component.selected = settings.component_type
+
+	%check_paint_material.button_pressed = settings.paint_materials
+	%check_erase_material.button_pressed = settings.erase_material
+	%check_erase_material.disabled = !settings.paint_materials
+
+	%check_paint_color.button_pressed = settings.paint_color
+	%color_button.color = settings.color
+	%color_button.disabled = !settings.paint_color
+
+	%check_paint_visibility.button_pressed = settings.paint_visibility
+	%check_visibility.button_pressed = settings.visibility
+	%check_visibility.disabled = !settings.paint_visibility
+
+	%check_paint_uv.button_pressed = settings.paint_uv
+
+# 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):
+	pass
+
+
+func _on_check_paint_material_toggled(button_pressed:bool):
+	#print("_on_check_paint_material_toggled ", button_pressed)
+	settings.paint_materials = button_pressed
+	%check_erase_material.disabled = !settings.paint_materials
+
+
+
+func _on_check_erase_material_toggled(button_pressed:bool):
+	settings.erase_material = button_pressed
+
+
+func _on_check_paint_color_toggled(button_pressed:bool):
+	settings.paint_color = button_pressed
+	%color_button.disabled = !settings.paint_color
+
+
+func _on_color_button_color_changed(color:Color):
+	settings.color = color
+
+
+func _on_check_paint_visibility_toggled(button_pressed:bool):
+	settings.paint_visibility = button_pressed
+	%check_visibility.disabled = !settings.paint_visibility
+
+
+func _on_check_visibility_toggled(button_pressed:bool):
+	settings.visibility = button_pressed
+
+
+func _on_check_paint_uv_toggled(button_pressed:bool):
+	settings.paint_uv = button_pressed
+
+
+func _on_check_individual_faces_toggled(button_pressed:bool):
+	settings.individual_faces = button_pressed
+
+#func _on_opbn_geom_component_item_selected(index):
+	#match index:
+		#0:
+			#settings.component_type = GeometryComponentType.Type.OBJECT
+		#1:
+			#settings.component_type = GeometryComponentType.Type.VERTEX
+		#2:
+			#settings.component_type = GeometryComponentType.Type.FACE
+		#3:
+			#settings.component_type = GeometryComponentType.Type.FACE_VERTEX

addons/cyclops_level_builder/tools/tool_material_brush_settings_editor.tscn

@@ -0,0 +1,83 @@
+[gd_scene load_steps=2 format=3 uid="uid://dugi0xh84150p"]
+
+[ext_resource type="Script" path="res://addons/cyclops_level_builder/tools/tool_material_brush_settings_editor.gd" id="1_q0hdg"]
+
+[node name="PanelContainer" type="PanelContainer"]
+offset_right = 317.0
+offset_bottom = 269.0
+script = ExtResource("1_q0hdg")
+
+[node name="VBoxContainer" type="VBoxContainer" parent="."]
+layout_mode = 2
+
+[node name="check_individual_faces" type="CheckBox" parent="VBoxContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+text = "Individual faces"
+
+[node name="check_paint_material" type="CheckBox" parent="VBoxContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+text = "Paint materials"
+
+[node name="MarginContainer" type="MarginContainer" parent="VBoxContainer"]
+layout_mode = 2
+theme_override_constants/margin_left = 16
+
+[node name="VBoxContainer" type="VBoxContainer" parent="VBoxContainer/MarginContainer"]
+layout_mode = 2
+
+[node name="check_erase_material" type="CheckBox" parent="VBoxContainer/MarginContainer/VBoxContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+text = "Erase materials"
+
+[node name="check_paint_color" type="CheckBox" parent="VBoxContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+text = "Paint color"
+
+[node name="MarginContainer2" type="MarginContainer" parent="VBoxContainer"]
+layout_mode = 2
+theme_override_constants/margin_left = 16
+
+[node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer/MarginContainer2"]
+layout_mode = 2
+
+[node name="Label" type="Label" parent="VBoxContainer/MarginContainer2/HBoxContainer"]
+layout_mode = 2
+text = "Color"
+
+[node name="color_button" type="ColorPickerButton" parent="VBoxContainer/MarginContainer2/HBoxContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+size_flags_horizontal = 3
+
+[node name="check_paint_visibility" type="CheckBox" parent="VBoxContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+text = "Paint visibility"
+
+[node name="MarginContainer3" type="MarginContainer" parent="VBoxContainer"]
+layout_mode = 2
+theme_override_constants/margin_left = 16
+
+[node name="check_visibility" type="CheckBox" parent="VBoxContainer/MarginContainer3"]
+unique_name_in_owner = true
+layout_mode = 2
+text = "Visible"
+
+[node name="check_paint_uv" type="CheckBox" parent="VBoxContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+tooltip_text = "Set the face's UV transform to the identity matrix."
+text = "Paint UV"
+
+[connection signal="toggled" from="VBoxContainer/check_individual_faces" to="." method="_on_check_individual_faces_toggled"]
+[connection signal="toggled" from="VBoxContainer/check_paint_material" to="." method="_on_check_paint_material_toggled"]
+[connection signal="toggled" from="VBoxContainer/MarginContainer/VBoxContainer/check_erase_material" to="." method="_on_check_erase_material_toggled"]
+[connection signal="toggled" from="VBoxContainer/check_paint_color" to="." method="_on_check_paint_color_toggled"]
+[connection signal="color_changed" from="VBoxContainer/MarginContainer2/HBoxContainer/color_button" to="." method="_on_color_button_color_changed"]
+[connection signal="toggled" from="VBoxContainer/check_paint_visibility" to="." method="_on_check_paint_visibility_toggled"]
+[connection signal="toggled" from="VBoxContainer/MarginContainer3/check_visibility" to="." method="_on_check_visibility_toggled"]
+[connection signal="toggled" from="VBoxContainer/check_paint_uv" to="." method="_on_check_paint_uv_toggled"]

addons/cyclops_level_builder/tools/tool_move.gd

@@ -0,0 +1,451 @@
+# MIT License
+#
+# Copyright (c) 2023 Mark McKay
+# https://github.com/blackears/cyclopsLevelBuilder
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+@tool
+extends CyclopsTool
+class_name ToolMove
+
+const TOOL_ID:String = "move"
+
+
+enum ToolState { NONE, READY, MOVE_BLOCK, MOVE_BLOCK_CLICK, DRAG_SELECTION }
+var tool_state:ToolState = ToolState.NONE
+
+#enum MoveConstraint { NONE, AXIS_X, AXIS_Y, AXIS_Z, PLANE_XY, PLANE_XZ, PLANE_YZ, PLANE_VIEWPORT }
+var move_constraint:MoveConstraint.Type = MoveConstraint.Type.NONE
+
+#var viewport_camera_start:Camera3D
+var event_start:InputEventMouseButton
+
+var block_drag_cur:Vector3
+var block_drag_p0:Vector3
+
+var drag_select_start_pos:Vector2
+var drag_select_to_pos:Vector2
+
+var mouse_hover_pos:Vector2
+
+#Keep a copy of move command here while we are building it
+#var cmd_move_blocks:CommandMoveBlocks
+var cmd_xform_blocks:CommandTransformBlocks
+
+var base_points:PackedVector3Array
+
+var gizmo_translate:GizmoTranslate
+
+var settings:ToolMoveSettings = ToolMoveSettings.new()
+
+func _get_tool_properties_editor()->Control:
+	var ed:ToolMoveSettingsEditor = preload("res://addons/cyclops_level_builder/tools/tool_move_settings_editor.tscn").instantiate()
+	
+	ed.settings = settings
+	
+	return ed
+	
+func _get_tool_id()->String:
+	return TOOL_ID
+
+func draw_gizmo(viewport_camera:Camera3D):
+	var global_scene:CyclopsGlobalScene = builder.get_global_scene()
+	if !gizmo_translate:
+		gizmo_translate = preload("res://addons/cyclops_level_builder/tools/gizmos/gizmo_translate.tscn").instantiate()
+	
+	var blocks:Array[CyclopsBlock] = builder.get_selected_blocks()
+	var active_block:Node3D = builder.get_active_block()
+	
+	if blocks.is_empty():
+		global_scene.set_custom_gizmo(null)
+	else:
+		var origin:Vector3
+		for block in blocks:
+			origin += block.global_transform.origin
+		origin /= blocks.size()
+		global_scene.set_custom_gizmo(gizmo_translate)
+		
+		match settings.transform_space:
+			TransformSpace.Type.GLOBAL:
+				var xform:Transform3D = Transform3D.IDENTITY
+				xform.origin = origin
+				gizmo_translate.global_transform = xform
+			TransformSpace.Type.LOCAL:
+				var xform:Transform3D = active_block.global_transform
+				gizmo_translate.global_transform = xform
+			TransformSpace.Type.NORMAL:
+				var xform:Transform3D = active_block.global_transform
+				gizmo_translate.global_transform = xform
+			TransformSpace.Type.VIEW:
+				gizmo_translate.global_basis = viewport_camera.global_basis
+				gizmo_translate.global_position = origin
+			TransformSpace.Type.PARENT:
+				var xform:Transform3D = active_block.get_parent_node_3d().global_transform
+				gizmo_translate.global_transform = xform
+
+
+func _draw_tool(viewport_camera:Camera3D):
+	var global_scene:CyclopsGlobalScene = builder.get_global_scene()
+	global_scene.clear_tool_mesh()
+	global_scene.draw_selected_blocks(viewport_camera)
+
+	if tool_state == ToolState.DRAG_SELECTION:
+		#print("draw sel %s " % drag_select_to_pos)
+		global_scene.draw_screen_rect(viewport_camera, drag_select_start_pos, drag_select_to_pos, global_scene.selection_rect_material)
+
+	draw_gizmo(viewport_camera)
+	
+
+
+func start_drag(viewport_camera:Camera3D, event:InputEvent):
+	var blocks_root:Node = builder.get_block_add_parent()
+	var e:InputEventMouseButton = event
+	
+	var origin:Vector3 = viewport_camera.project_ray_origin(e.position)
+	var dir:Vector3 = viewport_camera.project_ray_normal(e.position)
+
+	move_constraint = MoveConstraint.Type.NONE
+
+	if gizmo_translate:
+		var part_res:GizmoTranslate.IntersectResult = gizmo_translate.intersect(origin, dir, viewport_camera)
+		if part_res:
+			#print("Gizmo hit ", part_res.part)
+			match part_res.part:
+				GizmoTranslate.Part.AXIS_X:
+					move_constraint = MoveConstraint.Type.AXIS_X
+				GizmoTranslate.Part.AXIS_Y:
+					move_constraint = MoveConstraint.Type.AXIS_Y
+				GizmoTranslate.Part.AXIS_Z:
+					move_constraint = MoveConstraint.Type.AXIS_Z
+				GizmoTranslate.Part.PLANE_XY:
+					move_constraint = MoveConstraint.Type.PLANE_XY
+				GizmoTranslate.Part.PLANE_XZ:
+					move_constraint = MoveConstraint.Type.PLANE_XZ
+				GizmoTranslate.Part.PLANE_YZ:
+					move_constraint = MoveConstraint.Type.PLANE_YZ
+		
+			var start_pos:Vector3 = part_res.pos_world
+#			var grid_step_size:float = pow(2, builder.get_global_scene().grid_size)
+
+			#block_drag_p0 = MathUtil.snap_to_grid(start_pos, grid_step_size)
+			block_drag_p0 = builder.get_snapping_manager().snap_point(start_pos, SnappingQuery.new(viewport_camera))
+
+	#		print("res obj %s" % result.object.get_path())
+			var sel_blocks:Array[CyclopsBlock] = builder.get_selected_blocks()
+			if !sel_blocks.is_empty():
+				
+				tool_state = ToolState.MOVE_BLOCK
+				#print("Move block")
+				
+				cmd_xform_blocks = CommandTransformBlocks.new()
+				cmd_xform_blocks.builder = builder
+				cmd_xform_blocks.lock_uvs = settings.correct_uvs
+				for child in sel_blocks:
+					cmd_xform_blocks.add_block(child.get_path())
+
+			return
+
+
+	var result:IntersectResults = builder.intersect_ray_closest(origin, dir)
+#	print("result %s" % result)
+	
+	if result:
+
+		if e.alt_pressed:
+			move_constraint = MoveConstraint.Type.AXIS_Y
+		else:
+			move_constraint = MoveConstraint.Type.PLANE_XZ
+
+		var start_pos:Vector3 = result.get_world_position()			
+		#var grid_step_size:float = pow(2, builder.get_global_scene().grid_size)
+
+		#block_drag_p0 = MathUtil.snap_to_grid(start_pos, grid_step_size)
+		block_drag_p0 = builder.get_snapping_manager().snap_point(start_pos, SnappingQuery.new(viewport_camera))
+		
+		#print("block_drag_p0 %s" % block_drag_p0)
+
+#		print("res obj %s" % result.object.get_path())
+		if builder.is_selected(result.object):
+			
+			tool_state = ToolState.MOVE_BLOCK
+			
+			cmd_xform_blocks = CommandTransformBlocks.new()
+			cmd_xform_blocks.builder = builder
+			cmd_xform_blocks.lock_uvs = settings.correct_uvs
+			for child in builder.get_selected_blocks():
+				cmd_xform_blocks.add_block(child.get_path())
+			
+			return
+	
+	tool_state = ToolState.DRAG_SELECTION
+	drag_select_start_pos = e.position
+	drag_select_to_pos = e.position
+	
+
+func _gui_input(viewport_camera:Camera3D, event:InputEvent)->bool:
+
+	if event is InputEventKey:
+		var e:InputEventKey = event
+		
+		if e.keycode == KEY_ESCAPE:
+			if e.is_pressed():
+				tool_state = ToolState.NONE
+				if cmd_xform_blocks:
+					cmd_xform_blocks.undo_it()
+					cmd_xform_blocks = null
+					
+			return true
+
+		elif e.keycode == KEY_G:
+			if e.is_pressed() && tool_state == ToolState.NONE:
+				tool_state = ToolState.MOVE_BLOCK_CLICK
+				move_constraint = MoveConstraint.Type.PLANE_VIEWPORT
+#				block_drag_p0 = MathUtil.intersect_plane(origin, dir, block_drag_p0, viewport_camera.global_transform.basis.z)
+#				block_drag_p0 = origin + dir * 20
+				block_drag_p0 = Vector3.INF
+				
+				cmd_xform_blocks = CommandTransformBlocks.new()
+				cmd_xform_blocks.builder = builder
+				cmd_xform_blocks.lock_uvs = settings.correct_uvs
+				for child in builder.get_selected_blocks():
+					cmd_xform_blocks.add_block(child.get_path())
+					
+			return true
+
+		elif e.keycode == KEY_X:
+			if tool_state == ToolState.MOVE_BLOCK_CLICK:
+				if e.shift_pressed:
+					move_constraint = MoveConstraint.Type.PLANE_YZ
+				else:
+					move_constraint = MoveConstraint.Type.AXIS_X
+			return true
+
+		elif e.keycode == KEY_Y:
+			if tool_state == ToolState.MOVE_BLOCK_CLICK:
+				if e.shift_pressed:
+					move_constraint = MoveConstraint.Type.PLANE_XZ
+				else:
+					move_constraint = MoveConstraint.Type.AXIS_Y
+			return true
+
+		elif e.keycode == KEY_Z:
+			if tool_state == ToolState.MOVE_BLOCK_CLICK:
+				if e.shift_pressed:
+					move_constraint = MoveConstraint.Type.PLANE_XY
+				else:
+					move_constraint = MoveConstraint.Type.AXIS_Z
+			return true
+
+		if e.keycode == KEY_Q && e.alt_pressed:
+			if e.is_pressed():
+				var origin:Vector3 = viewport_camera.project_ray_origin(mouse_hover_pos)
+				var dir:Vector3 = viewport_camera.project_ray_normal(mouse_hover_pos)
+			
+				var result:IntersectResults = builder.intersect_ray_closest(origin, dir)
+				if result:
+					var cmd:CommandSelectBlocks = CommandSelectBlocks.new()
+					cmd.builder = builder
+					cmd.block_paths.append(result.object.get_path())
+					
+					if cmd.will_change_anything():
+						var undo:EditorUndoRedoManager = builder.get_undo_redo()
+						cmd.add_to_undo_manager(undo)
+						
+						_deactivate()
+						_activate(builder)
+				
+			return true
+				
+	elif event is InputEventMouseButton:
+		
+		var e:InputEventMouseButton = event
+		if e.button_index == MOUSE_BUTTON_LEFT:
+
+			if e.is_pressed():
+				if tool_state == ToolState.NONE:
+					event_start = event
+					
+					tool_state = ToolState.READY
+
+				elif tool_state == ToolState.MOVE_BLOCK_CLICK:
+					var undo:EditorUndoRedoManager = builder.get_undo_redo()
+					cmd_xform_blocks.add_to_undo_manager(undo)
+					
+					tool_state = ToolState.NONE
+				
+			else:
+				if tool_state == ToolState.READY:
+					
+					#We just clicked with the mouse
+					var origin:Vector3 = viewport_camera.project_ray_origin(e.position)
+					var dir:Vector3 = viewport_camera.project_ray_normal(e.position)
+
+					var result:IntersectResults = builder.intersect_ray_closest(origin, dir)
+					
+					#print("Invokke select %s" % result)
+					var cmd:CommandSelectBlocks = CommandSelectBlocks.new()
+					cmd.builder = builder
+					cmd.selection_type = Selection.choose_type(e.shift_pressed, e.ctrl_pressed)
+
+					if result:
+						cmd.block_paths.append(result.object.get_path())
+						
+					if cmd.will_change_anything():
+						var undo:EditorUndoRedoManager = builder.get_undo_redo()
+						cmd.add_to_undo_manager(undo)
+					
+					tool_state = ToolState.NONE
+
+				elif tool_state == ToolState.MOVE_BLOCK:
+					
+					#Finish moving blocks
+					var undo:EditorUndoRedoManager = builder.get_undo_redo()
+					cmd_xform_blocks.add_to_undo_manager(undo)
+					
+					tool_state = ToolState.NONE
+
+				elif tool_state == ToolState.DRAG_SELECTION:
+					
+					var frustum:Array[Plane] = MathUtil.calc_frustum_camera_rect(viewport_camera, drag_select_start_pos, drag_select_to_pos)
+					
+					var result:Array[CyclopsBlock] = builder.intersect_frustum_all(frustum)
+					
+					if !result.is_empty():
+						
+						var cmd:CommandSelectBlocks = CommandSelectBlocks.new()
+						cmd.builder = builder
+						cmd.selection_type = Selection.choose_type(e.shift_pressed, e.ctrl_pressed)
+
+						for r in result:
+							cmd.block_paths.append(r.get_path())
+							
+						if cmd.will_change_anything():
+							var undo:EditorUndoRedoManager = builder.get_undo_redo()
+							cmd.add_to_undo_manager(undo)
+					
+					tool_state = ToolState.NONE
+				
+			return true
+
+		elif e.button_index == MOUSE_BUTTON_RIGHT:
+			if e.is_pressed():
+				#Right click cancel
+				if tool_state == ToolState.MOVE_BLOCK || tool_state == ToolState.MOVE_BLOCK_CLICK:
+					tool_state = ToolState.NONE
+					if cmd_xform_blocks:
+						cmd_xform_blocks.undo_it()
+						cmd_xform_blocks = null
+			
+	elif event is InputEventMouseMotion:
+		var e:InputEventMouseMotion = event
+		
+		mouse_hover_pos = e.position
+
+		if (e.button_mask & MOUSE_BUTTON_MASK_MIDDLE):
+			return super._gui_input(viewport_camera, event)
+
+		var origin:Vector3 = viewport_camera.project_ray_origin(e.position)
+		var dir:Vector3 = viewport_camera.project_ray_normal(e.position)
+		
+		#print("tool_state %s" % tool_state)
+				
+		if tool_state == ToolState.READY:
+			var offset:Vector2 = e.position - event_start.position
+			if offset.length_squared() > MathUtil.square(builder.drag_start_radius):
+				start_drag(viewport_camera, event_start)
+
+			return true
+			
+		elif tool_state == ToolState.MOVE_BLOCK || tool_state == ToolState.MOVE_BLOCK_CLICK:
+			if !block_drag_p0.is_finite():
+				block_drag_p0 = origin + dir * 20
+			
+			var xform_basis:Basis
+			
+			match settings.transform_space:
+				TransformSpace.Type.GLOBAL:
+					xform_basis = Basis.IDENTITY
+				TransformSpace.Type.LOCAL:
+					var active_block:Node3D = builder.get_active_block()
+					xform_basis = active_block.basis
+				TransformSpace.Type.NORMAL:
+					var active_block:Node3D = builder.get_active_block()
+					xform_basis = active_block.basis
+				TransformSpace.Type.VIEW:
+					xform_basis = viewport_camera.global_basis
+				TransformSpace.Type.PARENT:
+					var active_block:Node3D = builder.get_active_block().get_parent_node_3d()
+					xform_basis = active_block.basis
+					
+			
+			match move_constraint:
+				MoveConstraint.Type.AXIS_X:
+					block_drag_cur = MathUtil.closest_point_on_line(origin, dir, block_drag_p0, xform_basis.x)
+				MoveConstraint.Type.AXIS_Y:
+					block_drag_cur = MathUtil.closest_point_on_line(origin, dir, block_drag_p0, xform_basis.y)
+				MoveConstraint.Type.AXIS_Z:
+					block_drag_cur = MathUtil.closest_point_on_line(origin, dir, block_drag_p0, xform_basis.z)
+				MoveConstraint.Type.PLANE_XY:
+					block_drag_cur = MathUtil.intersect_plane(origin, dir, block_drag_p0, xform_basis.z)
+				MoveConstraint.Type.PLANE_XZ:
+					block_drag_cur = MathUtil.intersect_plane(origin, dir, block_drag_p0, xform_basis.y)
+				MoveConstraint.Type.PLANE_YZ:
+					block_drag_cur = MathUtil.intersect_plane(origin, dir, block_drag_p0, xform_basis.x)
+				MoveConstraint.Type.PLANE_VIEWPORT:
+					block_drag_cur = MathUtil.intersect_plane(origin, dir, block_drag_p0, viewport_camera.global_transform.basis.z)
+					
+			#print("dragging move_constraint %s block_drag_cur %s" % [move_constraint, block_drag_cur])
+
+			#var grid_step_size:float = pow(2, builder.get_global_scene().grid_size)
+			#block_drag_cur = MathUtil.snap_to_grid(block_drag_cur, grid_step_size)
+			block_drag_cur = builder.get_snapping_manager().snap_point(block_drag_cur, SnappingQuery.new(viewport_camera))
+			
+			#cmd_move_blocks.move_offset = block_drag_cur - block_drag_p0
+			cmd_xform_blocks.transform = Transform3D(Basis.IDENTITY, block_drag_cur - block_drag_p0)
+			#print("cmd_move_blocks.move_offset %s" % cmd_move_blocks.move_offset)
+			cmd_xform_blocks.do_it()
+
+			return true
+
+		elif tool_state == ToolState.DRAG_SELECTION:
+			drag_select_to_pos = e.position
+			return true
+			
+	
+	return super._gui_input(viewport_camera, event)		
+
+
+func _activate(builder:CyclopsLevelBuilder):
+	super._activate(builder)
+	
+	builder.mode = CyclopsLevelBuilder.Mode.OBJECT
+	var global_scene:CyclopsGlobalScene = builder.get_global_scene()
+	global_scene.clear_tool_mesh()
+
+	var cache:Dictionary = builder.get_tool_cache(TOOL_ID)
+	settings.load_from_cache(cache)
+
+func _deactivate():
+	var global_scene:CyclopsGlobalScene = builder.get_global_scene()
+	global_scene.set_custom_gizmo(null)
+
+	var cache:Dictionary = settings.save_to_cache()
+	builder.set_tool_cache(TOOL_ID, cache)
+

addons/cyclops_level_builder/tools/tool_move_settings.gd

@@ -0,0 +1,39 @@
+# MIT License
+#
+# Copyright (c) 2023 Mark McKay
+# https://github.com/blackears/cyclopsLevelBuilder
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+@tool
+extends Resource
+class_name ToolMoveSettings
+
+@export var transform_space:TransformSpace.Type = TransformSpace.Type.GLOBAL
+@export var correct_uvs:bool = true
+
+func load_from_cache(cache:Dictionary):
+	transform_space = cache.get("transform_space", TransformSpace.Type.GLOBAL)
+	correct_uvs = cache.get("correct_uvs", true)
+	
+func save_to_cache():
+	return {
+		"transform_space": transform_space,
+		"correct_uvs": correct_uvs,
+	}

addons/cyclops_level_builder/tools/tool_move_settings_editor.gd

@@ -0,0 +1,60 @@
+# MIT License
+#
+# Copyright (c) 2023 Mark McKay
+# https://github.com/blackears/cyclopsLevelBuilder
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+@tool
+extends PanelContainer
+class_name ToolMoveSettingsEditor
+
+var settings:ToolMoveSettings:
+	get:
+		return settings
+	set(value):
+		settings = value
+		dirty = true
+
+var dirty:bool = true
+
+
+func _ready():
+	%transform_space.clear()
+	for text in TransformSpace.Type.keys():
+		%transform_space.add_item(text)
+
+func _process(delta):
+	if dirty:
+		update()
+		dirty = false
+
+func update():
+	%transform_space.selected = settings.transform_space
+	%check_correct_uvs.button_pressed = settings.correct_uvs
+	
+	pass
+
+
+func _on_transform_space_item_selected(index):
+	settings.transform_space = index
+
+
+func _on_check_correct_uvs_toggled(toggled_on):
+	settings.correct_uvs = toggled_on

addons/cyclops_level_builder/tools/tool_move_settings_editor.tscn

@@ -0,0 +1,49 @@
+[gd_scene load_steps=2 format=3 uid="uid://c83wthlpyd7dm"]
+
+[ext_resource type="Script" path="res://addons/cyclops_level_builder/tools/tool_move_settings_editor.gd" id="1_w2n7n"]
+
+[node name="ToolMoveSettingsEditor" type="PanelContainer"]
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+offset_right = -929.0
+offset_bottom = -415.0
+grow_horizontal = 2
+grow_vertical = 2
+script = ExtResource("1_w2n7n")
+
+[node name="GridContainer" type="GridContainer" parent="."]
+layout_mode = 2
+columns = 2
+
+[node name="Label" type="Label" parent="GridContainer"]
+layout_mode = 2
+text = "Transform space"
+
+[node name="transform_space" type="OptionButton" parent="GridContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+item_count = 5
+selected = 0
+popup/item_0/text = "GLOBAL"
+popup/item_0/id = 0
+popup/item_1/text = "LOCAL"
+popup/item_1/id = 1
+popup/item_2/text = "NORMAL"
+popup/item_2/id = 2
+popup/item_3/text = "VIEW"
+popup/item_3/id = 3
+popup/item_4/text = "PARENT"
+popup/item_4/id = 4
+
+[node name="Label2" type="Label" parent="GridContainer"]
+layout_mode = 2
+text = "Triplanar Lock UVs"
+
+[node name="check_correct_uvs" type="CheckBox" parent="GridContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+text = "On"
+
+[connection signal="item_selected" from="GridContainer/transform_space" to="." method="_on_transform_space_item_selected"]
+[connection signal="toggled" from="GridContainer/check_correct_uvs" to="." method="_on_check_correct_uvs_toggled"]

addons/cyclops_level_builder/tools/tool_prism.gd

@@ -0,0 +1,265 @@
+# MIT License
+#
+# Copyright (c) 2023 Mark McKay
+# https://github.com/blackears/cyclopsLevelBuilder
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+@tool
+extends CyclopsTool
+class_name ToolPrism
+
+const TOOL_ID:String = "prism"
+
+enum ToolState { READY, BASE_POINTS, DRAG_HEIGHT }
+var tool_state:ToolState = ToolState.READY
+
+var floor_normal:Vector3
+var base_points:PackedVector3Array
+var block_drag_cur:Vector3
+var drag_offset:Vector3
+var preview_point:Vector3
+
+var settings:ToolPrismSettings = ToolPrismSettings.new()
+
+func _get_tool_properties_editor()->Control:
+	var ed:ToolPrismSettingsEditor = preload("res://addons/cyclops_level_builder/tools/tool_prism_settings_editor.tscn").instantiate()
+	
+	ed.settings = settings
+	
+	return ed
+
+func _activate(builder:CyclopsLevelBuilder):
+	super._activate(builder)
+
+	builder.mode = CyclopsLevelBuilder.Mode.OBJECT
+	var global_scene:CyclopsGlobalScene = builder.get_global_scene()
+	global_scene.clear_tool_mesh()
+
+	var cache:Dictionary = builder.get_tool_cache(TOOL_ID)
+	settings.load_from_cache(cache)
+
+func _deactivate():
+	var cache:Dictionary = settings.save_to_cache()
+	builder.set_tool_cache(TOOL_ID, cache)
+
+
+func _draw_tool(viewport_camera:Camera3D):
+	var global_scene:CyclopsGlobalScene = builder.get_global_scene()
+	global_scene.clear_tool_mesh()
+	global_scene.draw_selected_blocks(viewport_camera)
+
+	if tool_state == ToolState.BASE_POINTS:
+		var bounding_points:PackedVector3Array = MathUtil.bounding_polygon_3d(base_points, floor_normal)
+		global_scene.draw_loop(bounding_points, true, global_scene.tool_material)
+		global_scene.draw_points(bounding_points, global_scene.vertex_tool_material)
+
+		global_scene.draw_vertex(preview_point, global_scene.vertex_tool_material)
+
+	if tool_state == ToolState.DRAG_HEIGHT:		
+		var bounding_points:PackedVector3Array = MathUtil.bounding_polygon_3d(base_points, floor_normal)
+		global_scene.draw_prism(bounding_points, drag_offset, global_scene.tool_material, global_scene.vertex_tool_material)
+	
+
+func _gui_input(viewport_camera:Camera3D, event:InputEvent)->bool:	
+		
+	var blocks_root:Node = builder.get_block_add_parent()
+	#var grid_step_size:float = pow(2, builder.get_global_scene().grid_size)
+
+	if event is InputEventKey:
+		var e:InputEventKey = event
+		
+		if e.keycode == KEY_ENTER:
+			if e.is_pressed():
+				if tool_state == ToolState.BASE_POINTS:
+					var camera_dir:Vector3 = viewport_camera.global_transform.basis.z
+					var angle_with_base:float = acos(floor_normal.dot(camera_dir))
+					var drag_angle_limit:float = builder.get_global_scene().drag_angle_limit
+					if angle_with_base < drag_angle_limit || angle_with_base > PI - drag_angle_limit:
+						var height = settings.default_block_height
+						
+						if settings.match_selected_block:
+							height = calc_active_block_orthogonal_height(base_points[0], floor_normal)
+						
+						drag_offset = floor_normal * height
+						block_drag_cur = base_points[0] + drag_offset
+						
+						create_block()
+						
+						tool_state = ToolState.READY
+					else:
+					
+						drag_offset = Vector3.ZERO
+						tool_state = ToolState.DRAG_HEIGHT
+			return true
+			
+		elif e.keycode == KEY_BACKSPACE:
+			if e.is_pressed():
+				base_points.remove_at(base_points.size() - 1)
+			return true
+			
+		elif e.keycode == KEY_ESCAPE:
+			if e.is_pressed():
+				tool_state = ToolState.READY
+			return true
+	
+	elif event is InputEventMouseButton:
+		
+		var e:InputEventMouseButton = event
+		if e.button_index == MOUSE_BUTTON_LEFT:
+
+			if e.is_pressed():
+				
+				var origin:Vector3 = viewport_camera.project_ray_origin(e.position)
+				var dir:Vector3 = viewport_camera.project_ray_normal(e.position)				
+				
+				if tool_state == ToolState.READY:
+					base_points.clear()
+					tool_state = ToolState.BASE_POINTS
+
+					var result:IntersectResults = builder.intersect_ray_closest(origin, dir)
+					if result && settings.block_alignment == BlockAlignment.Type.ALIGN_TO_SURFACE:
+						floor_normal = result.get_world_normal()
+
+						var p:Vector3 = builder.get_snapping_manager().snap_point(result.get_world_position(), SnappingQuery.new(viewport_camera))
+
+						base_points.append(p)
+						preview_point = p
+
+						return true
+						
+					else:
+						#print("init base point empty space")
+						var draw_plane_point:Vector3 = Vector3.ZERO
+						var draw_plane_normal:Vector3 = BlockAlignment.get_plane_normal(settings.block_alignment)
+						if settings.match_selected_block:
+							draw_plane_point = calc_empty_space_draw_plane_origin(viewport_camera, draw_plane_point, draw_plane_normal)
+							
+						var hit_result = calc_hit_point_empty_space(origin, dir, viewport_camera, draw_plane_point, draw_plane_normal)
+						var start_pos:Vector3 = hit_result[0]
+						floor_normal = hit_result[1]
+						
+						
+#						var p:Vector3 = MathUtil.snap_to_grid(start_pos, grid_step_size)
+						var p:Vector3 = builder.get_snapping_manager().snap_point(start_pos, SnappingQuery.new(viewport_camera))
+						base_points.append(p)
+						
+						return true
+						
+				elif tool_state == ToolState.BASE_POINTS:
+					#print("add base point")
+					if e.double_click:
+						if e.is_pressed():
+							var camera_dir:Vector3 = viewport_camera.global_transform.basis.z
+							var angle_with_base:float = acos(floor_normal.dot(camera_dir))
+							var drag_angle_limit:float = builder.get_global_scene().drag_angle_limit
+							if angle_with_base < drag_angle_limit || angle_with_base > PI - drag_angle_limit:
+								var height = settings.default_block_height
+								
+								if settings.match_selected_block:
+									height = calc_active_block_orthogonal_height(base_points[0], floor_normal)
+								
+								drag_offset = floor_normal * height
+								block_drag_cur = base_points[0] + drag_offset
+								
+								create_block()
+								
+								tool_state = ToolState.READY
+							else:
+								drag_offset = Vector3.ZERO
+								tool_state = ToolState.DRAG_HEIGHT
+						return true
+
+					var p_isect:Vector3 = MathUtil.intersect_plane(origin, dir, base_points[0], floor_normal)
+					var p:Vector3 = builder.get_snapping_manager().snap_point(p_isect, SnappingQuery.new(viewport_camera))
+					base_points.append(p)
+
+					var bounding_points:PackedVector3Array = MathUtil.bounding_polygon_3d(base_points, floor_normal)
+					return true
+					
+				elif tool_state == ToolState.DRAG_HEIGHT:
+					create_block()
+					
+					tool_state = ToolState.READY
+					return true
+
+		if e.button_index == MOUSE_BUTTON_RIGHT:
+			
+			if tool_state == ToolState.BASE_POINTS:
+				if e.is_pressed():
+					for p_idx in base_points.size():
+						var screen_pos:Vector2 = viewport_camera.unproject_position(base_points[p_idx])
+						if screen_pos.distance_to(e.position) < builder.handle_screen_radius:
+							base_points.remove_at(p_idx)
+							break
+				return true		
+			
+	elif event is InputEventMouseMotion:
+		var e:InputEventMouseMotion = event
+
+		if (e.button_mask & MOUSE_BUTTON_MASK_MIDDLE):
+			return false		
+
+		var origin:Vector3 = viewport_camera.project_ray_origin(e.position)
+		var dir:Vector3 = viewport_camera.project_ray_normal(e.position)
+
+		var start_pos:Vector3 = origin + builder.block_create_distance * dir
+		var w2l = blocks_root.global_transform.inverse()
+		var origin_local:Vector3 = w2l * origin
+		var dir_local:Vector3 = w2l.basis * dir
+
+		if tool_state == ToolState.BASE_POINTS:
+			var p_isect:Vector3 = MathUtil.intersect_plane(origin, dir, base_points[0], floor_normal)
+			preview_point = builder.get_snapping_manager().snap_point(p_isect, SnappingQuery.new(viewport_camera))
+			
+
+		elif tool_state == ToolState.DRAG_HEIGHT:
+			block_drag_cur = MathUtil.closest_point_on_line(origin_local, dir_local, base_points[0], floor_normal)
+			
+			block_drag_cur = builder.get_snapping_manager().snap_point(block_drag_cur, SnappingQuery.new(viewport_camera))
+			
+			drag_offset = block_drag_cur - base_points[0]
+			var bounding_points:PackedVector3Array = MathUtil.bounding_polygon_3d(base_points, floor_normal)
+
+			return true
+
+	return super._gui_input(viewport_camera, event)		
+
+func create_block():
+	var blocks_root:Node = builder.get_block_add_parent()
+	
+	var bounding_points:PackedVector3Array = MathUtil.bounding_polygon_3d(base_points, floor_normal)
+	drag_offset = block_drag_cur - base_points[0]
+
+	var cmd:CommandAddPrism = CommandAddPrism.new()
+	cmd.builder = builder
+	cmd.block_name = GeneralUtil.find_unique_name(blocks_root, "Block_")
+	cmd.blocks_root_path = blocks_root.get_path()
+	cmd.base_polygon = bounding_points
+	#cmd.local_transform = local_xform
+	cmd.extrude = drag_offset
+	cmd.uv_transform = builder.tool_uv_transform
+	cmd.material_path = builder.tool_material_path
+	cmd.collision_type = settings.collision_type
+	cmd.collision_layers = settings.collision_layer
+	cmd.collision_mask = settings.collision_mask
+
+	var undo:EditorUndoRedoManager = builder.get_undo_redo()
+
+	cmd.add_to_undo_manager(undo)

addons/cyclops_level_builder/tools/tool_prism_settings.gd

@@ -0,0 +1,56 @@
+# MIT License
+#
+# Copyright (c) 2023 Mark McKay
+# https://github.com/blackears/cyclopsLevelBuilder
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+@tool
+extends Resource
+class_name ToolPrismSettings
+
+
+@export var block_alignment:BlockAlignment.Type = BlockAlignment.Type.ALIGN_TO_SURFACE
+@export var match_selected_block:bool = true
+@export var default_block_elevation:float = 0
+@export var default_block_height:float = 1
+@export var collision_type:Collision.Type = Collision.Type.STATIC
+@export_flags_3d_physics var collision_layer:int = 1
+@export_flags_3d_physics var collision_mask:int = 1
+
+func load_from_cache(cache:Dictionary):
+	block_alignment = cache.get("block_alignment", BlockAlignment.Type.ALIGN_TO_SURFACE)
+	match_selected_block = cache.get("match_selected_block", true)
+	default_block_elevation = cache.get("default_block_elevation", 0)
+	default_block_height = cache.get("default_block_height", 1)
+	collision_type = cache.get("collision_type", Collision.Type.STATIC)
+	collision_layer = cache.get("collision_layer", 1)
+	collision_mask = cache.get("collision_mask", 1)
+	
+func save_to_cache():
+	return {
+		"block_alignment": block_alignment,
+		"match_selected_block": match_selected_block,
+		"default_block_elevation": default_block_elevation,
+		"default_block_height": default_block_height,
+		"collision_type": collision_type,
+		"collision_layer": collision_layer,
+		"collision_mask": collision_mask,
+	}
+

addons/cyclops_level_builder/tools/tool_prism_settings_editor.gd

@@ -0,0 +1,90 @@
+# MIT License
+#
+# Copyright (c) 2023 Mark McKay
+# https://github.com/blackears/cyclopsLevelBuilder
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+@tool
+extends PanelContainer
+class_name ToolPrismSettingsEditor
+
+var settings:ToolPrismSettings:
+	get:
+		return settings
+	set(value):
+		settings = value
+		dirty = true
+
+var dirty:bool = true
+
+func _ready():
+	%collision_type.clear()
+	for text in Collision.Type.keys():
+		%collision_type.add_item(text)
+
+func _process(delta):
+	if dirty:
+		update()
+		dirty = false
+
+func update():
+	if !settings:
+		%check_match_selected_block.disabled = true
+		%default_block_elevation.disabled = true
+		%default_block_height.disabled = true
+		return
+
+	%check_match_selected_block.disabled = false
+	%check_match_selected_block.button_pressed = settings.match_selected_block
+	%default_block_elevation.disabled = false
+	%default_block_elevation.value = settings.default_block_elevation
+	%default_block_height.disabled = false
+	%default_block_height.value = settings.default_block_height
+
+	%alignment_type.selected = settings.block_alignment
+
+	%collision_type.selected = settings.collision_type
+	%collision_layers.value = settings.collision_layer
+	%collision_mask.value = settings.collision_mask
+	
+func _on_default_block_height_value_changed(value:float):
+	settings.default_block_height = value
+
+
+func _on_default_block_elevation_value_changed(value:float):
+	settings.default_block_elevation = value
+
+
+func _on_check_match_selected_block_toggled(value:bool):
+	settings.match_selected_block = value
+
+func _on_collision_layers_value_changed(value):
+	settings.collision_layer = value
+
+
+func _on_collision_mask_value_changed(value):
+	settings.collision_mask = value
+
+func _on_collision_type_item_selected(index):
+	settings.collision_type = index
+
+
+func _on_alignment_type_item_selected(index):
+	settings.block_alignment = index

addons/cyclops_level_builder/tools/tool_prism_settings_editor.tscn

@@ -0,0 +1,132 @@
+[gd_scene load_steps=3 format=3 uid="uid://b7vyy46r72h0d"]
+
+[ext_resource type="Script" path="res://addons/cyclops_level_builder/tools/tool_prism_settings_editor.gd" id="1_rbt26"]
+[ext_resource type="PackedScene" uid="uid://diibmlqy1mpqb" path="res://addons/cyclops_level_builder/controls/numeric_line_edit.tscn" id="2_aysnj"]
+
+[node name="ToolPrismSettings" type="PanelContainer"]
+offset_right = 315.0
+offset_bottom = 70.0
+script = ExtResource("1_rbt26")
+
+[node name="PanelContainer" type="PanelContainer" parent="."]
+layout_mode = 2
+
+[node name="VBoxContainer" type="VBoxContainer" parent="PanelContainer"]
+layout_mode = 2
+
+[node name="GridContainer" type="GridContainer" parent="PanelContainer/VBoxContainer"]
+layout_mode = 2
+columns = 2
+
+[node name="Label" type="Label" parent="PanelContainer/VBoxContainer/GridContainer"]
+layout_mode = 2
+text = "Collision Type"
+
+[node name="collision_type" type="OptionButton" parent="PanelContainer/VBoxContainer/GridContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+item_count = 4
+selected = 0
+popup/item_0/text = "NONE"
+popup/item_0/id = 0
+popup/item_1/text = "STATIC"
+popup/item_1/id = 1
+popup/item_2/text = "KINEMATIC"
+popup/item_2/id = 2
+popup/item_3/text = "RIGID"
+popup/item_3/id = 3
+
+[node name="Label2" type="Label" parent="PanelContainer/VBoxContainer/GridContainer"]
+layout_mode = 2
+text = "Collision Layers"
+
+[node name="collision_layers" type="SpinBox" parent="PanelContainer/VBoxContainer/GridContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+size_flags_horizontal = 3
+rounded = true
+allow_greater = true
+allow_lesser = true
+
+[node name="Label3" type="Label" parent="PanelContainer/VBoxContainer/GridContainer"]
+layout_mode = 2
+text = "Collision Mask"
+
+[node name="collision_mask" type="SpinBox" parent="PanelContainer/VBoxContainer/GridContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+rounded = true
+allow_greater = true
+allow_lesser = true
+
+[node name="Label5" type="Label" parent="PanelContainer/VBoxContainer/GridContainer"]
+layout_mode = 2
+text = "Alignment"
+
+[node name="alignment_type" type="OptionButton" parent="PanelContainer/VBoxContainer/GridContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+item_count = 4
+selected = 0
+popup/item_0/text = "Align to surface"
+popup/item_0/id = 0
+popup/item_1/text = "XY Plane"
+popup/item_1/id = 1
+popup/item_2/text = "XZ Plane"
+popup/item_2/id = 2
+popup/item_3/text = "YZ Plane"
+popup/item_3/id = 3
+
+[node name="Label4" type="Label" parent="PanelContainer/VBoxContainer/GridContainer"]
+layout_mode = 2
+text = "Match Active Block"
+
+[node name="check_match_selected_block" type="CheckBox" parent="PanelContainer/VBoxContainer/GridContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+tooltip_text = "When drawing in empty space, copy elevation and height properties from currently selected block."
+disabled = true
+text = "Match selected block"
+
+[node name="Label" type="Label" parent="PanelContainer/VBoxContainer"]
+layout_mode = 2
+text = "Orthogonal Viewport:"
+
+[node name="MarginContainer" type="MarginContainer" parent="PanelContainer/VBoxContainer"]
+layout_mode = 2
+theme_override_constants/margin_left = 16
+
+[node name="VBoxContainer" type="VBoxContainer" parent="PanelContainer/VBoxContainer/MarginContainer"]
+layout_mode = 2
+
+[node name="GridContainer" type="GridContainer" parent="PanelContainer/VBoxContainer/MarginContainer/VBoxContainer"]
+layout_mode = 2
+columns = 2
+
+[node name="Label" type="Label" parent="PanelContainer/VBoxContainer/MarginContainer/VBoxContainer/GridContainer"]
+layout_mode = 2
+text = "Default Block Elevation"
+
+[node name="default_block_elevation" parent="PanelContainer/VBoxContainer/MarginContainer/VBoxContainer/GridContainer" instance=ExtResource("2_aysnj")]
+unique_name_in_owner = true
+layout_mode = 2
+size_flags_horizontal = 3
+disabled = true
+
+[node name="Label2" type="Label" parent="PanelContainer/VBoxContainer/MarginContainer/VBoxContainer/GridContainer"]
+layout_mode = 2
+text = "Default Block Height"
+
+[node name="default_block_height" parent="PanelContainer/VBoxContainer/MarginContainer/VBoxContainer/GridContainer" instance=ExtResource("2_aysnj")]
+unique_name_in_owner = true
+layout_mode = 2
+size_flags_horizontal = 3
+disabled = true
+
+[connection signal="item_selected" from="PanelContainer/VBoxContainer/GridContainer/collision_type" to="." method="_on_collision_type_item_selected"]
+[connection signal="value_changed" from="PanelContainer/VBoxContainer/GridContainer/collision_layers" to="." method="_on_collision_layers_value_changed"]
+[connection signal="value_changed" from="PanelContainer/VBoxContainer/GridContainer/collision_mask" to="." method="_on_collision_mask_value_changed"]
+[connection signal="item_selected" from="PanelContainer/VBoxContainer/GridContainer/alignment_type" to="." method="_on_alignment_type_item_selected"]
+[connection signal="toggled" from="PanelContainer/VBoxContainer/GridContainer/check_match_selected_block" to="." method="_on_check_match_selected_block_toggled"]
+[connection signal="value_changed" from="PanelContainer/VBoxContainer/MarginContainer/VBoxContainer/GridContainer/default_block_elevation" to="." method="_on_default_block_elevation_value_changed"]
+[connection signal="value_changed" from="PanelContainer/VBoxContainer/MarginContainer/VBoxContainer/GridContainer/default_block_height" to="." method="_on_default_block_height_value_changed"]

addons/cyclops_level_builder/tools/tool_rotate.gd

@@ -0,0 +1,336 @@
+# MIT License
+#
+# Copyright (c) 2023 Mark McKay
+# https://github.com/blackears/cyclopsLevelBuilder
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+@tool
+extends CyclopsTool
+class_name ToolRotate
+
+const TOOL_ID:String = "rotate"
+
+
+enum ToolState { NONE, READY, ROTATE_BLOCK, DRAG_SELECTION }
+var tool_state:ToolState = ToolState.NONE
+
+#enum MoveConstraint { NONE, AXIS_X, AXIS_Y, AXIS_Z, PLANE_XY, PLANE_XZ, PLANE_YZ, PLANE_VIEWPORT }
+var move_constraint:MoveConstraint.Type = MoveConstraint.Type.NONE
+
+#var viewport_camera_start:Camera3D
+var event_start:InputEventMouseButton
+
+var drag_select_start_pos:Vector2
+var drag_select_to_pos:Vector2
+
+var block_drag_cur:Vector3
+var block_drag_p0:Vector3
+var block_drag_origin:Vector3
+
+var gizmo_rotate:GizmoRotate
+
+var mouse_hover_pos:Vector2
+
+#Keep a copy of move command here while we are building it
+var cmd_transform_blocks:CommandTransformBlocks
+
+func _get_tool_id()->String:
+	return TOOL_ID
+
+func draw_gizmo(viewport_camera:Camera3D):
+	var global_scene:CyclopsGlobalScene = builder.get_global_scene()
+	if !gizmo_rotate:
+		gizmo_rotate = preload("res://addons/cyclops_level_builder/tools/gizmos/gizmo_rotate.tscn").instantiate()
+	
+	var blocks:Array[CyclopsBlock] = builder.get_selected_blocks()
+	if blocks.is_empty():
+		global_scene.set_custom_gizmo(null)
+	else:
+		var origin:Vector3
+		for block in blocks:
+			origin += block.global_transform.origin
+		origin /= blocks.size()
+		global_scene.set_custom_gizmo(gizmo_rotate)
+		gizmo_rotate.global_transform.origin = origin
+	
+
+func _draw_tool(viewport_camera:Camera3D):
+	var global_scene:CyclopsGlobalScene = builder.get_global_scene()
+	global_scene.clear_tool_mesh()
+	global_scene.draw_selected_blocks(viewport_camera)
+
+	if tool_state == ToolState.DRAG_SELECTION:
+		#print("draw sel %s " % drag_select_to_pos)
+		global_scene.draw_screen_rect(viewport_camera, drag_select_start_pos, drag_select_to_pos, global_scene.selection_rect_material)
+
+	draw_gizmo(viewport_camera)
+	
+
+
+func start_drag(viewport_camera:Camera3D, event:InputEvent):
+	var blocks_root:Node = builder.get_block_add_parent()
+	var e:InputEventMouseButton = event
+	
+	var origin:Vector3 = viewport_camera.project_ray_origin(e.position)
+	var dir:Vector3 = viewport_camera.project_ray_normal(e.position)
+
+	move_constraint = MoveConstraint.Type.NONE
+
+	if gizmo_rotate:
+		var part_res:GizmoRotate.IntersectResult = gizmo_rotate.intersect(origin, dir, viewport_camera)
+		if part_res:
+			#print("Gizmo hit ", part_res.part)
+			match part_res.part:
+				GizmoRotate.Part.PLANE_XY:
+					move_constraint = MoveConstraint.Type.PLANE_XY
+				GizmoRotate.Part.PLANE_XZ:
+					move_constraint = MoveConstraint.Type.PLANE_XZ
+				GizmoRotate.Part.PLANE_YZ:
+					move_constraint = MoveConstraint.Type.PLANE_YZ
+
+			var start_pos:Vector3 = part_res.pos_world
+#			var grid_step_size:float = pow(2, builder.get_global_scene().grid_size)
+
+			#block_drag_p0 = MathUtil.snap_to_grid(start_pos, grid_step_size)
+			block_drag_p0 = start_pos
+
+			var blocks:Array[CyclopsBlock] = builder.get_selected_blocks()
+			#var blocks_origin:Vector3
+			block_drag_origin = Vector3.ZERO
+			for block in blocks:
+				block_drag_origin += block.global_transform.origin
+			block_drag_origin /= blocks.size()
+
+	#		print("res obj %s" % result.object.get_path())
+			var sel_blocks:Array[CyclopsBlock] = builder.get_selected_blocks()
+			if !sel_blocks.is_empty():
+				
+				tool_state = ToolState.ROTATE_BLOCK
+				#print("Move block")
+				
+				cmd_transform_blocks = CommandTransformBlocks.new()
+				cmd_transform_blocks.builder = builder
+				cmd_transform_blocks.lock_uvs = builder.lock_uvs
+				for child in sel_blocks:
+					cmd_transform_blocks.add_block(child.get_path())
+
+			return
+
+	
+	tool_state = ToolState.DRAG_SELECTION
+	drag_select_start_pos = e.position
+	drag_select_to_pos = e.position
+
+
+
+func _gui_input(viewport_camera:Camera3D, event:InputEvent)->bool:
+
+	if event is InputEventKey:
+		var e:InputEventKey = event
+		
+		if e.keycode == KEY_ESCAPE:
+			if e.is_pressed():
+				tool_state = ToolState.NONE
+				if cmd_transform_blocks:
+					cmd_transform_blocks.undo_it()
+					cmd_transform_blocks = null
+					
+			return true
+
+
+		if e.keycode == KEY_Q && e.alt_pressed:
+			if e.is_pressed():
+				var origin:Vector3 = viewport_camera.project_ray_origin(mouse_hover_pos)
+				var dir:Vector3 = viewport_camera.project_ray_normal(mouse_hover_pos)
+			
+				var result:IntersectResults = builder.intersect_ray_closest(origin, dir)
+				if result:
+					var cmd:CommandSelectBlocks = CommandSelectBlocks.new()
+					cmd.builder = builder
+					cmd.block_paths.append(result.object.get_path())
+					
+					if cmd.will_change_anything():
+						var undo:EditorUndoRedoManager = builder.get_undo_redo()
+						cmd.add_to_undo_manager(undo)
+						
+						_deactivate()
+						_activate(builder)
+				
+			return true
+				
+	elif event is InputEventMouseButton:
+		
+		var e:InputEventMouseButton = event
+		if e.button_index == MOUSE_BUTTON_LEFT:
+
+			if e.is_pressed():
+				if tool_state == ToolState.NONE:
+					event_start = event
+					
+					tool_state = ToolState.READY
+				
+			else:
+				if tool_state == ToolState.READY:
+					
+					#We just clicked with the mouse
+					var origin:Vector3 = viewport_camera.project_ray_origin(e.position)
+					var dir:Vector3 = viewport_camera.project_ray_normal(e.position)
+
+					var result:IntersectResults = builder.intersect_ray_closest(origin, dir)
+					
+					#print("Invoke select %s" % result)
+					var cmd:CommandSelectBlocks = CommandSelectBlocks.new()
+					cmd.builder = builder
+					cmd.selection_type = Selection.choose_type(e.shift_pressed, e.ctrl_pressed)
+
+					if result:
+						cmd.block_paths.append(result.object.get_path())
+						
+					if cmd.will_change_anything():
+						var undo:EditorUndoRedoManager = builder.get_undo_redo()
+						cmd.add_to_undo_manager(undo)
+					
+					tool_state = ToolState.NONE
+
+				elif tool_state == ToolState.ROTATE_BLOCK:
+					
+					#Finish moving blocks
+					var undo:EditorUndoRedoManager = builder.get_undo_redo()
+					cmd_transform_blocks.add_to_undo_manager(undo)
+					
+					tool_state = ToolState.NONE
+
+				elif tool_state == ToolState.DRAG_SELECTION:
+					
+					var frustum:Array[Plane] = MathUtil.calc_frustum_camera_rect(viewport_camera, drag_select_start_pos, drag_select_to_pos)
+					
+					var result:Array[CyclopsBlock] = builder.intersect_frustum_all(frustum)
+					
+					if !result.is_empty():
+						
+						var cmd:CommandSelectBlocks = CommandSelectBlocks.new()
+						cmd.builder = builder
+						cmd.selection_type = Selection.choose_type(e.shift_pressed, e.ctrl_pressed)
+
+						for r in result:
+							cmd.block_paths.append(r.get_path())
+							
+						if cmd.will_change_anything():
+							var undo:EditorUndoRedoManager = builder.get_undo_redo()
+							cmd.add_to_undo_manager(undo)
+					
+					tool_state = ToolState.NONE
+				
+			return true
+
+		elif e.button_index == MOUSE_BUTTON_RIGHT:
+			if e.is_pressed():
+				#Right click cancel
+				if tool_state == ToolState.ROTATE_BLOCK:
+					tool_state = ToolState.NONE
+					if cmd_transform_blocks:
+						cmd_transform_blocks.undo_it()
+						cmd_transform_blocks = null
+			
+	elif event is InputEventMouseMotion:
+		var e:InputEventMouseMotion = event
+		
+		mouse_hover_pos = e.position
+
+		if (e.button_mask & MOUSE_BUTTON_MASK_MIDDLE):
+			return super._gui_input(viewport_camera, event)
+
+		var origin:Vector3 = viewport_camera.project_ray_origin(e.position)
+		var dir:Vector3 = viewport_camera.project_ray_normal(e.position)
+		
+		#print("tool_state %s" % tool_state)
+				
+		if tool_state == ToolState.READY:
+			var offset:Vector2 = e.position - event_start.position
+			if offset.length_squared() > MathUtil.square(builder.drag_start_radius):
+				start_drag(viewport_camera, event_start)
+
+			return true
+			
+		elif tool_state == ToolState.ROTATE_BLOCK:
+			if !block_drag_p0.is_finite():
+				block_drag_p0 = origin + dir * 20
+			
+			var rot_axis:Vector3
+			match move_constraint:
+				MoveConstraint.Type.PLANE_XY:
+					block_drag_cur = MathUtil.intersect_plane(origin, dir, block_drag_p0, Vector3.BACK)
+					rot_axis = Vector3.BACK
+				MoveConstraint.Type.PLANE_XZ:
+					block_drag_cur = MathUtil.intersect_plane(origin, dir, block_drag_p0, Vector3.UP)
+					rot_axis = Vector3.UP
+				MoveConstraint.Type.PLANE_YZ:
+					block_drag_cur = MathUtil.intersect_plane(origin, dir, block_drag_p0, Vector3.RIGHT)
+					rot_axis = Vector3.RIGHT
+				MoveConstraint.Type.PLANE_VIEWPORT:
+					block_drag_cur = MathUtil.intersect_plane(origin, dir, block_drag_p0, viewport_camera.global_transform.basis.z)
+					rot_axis = viewport_camera.global_transform.basis.z
+					
+			#print("dragging move_constraint %s block_drag_cur %s" % [move_constraint, block_drag_cur])
+
+			var v0:Vector3 = (block_drag_p0 - block_drag_origin).normalized()
+			var v1:Vector3 = (block_drag_cur - block_drag_origin).normalized()
+			var binorm:Vector3 = v0.cross(rot_axis)
+
+			var angle:float = atan2(v1.dot(binorm), v1.dot(v0))
+			var snapped_angle = builder.get_snapping_manager().snap_angle(rad_to_deg(angle), SnappingQuery.new(viewport_camera))
+			angle = deg_to_rad(snapped_angle)
+
+			var xform:Transform3D = Transform3D.IDENTITY
+			xform = xform.translated_local(block_drag_origin)
+			xform = xform.rotated_local(rot_axis, -angle)
+			xform = xform.translated_local(-block_drag_origin)
+			#var rot_basis:Basis
+			#rot_basis = rot_basis.rotated(rot_axis, angle)
+			
+			
+
+			block_drag_cur = builder.get_snapping_manager().snap_point(block_drag_cur, SnappingQuery.new(viewport_camera))
+			
+			cmd_transform_blocks.transform = xform
+			#print("cmd_move_blocks.move_offset %s" % cmd_move_blocks.move_offset)
+			cmd_transform_blocks.do_it()
+
+			return true
+
+		elif tool_state == ToolState.DRAG_SELECTION:
+			drag_select_to_pos = e.position
+			return true
+			
+	
+	return super._gui_input(viewport_camera, event)		
+
+
+func _activate(builder:CyclopsLevelBuilder):
+	super._activate(builder)
+	
+	builder.mode = CyclopsLevelBuilder.Mode.OBJECT
+	var global_scene:CyclopsGlobalScene = builder.get_global_scene()
+	global_scene.clear_tool_mesh()
+
+func _deactivate():
+	var global_scene:CyclopsGlobalScene = builder.get_global_scene()
+	global_scene.set_custom_gizmo(null)
+

addons/cyclops_level_builder/tools/tool_stairs.gd

@@ -0,0 +1,319 @@
+# MIT License
+#
+# Copyright (c) 2023 Mark McKay
+# https://github.com/blackears/cyclopsLevelBuilder
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+@tool
+extends CyclopsTool
+class_name ToolStairs
+
+const TOOL_ID:String = "stairs"
+
+enum ToolState { READY, DRAG_BASE, DRAG_HEIGHT }
+var tool_state:ToolState = ToolState.READY
+
+var settings:ToolStairsSettings = ToolStairsSettings.new()
+
+var floor_normal:Vector3
+var drag_origin:Vector3
+var base_drag_cur:Vector3
+var block_drag_cur:Vector3
+
+
+func _activate(builder:CyclopsLevelBuilder):
+	super._activate(builder)
+
+	builder.mode = CyclopsLevelBuilder.Mode.OBJECT
+	var global_scene:CyclopsGlobalScene = builder.get_global_scene()
+	global_scene.clear_tool_mesh()
+
+	var cache:Dictionary = builder.get_tool_cache(TOOL_ID)
+	settings.load_from_cache(cache)
+
+func _deactivate():
+	var cache:Dictionary = settings.save_to_cache()
+	builder.set_tool_cache(TOOL_ID, cache)
+			
+func _get_tool_properties_editor()->Control:
+	#var res_insp:ResourceInspector = preload("res://addons/cyclops_level_builder/controls/resource_inspector/resource_inspector.tscn").instantiate()
+	#
+	#res_insp.target = settings
+	#
+	#return res_insp
+	var ed:ToolStairsSettingsEditor = preload("res://addons/cyclops_level_builder/tools/tool_stairs_settings_editor.tscn").instantiate()
+	
+	ed.settings = settings
+	
+	return ed
+	
+func _draw_tool(viewport_camera:Camera3D):
+	var global_scene:CyclopsGlobalScene = builder.get_global_scene()
+	global_scene.clear_tool_mesh()
+	global_scene.draw_selected_blocks(viewport_camera)
+
+
+	if tool_state == ToolState.DRAG_BASE:
+		var p01:Vector3
+		var p10:Vector3
+		var axis:MathUtil.Axis = MathUtil.get_longest_axis(floor_normal)
+		match axis:
+			MathUtil.Axis.X:
+				p01 = Vector3(drag_origin.x, drag_origin.y, base_drag_cur.z)
+				p10 = Vector3(drag_origin.x, base_drag_cur.y, drag_origin.z)
+			MathUtil.Axis.Y:
+				p01 = Vector3(drag_origin.x, drag_origin.y, base_drag_cur.z)
+				p10 = Vector3(base_drag_cur.x, drag_origin.y, drag_origin.z)
+			MathUtil.Axis.Z:
+				p01 = Vector3(drag_origin.x, base_drag_cur.y, drag_origin.z)
+				p10 = Vector3(base_drag_cur.x, drag_origin.y, drag_origin.z)
+
+		var base_points:PackedVector3Array = [drag_origin, p01, base_drag_cur, p10]
+		
+		global_scene.draw_loop(base_points, true, global_scene.tool_material)
+		global_scene.draw_points(base_points, global_scene.vertex_tool_material)
+		
+	if tool_state == ToolState.DRAG_HEIGHT:
+		var tan_bi:Array[Vector3] = MathUtil.get_axis_aligned_tangent_and_binormal(floor_normal)
+		var u_normal:Vector3 = tan_bi[0]
+		var v_normal:Vector3 = tan_bi[1]
+
+		#Rotate ccw by 90 degree increments
+		match settings.direction:
+			1:
+				var tmp:Vector3 = u_normal
+				u_normal = -v_normal
+				v_normal = tmp
+			2:
+				u_normal = -u_normal
+				v_normal = -v_normal
+			3:
+				var tmp:Vector3 = -u_normal
+				u_normal = v_normal
+				v_normal = tmp
+		
+		var u_span:Vector3 = (base_drag_cur - drag_origin).project(u_normal)
+		var v_span:Vector3 = (base_drag_cur - drag_origin).project(v_normal)
+		
+		var stairs_origin:Vector3 = drag_origin
+		if u_span.dot(u_normal) < 0:
+			stairs_origin += u_span
+			u_span = -u_span
+		if v_span.dot(v_normal) < 0:
+			stairs_origin += v_span
+			v_span = -v_span
+		
+		#Stairs should ascend along v axis
+		global_scene.draw_cube(drag_origin, base_drag_cur, block_drag_cur, global_scene.tool_material, global_scene.vertex_tool_material)
+		
+		var height_offset = block_drag_cur - base_drag_cur
+		if height_offset.dot(floor_normal) < 0:
+			return
+		var num_steps:int = min(v_span.length() / settings.step_depth, height_offset.length() / settings.step_height)
+
+		var max_height:float = floor(height_offset.length() / settings.step_height) * settings.step_height
+
+		var step_span:Vector3 = v_normal * settings.step_depth
+		for i in num_steps:
+			var base_points:PackedVector3Array = [stairs_origin + step_span * i, \
+				stairs_origin + u_span + step_span * i, \
+				stairs_origin + u_span + step_span * (i + 1), \
+				stairs_origin + step_span * (i + 1)]
+			global_scene.draw_prism(base_points, \
+				floor_normal * (max_height - settings.step_height * i), \
+				global_scene.tool_material, \
+				global_scene.vertex_tool_material)
+
+
+func _gui_input(viewport_camera:Camera3D, event:InputEvent)->bool:	
+		
+	var blocks_root:Node = builder.get_block_add_parent()
+	#var grid_step_size:float = pow(2, builder.get_global_scene().grid_size)
+
+	if event is InputEventKey:
+		var e:InputEventKey = event
+		
+		if e.keycode == KEY_ESCAPE:
+			if e.is_pressed():
+				tool_state = ToolState.READY
+			return true
+			
+	elif event is InputEventMouseButton:
+		
+		var e:InputEventMouseButton = event
+		if e.button_index == MOUSE_BUTTON_LEFT:
+
+			if e.is_pressed():
+				
+				var origin:Vector3 = viewport_camera.project_ray_origin(e.position)
+				var dir:Vector3 = viewport_camera.project_ray_normal(e.position)
+				
+				if tool_state == ToolState.READY:
+					tool_state = ToolState.DRAG_BASE
+
+					
+					var result:IntersectResults = builder.intersect_ray_closest(origin, dir)
+					if result && settings.block_alignment == BlockAlignment.Type.ALIGN_TO_SURFACE:
+						#print("init base point block")
+						floor_normal = result.get_world_normal()
+
+#						var p:Vector3 = MathUtil.snap_to_grid(result.get_world_position(), grid_step_size)
+						var p:Vector3 = builder.get_snapping_manager().snap_point(result.get_world_position(), SnappingQuery.new(viewport_camera))
+						drag_origin = p
+						base_drag_cur = p
+
+						return true
+						
+					else:
+						#print("init base point empty space")
+						var draw_plane_point:Vector3 = Vector3.ZERO
+						var draw_plane_normal:Vector3 = BlockAlignment.get_plane_normal(settings.block_alignment)
+						if settings.match_selected_block:
+							draw_plane_point = calc_empty_space_draw_plane_origin(viewport_camera, draw_plane_point, draw_plane_normal)
+							
+						var hit_result = calc_hit_point_empty_space(origin, dir, viewport_camera, draw_plane_point, draw_plane_normal)
+						var start_pos:Vector3 = hit_result[0]
+						floor_normal = hit_result[1]
+
+						#var p:Vector3 = MathUtil.snap_to_grid(start_pos, grid_step_size)
+						var p:Vector3 = builder.get_snapping_manager().snap_point(start_pos, SnappingQuery.new(viewport_camera))
+						drag_origin = p
+						base_drag_cur = p
+						
+						return true	
+
+			else:
+				if tool_state == ToolState.DRAG_BASE:
+					var camera_dir:Vector3 = viewport_camera.project_ray_normal(e.position)
+					var angle_with_base:float = acos(floor_normal.dot(camera_dir))
+					var drag_angle_limit:float = builder.get_global_scene().drag_angle_limit
+					if angle_with_base < drag_angle_limit || angle_with_base > PI - drag_angle_limit:
+						var height = settings.default_block_height
+						if settings.match_selected_block:
+							height = calc_active_block_orthogonal_height(base_drag_cur, floor_normal)
+						
+						block_drag_cur = base_drag_cur + floor_normal * height
+						
+						create_block()
+						
+						tool_state = ToolState.READY
+					else:
+						tool_state = ToolState.DRAG_HEIGHT
+						block_drag_cur = base_drag_cur
+					return true
+				
+				elif tool_state == ToolState.DRAG_HEIGHT:
+					#Create shape
+					create_block()
+
+					tool_state = ToolState.READY
+					return true
+					
+		#elif e.button_index == MOUSE_BUTTON_RIGHT:
+			#if tool_state == ToolState.DRAG_BASE || tool_state == ToolState.DRAG_HEIGHT:
+				#if e.is_pressed():
+					#tool_state = ToolState.READY
+				#return true
+					
+		elif e.button_index == MOUSE_BUTTON_WHEEL_UP:
+			if tool_state == ToolState.DRAG_BASE || tool_state == ToolState.DRAG_HEIGHT:
+				if e.pressed:
+					if e.ctrl_pressed:
+						if e.shift_pressed:
+							var size = log(settings.step_depth) / log(2)
+							settings.step_depth = pow(2, size + 1)
+						else:
+							var size = log(settings.step_height) / log(2)
+							settings.step_height = pow(2, size + 1)
+					else:
+						settings.direction = wrap(settings.direction + 1, 0, 4)
+				return true
+					
+		elif e.button_index == MOUSE_BUTTON_WHEEL_DOWN:
+			if tool_state == ToolState.DRAG_BASE || tool_state == ToolState.DRAG_HEIGHT:
+				if e.pressed:
+					if e.ctrl_pressed:
+						if e.shift_pressed:
+							var size = log(settings.step_depth) / log(2)
+							settings.step_depth = pow(2, size - 1)
+						else:
+							var size = log(settings.step_height) / log(2)
+							settings.step_height = pow(2, size - 1)
+					else:
+						settings.direction = wrap(settings.direction - 1, 0, 4)
+				return true
+				
+
+	elif event is InputEventMouseMotion:
+		var e:InputEventMouseMotion = event
+
+		if (e.button_mask & MOUSE_BUTTON_MASK_MIDDLE):
+			return false
+
+		var origin:Vector3 = viewport_camera.project_ray_origin(e.position)
+		var dir:Vector3 = viewport_camera.project_ray_normal(e.position)
+
+		var start_pos:Vector3 = origin + builder.block_create_distance * dir
+#		var w2l = blocks_root.global_transform.inverse()
+#		var origin_local:Vector3 = w2l * origin
+#		var dir_local:Vector3 = w2l.basis * dir
+
+		if tool_state == ToolState.DRAG_BASE:
+			var p_isect:Vector3 = MathUtil.intersect_plane(origin, dir, drag_origin, floor_normal)
+			#var p_snapped = to_local(p_isect, blocks_root.global_transform.inverse(), grid_step_size)
+#			var p_snapped:Vector3 = MathUtil.snap_to_grid(p_isect, grid_step_size)
+			var p_snapped:Vector3 = builder.get_snapping_manager().snap_point(p_isect, SnappingQuery.new(viewport_camera))
+			base_drag_cur = p_snapped
+
+			return true
+			
+		elif tool_state == ToolState.DRAG_HEIGHT:
+			block_drag_cur = MathUtil.closest_point_on_line(origin, dir, base_drag_cur, floor_normal)
+			
+			#block_drag_cur = to_local(block_drag_cur, blocks_root.global_transform.inverse(), grid_step_size)
+			block_drag_cur = builder.get_snapping_manager().snap_point(block_drag_cur, SnappingQuery.new(viewport_camera))
+			
+			return true
+				
+	return super._gui_input(viewport_camera, event)		
+
+func create_block():
+	var blocks_root:Node = builder.get_block_add_parent()
+	
+	var cmd:CommandAddStairs = CommandAddStairs.new()
+	cmd.builder = builder
+	cmd.blocks_root_path = blocks_root.get_path()
+	cmd.block_name_prefix = "Block_"
+	cmd.floor_normal = floor_normal
+	cmd.drag_origin = drag_origin
+	cmd.base_drag_cur = base_drag_cur
+	cmd.block_drag_cur = block_drag_cur
+	cmd.step_height = settings.step_height
+	cmd.step_depth = settings.step_depth
+	cmd.direction = settings.direction
+	cmd.uv_transform = builder.tool_uv_transform
+	cmd.material_path = builder.tool_material_path
+	cmd.collision_type = settings.collision_type
+	cmd.collision_layers = settings.collision_layer
+	cmd.collision_mask = settings.collision_mask
+
+	var undo:EditorUndoRedoManager = builder.get_undo_redo()
+
+	cmd.add_to_undo_manager(undo)

addons/cyclops_level_builder/tools/tool_stairs_settings.gd

@@ -0,0 +1,66 @@
+# MIT License
+#
+# Copyright (c) 2023 Mark McKay
+# https://github.com/blackears/cyclopsLevelBuilder
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+@tool
+extends Resource
+class_name ToolStairsSettings
+
+@export var block_alignment:BlockAlignment.Type = BlockAlignment.Type.ALIGN_TO_SURFACE
+@export var match_selected_block:bool = true
+@export var default_block_elevation:float = 0
+@export var default_block_height:float = 1
+@export var collision_type:Collision.Type = Collision.Type.STATIC
+@export_flags_3d_physics var collision_layer:int = 1
+@export_flags_3d_physics var collision_mask:int = 1
+
+@export var step_height:float = .25
+@export var step_depth:float = .5
+@export var direction:int = 0
+
+func load_from_cache(cache:Dictionary):
+	block_alignment = cache.get("block_alignment", BlockAlignment.Type.ALIGN_TO_SURFACE)
+	match_selected_block = cache.get("match_selected_block", true)
+	default_block_elevation = cache.get("default_block_elevation", 0)
+	default_block_height = cache.get("default_block_height", 1)
+	collision_type = cache.get("collision_type", Collision.Type.STATIC)
+	collision_layer = cache.get("collision_layer", 1)
+	collision_mask = cache.get("collision_mask", 1)
+
+	step_height = cache.get("step_height", .25)
+	step_depth = cache.get("step_depth", .5)
+	direction = cache.get("direction", 0)
+	
+func save_to_cache():
+	return {
+		"block_alignment": block_alignment,
+		"match_selected_block": match_selected_block,
+		"default_block_elevation": default_block_elevation,
+		"default_block_height": default_block_height,
+		"collision_type": collision_type,
+		"collision_layer": collision_layer,
+		"collision_mask": collision_mask,
+		"step_height": step_height,
+		"step_depth": step_depth,
+		"direction": direction,
+	}
+

addons/cyclops_level_builder/tools/tool_stairs_settings_editor.gd

@@ -0,0 +1,116 @@
+# MIT License
+#
+# Copyright (c) 2023 Mark McKay
+# https://github.com/blackears/cyclopsLevelBuilder
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+@tool
+extends PanelContainer
+class_name ToolStairsSettingsEditor
+
+
+var settings:ToolStairsSettings:
+	get:
+		return settings
+	set(value):
+		settings = value
+		dirty = true
+
+var dirty:bool = true
+
+func _ready():
+	%collision_type.clear()
+	for text in Collision.Type.keys():
+		%collision_type.add_item(text)
+
+func _process(delta):
+	if dirty:
+		update()
+		dirty = false
+
+
+func update():
+	if !settings:
+		#%default_block_height.value = 0
+#		%step_height.disabled = true
+#		%step_depth.disabled = true
+		%spin_direction.disabled = true
+		%check_match_selected_block.disabled = true
+		%default_block_elevation.disabled = true
+		%default_block_height.disabled = true
+		return
+
+#	%step_height.disabled = false
+	%step_height.value = settings.step_height
+#	%step_depth.disabled = false
+	%step_depth.value = settings.step_depth
+	#%spin_direction.disabled = false
+	%spin_direction.value = settings.direction
+	%check_match_selected_block.disabled = false
+	%check_match_selected_block.button_pressed = settings.match_selected_block
+	%default_block_elevation.disabled = false
+	%default_block_elevation.value = settings.default_block_elevation
+	%default_block_height.disabled = false
+	%default_block_height.value = settings.default_block_height
+
+	%alignment_type.selected = settings.block_alignment
+
+	%collision_type.selected = settings.collision_type
+	%collision_layers.value = settings.collision_layer
+	%collision_mask.value = settings.collision_mask
+	
+
+func _on_check_match_selected_block_toggled(value):
+	settings.match_selected_block = value
+
+
+func _on_default_block_elevation_value_changed(value):
+	settings.default_block_elevation = value
+
+
+func _on_default_block_height_value_changed(value):
+	settings.default_block_height = value
+
+
+
+func _on_step_height_value_changed(value):
+	settings.step_height
+
+
+func _on_step_depth_value_changed(value):
+	settings.step_depth
+
+
+func _on_spin_direction_value_changed(value):
+	settings.direction
+
+func _on_collision_layers_value_changed(value):
+	settings.collision_layer = value
+
+
+func _on_collision_mask_value_changed(value):
+	settings.collision_mask = value
+
+func _on_collision_type_item_selected(index):
+	settings.collision_type = index
+
+
+func _on_alignment_type_item_selected(index):
+	settings.block_alignment = index

addons/cyclops_level_builder/tools/tool_stairs_settings_editor.tscn

@@ -0,0 +1,163 @@
+[gd_scene load_steps=3 format=3 uid="uid://bhbo7hbko5myp"]
+
+[ext_resource type="Script" path="res://addons/cyclops_level_builder/tools/tool_stairs_settings_editor.gd" id="1_flcpk"]
+[ext_resource type="PackedScene" uid="uid://diibmlqy1mpqb" path="res://addons/cyclops_level_builder/controls/numeric_line_edit.tscn" id="2_hqkby"]
+
+[node name="ToolStairsSettings" type="PanelContainer"]
+offset_right = 413.0
+offset_bottom = 232.0
+script = ExtResource("1_flcpk")
+
+[node name="PanelContainer" type="PanelContainer" parent="."]
+layout_mode = 2
+
+[node name="VBoxContainer" type="VBoxContainer" parent="PanelContainer"]
+layout_mode = 2
+
+[node name="GridContainer" type="GridContainer" parent="PanelContainer/VBoxContainer"]
+layout_mode = 2
+columns = 2
+
+[node name="Label5" type="Label" parent="PanelContainer/VBoxContainer/GridContainer"]
+layout_mode = 2
+text = "Collision Type"
+
+[node name="collision_type" type="OptionButton" parent="PanelContainer/VBoxContainer/GridContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+item_count = 4
+selected = 0
+popup/item_0/text = "NONE"
+popup/item_0/id = 0
+popup/item_1/text = "STATIC"
+popup/item_1/id = 1
+popup/item_2/text = "KINEMATIC"
+popup/item_2/id = 2
+popup/item_3/text = "RIGID"
+popup/item_3/id = 3
+
+[node name="Label6" type="Label" parent="PanelContainer/VBoxContainer/GridContainer"]
+layout_mode = 2
+text = "Collision Layers"
+
+[node name="collision_layers" type="SpinBox" parent="PanelContainer/VBoxContainer/GridContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+size_flags_horizontal = 3
+rounded = true
+allow_greater = true
+allow_lesser = true
+
+[node name="Label7" type="Label" parent="PanelContainer/VBoxContainer/GridContainer"]
+layout_mode = 2
+text = "Collision Mask"
+
+[node name="collision_mask" type="SpinBox" parent="PanelContainer/VBoxContainer/GridContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+rounded = true
+allow_greater = true
+allow_lesser = true
+
+[node name="Label2" type="Label" parent="PanelContainer/VBoxContainer/GridContainer"]
+layout_mode = 2
+text = "Step Height"
+
+[node name="step_height" parent="PanelContainer/VBoxContainer/GridContainer" instance=ExtResource("2_hqkby")]
+unique_name_in_owner = true
+layout_mode = 2
+size_flags_horizontal = 3
+
+[node name="Label4" type="Label" parent="PanelContainer/VBoxContainer/GridContainer"]
+layout_mode = 2
+text = "Step Depth"
+
+[node name="step_depth" parent="PanelContainer/VBoxContainer/GridContainer" instance=ExtResource("2_hqkby")]
+unique_name_in_owner = true
+layout_mode = 2
+size_flags_horizontal = 3
+
+[node name="Label" type="Label" parent="PanelContainer/VBoxContainer/GridContainer"]
+layout_mode = 2
+text = "Direction"
+
+[node name="spin_direction" type="SpinBox" parent="PanelContainer/VBoxContainer/GridContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+max_value = 3.0
+value = 3.0
+rounded = true
+allow_greater = true
+allow_lesser = true
+
+[node name="Label8" type="Label" parent="PanelContainer/VBoxContainer/GridContainer"]
+layout_mode = 2
+text = "Alignment"
+
+[node name="alignment_type" type="OptionButton" parent="PanelContainer/VBoxContainer/GridContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+item_count = 4
+selected = 0
+popup/item_0/text = "Align to surface"
+popup/item_0/id = 0
+popup/item_1/text = "XY Plane"
+popup/item_1/id = 1
+popup/item_2/text = "XZ Plane"
+popup/item_2/id = 2
+popup/item_3/text = "YZ Plane"
+popup/item_3/id = 3
+
+[node name="Label3" type="Label" parent="PanelContainer/VBoxContainer/GridContainer"]
+layout_mode = 2
+text = "Match selected block"
+
+[node name="check_match_selected_block" type="CheckBox" parent="PanelContainer/VBoxContainer/GridContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+tooltip_text = "When drawing in empty space, copy elevation and height properties from currently selected block."
+text = "On"
+
+[node name="Label" type="Label" parent="PanelContainer/VBoxContainer"]
+layout_mode = 2
+text = "Orthogonal Viewport:"
+
+[node name="MarginContainer" type="MarginContainer" parent="PanelContainer/VBoxContainer"]
+layout_mode = 2
+theme_override_constants/margin_left = 16
+
+[node name="VBoxContainer" type="VBoxContainer" parent="PanelContainer/VBoxContainer/MarginContainer"]
+layout_mode = 2
+
+[node name="GridContainer" type="GridContainer" parent="PanelContainer/VBoxContainer/MarginContainer/VBoxContainer"]
+layout_mode = 2
+columns = 2
+
+[node name="Label" type="Label" parent="PanelContainer/VBoxContainer/MarginContainer/VBoxContainer/GridContainer"]
+layout_mode = 2
+text = "Default Block Elevation"
+
+[node name="default_block_elevation" parent="PanelContainer/VBoxContainer/MarginContainer/VBoxContainer/GridContainer" instance=ExtResource("2_hqkby")]
+unique_name_in_owner = true
+layout_mode = 2
+size_flags_horizontal = 3
+
+[node name="Label2" type="Label" parent="PanelContainer/VBoxContainer/MarginContainer/VBoxContainer/GridContainer"]
+layout_mode = 2
+text = "Default Block Height"
+
+[node name="default_block_height" parent="PanelContainer/VBoxContainer/MarginContainer/VBoxContainer/GridContainer" instance=ExtResource("2_hqkby")]
+unique_name_in_owner = true
+layout_mode = 2
+size_flags_horizontal = 3
+
+[connection signal="item_selected" from="PanelContainer/VBoxContainer/GridContainer/collision_type" to="." method="_on_collision_type_item_selected"]
+[connection signal="value_changed" from="PanelContainer/VBoxContainer/GridContainer/collision_layers" to="." method="_on_collision_layers_value_changed"]
+[connection signal="value_changed" from="PanelContainer/VBoxContainer/GridContainer/collision_mask" to="." method="_on_collision_mask_value_changed"]
+[connection signal="value_changed" from="PanelContainer/VBoxContainer/GridContainer/step_height" to="." method="_on_step_height_value_changed"]
+[connection signal="value_changed" from="PanelContainer/VBoxContainer/GridContainer/step_depth" to="." method="_on_step_depth_value_changed"]
+[connection signal="value_changed" from="PanelContainer/VBoxContainer/GridContainer/spin_direction" to="." method="_on_spin_direction_value_changed"]
+[connection signal="item_selected" from="PanelContainer/VBoxContainer/GridContainer/alignment_type" to="." method="_on_alignment_type_item_selected"]
+[connection signal="toggled" from="PanelContainer/VBoxContainer/GridContainer/check_match_selected_block" to="." method="_on_check_match_selected_block_toggled"]
+[connection signal="value_changed" from="PanelContainer/VBoxContainer/MarginContainer/VBoxContainer/GridContainer/default_block_elevation" to="." method="_on_default_block_elevation_value_changed"]
+[connection signal="value_changed" from="PanelContainer/VBoxContainer/MarginContainer/VBoxContainer/GridContainer/default_block_height" to="." method="_on_default_block_height_value_changed"]

addons/cyclops_level_builder/tools/tool_vertex_color_brush.gd

@@ -0,0 +1,198 @@
+# MIT License
+#
+# Copyright (c) 2023 Mark McKay
+# https://github.com/blackears/cyclopsLevelBuilder
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+@tool
+extends CyclopsTool
+class_name ToolVertexColorBrush
+
+enum ToolState { READY, PAINTING }
+var tool_state:ToolState = ToolState.READY
+
+const TOOL_ID:String = "vertex_color_brush"
+
+var cmd:CommandVertexPaintStroke
+
+var settings:ToolVertexColorBrushSettings = ToolVertexColorBrushSettings.new()
+
+var last_mouse_pos:Vector2
+
+var brush_over_mesh:bool = false
+var last_hit_pos:Vector3
+
+func _get_tool_id()->String:
+	return TOOL_ID
+
+func _draw_tool(viewport_camera:Camera3D):
+	var global_scene:CyclopsGlobalScene = builder.get_global_scene()
+	global_scene.clear_tool_mesh()
+	global_scene.draw_selected_blocks(viewport_camera)
+
+	#super._draw_tool(viewport_camera)
+
+	if brush_over_mesh:
+		var view_dir:Vector3 = viewport_camera.global_transform.basis.z
+		var bounding_points:PackedVector3Array = \
+			MathUtil.create_circle_points(last_hit_pos, view_dir.normalized(), settings.radius, 16)
+		global_scene.draw_loop(bounding_points, true, global_scene.tool_material)
+
+
+func _get_tool_properties_editor()->Control:
+	var ed:ToolVertexColorBrushSettingsEditor = preload("res://addons/cyclops_level_builder/tools/tool_vertex_color_brush_settings_editor.tscn").instantiate()
+
+	ed.settings = settings
+
+	return ed
+
+
+func _gui_input(viewport_camera:Camera3D, event:InputEvent)->bool:
+
+	if event is InputEventKey:
+		var e:InputEventKey = event
+		
+		if e.keycode == KEY_X:
+			if e.shift_pressed:
+				if e.is_pressed():
+					#Pick closest vertex color
+					var origin:Vector3 = viewport_camera.project_ray_origin(last_mouse_pos)
+					var dir:Vector3 = viewport_camera.project_ray_normal(last_mouse_pos)
+
+					var result:IntersectResults = builder.intersect_ray_closest(origin, dir)
+
+					if result:
+						var block:CyclopsBlock = result.object
+						result.face_index
+						
+						var vol:ConvexVolume = ConvexVolume.new()
+						vol.init_from_mesh_vector_data(block.mesh_vector_data)
+						
+						var face:ConvexVolume.FaceInfo = vol.faces[result.face_index]
+						var v_idx:int = face.get_closest_vertex(result.position)
+						var vert:ConvexVolume.VertexInfo = vol.vertices[v_idx]
+					
+						var fv:ConvexVolume.FaceVertexInfo = vol.get_face_vertex(result.face_index, v_idx)
+						#print("sample color ", fv.color)
+					
+						settings.color = fv.color
+
+			return true
+			
+
+		elif e.keycode == KEY_Q:
+
+			if e.is_pressed():
+				select_block_under_cursor(viewport_camera, last_mouse_pos)
+				
+			return true
+
+	elif event is InputEventMouseButton:
+
+		var e:InputEventMouseButton = event
+		if e.button_index == MOUSE_BUTTON_LEFT:
+
+			if e.is_pressed():
+
+				if tool_state == ToolState.READY:
+					#print("vertex color brush bn down")
+						
+					var origin:Vector3 = viewport_camera.project_ray_origin(e.position)
+					var dir:Vector3 = viewport_camera.project_ray_normal(e.position)
+
+					var result:IntersectResults = builder.intersect_ray_closest(origin, dir)
+					
+					var sel_blocks:Array[CyclopsBlock] = builder.get_selected_blocks()
+#					if result && result.object == builder.get_active_block():
+					if result && sel_blocks.has(result.object):
+						#print("starting paint")
+						cmd = CommandVertexPaintStroke.new()
+						cmd.builder = builder
+
+						cmd.append_block(result.object.get_path())
+						cmd.color = settings.color
+						cmd.strength = settings.strength
+						cmd.radius = settings.radius
+						cmd.falloff_curve = settings.falloff_curve.duplicate()
+						cmd.mask = settings.mask_type
+						
+						var pos:Vector3 = result.get_world_position()
+						#print("pos ", pos)
+						cmd.append_stroke_point(pos, 1)
+
+
+						cmd.do_it()
+						tool_state = ToolState.PAINTING
+
+			else:
+				
+				if tool_state == ToolState.PAINTING:
+					cmd.undo_it()
+					if cmd.will_change_anything():
+						var undo:EditorUndoRedoManager = builder.get_undo_redo()
+						cmd.add_to_undo_manager(undo)
+
+					tool_state = ToolState.READY
+
+			return true
+
+
+	elif event is InputEventMouseMotion:
+
+		var e:InputEventMouseMotion = event
+
+		last_mouse_pos = e.position
+
+		var origin:Vector3 = viewport_camera.project_ray_origin(e.position)
+		var dir:Vector3 = viewport_camera.project_ray_normal(e.position)
+
+		var result:IntersectResults = builder.intersect_ray_closest(origin, dir)
+		
+		if result:
+			brush_over_mesh = true
+			last_hit_pos = result.object.global_transform * result.position
+		else:
+			brush_over_mesh = false
+
+		if tool_state == ToolState.PAINTING:
+
+			if result:
+				#print ("hit ", result.object.name)
+				cmd.undo_it()
+				
+				cmd.append_stroke_point(result.get_world_position(), \
+					e.pressure if settings.pen_pressure_strength else 1)
+
+				cmd.do_it()
+
+			return true
+
+	return false
+
+
+func _activate(builder:CyclopsLevelBuilder):
+	super._activate(builder)
+
+	var cache:Dictionary = builder.get_tool_cache(TOOL_ID)
+	settings.load_from_cache(cache)
+
+func _deactivate():
+	var cache:Dictionary = settings.save_to_cache()
+	builder.set_tool_cache(TOOL_ID, cache)

addons/cyclops_level_builder/tools/tool_vertex_color_brush_settings.gd

@@ -0,0 +1,94 @@
+# MIT License
+#
+# Copyright (c) 2023 Mark McKay
+# https://github.com/blackears/cyclopsLevelBuilder
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+@tool
+extends Resource
+class_name ToolVertexColorBrushSettings
+
+
+@export var component_type:GeometryComponentType.Type = GeometryComponentType.Type.OBJECT
+
+@export var mask_type:CommandVertexPaintStroke.MaskType = CommandVertexPaintStroke.MaskType.NONE:
+	set(value):
+		if value != mask_type:
+			mask_type = value
+			emit_changed()
+
+@export var color:Color = Color.WHITE:
+	set(value):
+		if value != color:
+			color = value
+			emit_changed()
+
+@export var radius:float:
+	set(value):
+		if value != radius:
+			radius = value
+			emit_changed()
+
+@export var strength:float:
+	set(value):
+		if value != strength:
+			strength = value
+			emit_changed()
+
+@export var pen_pressure_strength:bool:
+	set(value):
+		if value != pen_pressure_strength:
+			pen_pressure_strength = value
+			emit_changed()
+
+@export var falloff_curve:Curve:
+	set(value):
+		if value != falloff_curve:
+			falloff_curve = value
+			emit_changed()
+
+func load_from_cache(cache:Dictionary):
+	component_type = cache.get("component_type", GeometryComponentType.Type.OBJECT)
+	color = str_to_var(cache.get("color", var_to_str(Color.WHITE)))
+	radius = cache.get("radius", 1)
+	strength = cache.get("strength", 1)
+	pen_pressure_strength = cache.get("pen_pressure_strength", false)
+	
+	if cache.has("falloff_curve"):
+		falloff_curve = str_to_var(cache.get("falloff_curve"))
+	else:
+		falloff_curve = Curve.new()
+		falloff_curve.add_point(Vector2(0, 0))
+		falloff_curve.add_point(Vector2(1, 1))
+
+func save_to_cache():
+	return {
+		"component_type": component_type,
+		"color": var_to_str(color),
+		"radius": radius,
+		"strength": strength,
+		"pen_pressure_strength": pen_pressure_strength,
+		"falloff_curve": var_to_str(falloff_curve)
+	}
+
+
+
+
+

addons/cyclops_level_builder/tools/tool_vertex_color_brush_settings_editor.gd

@@ -0,0 +1,104 @@
+# MIT License
+#
+# Copyright (c) 2023 Mark McKay
+# https://github.com/blackears/cyclopsLevelBuilder
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+@tool
+extends PanelContainer
+class_name ToolVertexColorBrushSettingsEditor
+
+@export var settings:ToolVertexColorBrushSettings:
+	get:
+		return settings
+		
+	set(value):
+		if settings == value:
+			return
+		
+		if settings:
+			settings.changed.disconnect(on_settings_changed)
+		
+		settings = value
+		
+		if settings:
+			settings.changed.connect(on_settings_changed)
+		
+		update()
+
+func on_settings_changed():
+	update()
+
+func update():
+
+	%opbn_mask_type.selected = settings.mask_type
+
+	%color_button.color = settings.color
+	%spin_strength.value = settings.strength
+	%spin_radius.value = settings.radius
+	%check_pen_pressure_str.button_pressed = settings.pen_pressure_strength
+
+
+# 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):
+	pass
+
+
+func _on_color_button_color_changed(color:Color):
+	settings.color = color
+
+
+#func _on_opbn_geom_component_item_selected(index):
+	#match index:
+		#0:
+			#settings.component_type = GeometryComponentType.Type.OBJECT
+		#1:
+			#settings.component_type = GeometryComponentType.Type.VERTEX
+		#2:
+			#settings.component_type = GeometryComponentType.Type.FACE
+		#3:
+			#settings.component_type = GeometryComponentType.Type.FACE_VERTEX
+
+
+func _on_spin_strength_value_changed(value):
+	settings.strength = value
+
+
+func _on_check_pen_pressure_str_toggled(toggled_on):
+	settings.pen_pressure_strength = toggled_on
+
+
+func _on_spin_radius_value_changed(value):
+	settings.radius = value
+
+
+func _on_opbn_mask_type_item_selected(index):
+	match index:
+		0:
+			settings.mask_type = CommandVertexPaintStroke.MaskType.NONE
+		1:
+			settings.mask_type = CommandVertexPaintStroke.MaskType.VERTICES
+		2:
+			settings.mask_type = CommandVertexPaintStroke.MaskType.FACES

addons/cyclops_level_builder/tools/tool_vertex_color_brush_settings_editor.tscn

@@ -0,0 +1,80 @@
+[gd_scene load_steps=2 format=3 uid="uid://djlowj2pi405u"]
+
+[ext_resource type="Script" path="res://addons/cyclops_level_builder/tools/tool_vertex_color_brush_settings_editor.gd" id="1_1a32u"]
+
+[node name="PanelContainer" type="PanelContainer"]
+offset_right = 317.0
+offset_bottom = 269.0
+script = ExtResource("1_1a32u")
+
+[node name="MarginContainer2" type="MarginContainer" parent="."]
+layout_mode = 2
+theme_override_constants/margin_left = 16
+
+[node name="GridContainer" type="GridContainer" parent="MarginContainer2"]
+layout_mode = 2
+columns = 2
+
+[node name="Label3" type="Label" parent="MarginContainer2/GridContainer"]
+layout_mode = 2
+text = "Component type"
+
+[node name="opbn_mask_type" type="OptionButton" parent="MarginContainer2/GridContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+item_count = 3
+selected = 0
+popup/item_0/text = "None"
+popup/item_0/id = 0
+popup/item_1/text = "Vertex"
+popup/item_1/id = 1
+popup/item_2/text = "Face"
+popup/item_2/id = 2
+
+[node name="Label" type="Label" parent="MarginContainer2/GridContainer"]
+layout_mode = 2
+text = "Color"
+
+[node name="color_button" type="ColorPickerButton" parent="MarginContainer2/GridContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+size_flags_horizontal = 3
+
+[node name="Label5" type="Label" parent="MarginContainer2/GridContainer"]
+layout_mode = 2
+text = "Radius"
+
+[node name="spin_radius" type="SpinBox" parent="MarginContainer2/GridContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+max_value = 1.0
+step = 0.1
+value = 1.0
+allow_greater = true
+
+[node name="Label2" type="Label" parent="MarginContainer2/GridContainer"]
+layout_mode = 2
+text = "Strength"
+
+[node name="spin_strength" type="SpinBox" parent="MarginContainer2/GridContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+max_value = 1.0
+step = 0.1
+value = 1.0
+allow_greater = true
+
+[node name="Label4" type="Label" parent="MarginContainer2/GridContainer"]
+layout_mode = 2
+text = "Pen Pressure"
+
+[node name="check_pen_pressure_str" type="CheckBox" parent="MarginContainer2/GridContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+text = "On"
+
+[connection signal="item_selected" from="MarginContainer2/GridContainer/opbn_mask_type" to="." method="_on_opbn_mask_type_item_selected"]
+[connection signal="color_changed" from="MarginContainer2/GridContainer/color_button" to="." method="_on_color_button_color_changed"]
+[connection signal="value_changed" from="MarginContainer2/GridContainer/spin_radius" to="." method="_on_spin_radius_value_changed"]
+[connection signal="value_changed" from="MarginContainer2/GridContainer/spin_strength" to="." method="_on_spin_strength_value_changed"]
+[connection signal="toggled" from="MarginContainer2/GridContainer/check_pen_pressure_str" to="." method="_on_check_pen_pressure_str_toggled"]