Removed script from editor
This commit is contained in:
@@ -2,13 +2,13 @@ extends Spatial
|
||||
|
||||
#var camera_mode = -1
|
||||
|
||||
onready var vmode = {
|
||||
2: $"%v_buildings",
|
||||
3: $"%v_navigation",
|
||||
5: $"%v_poi",
|
||||
6: $"%v_road_lines",
|
||||
7: $"%v_npc",
|
||||
}
|
||||
#onready var vmode = {
|
||||
# 2: $"%v_buildings",
|
||||
# 3: $"%v_navigation",
|
||||
# 5: $"%v_poi",
|
||||
# 6: $"%v_road_lines",
|
||||
# 7: $"%v_npc",
|
||||
#}
|
||||
|
||||
#func change_building_type(index):
|
||||
# var item = $"%building_type".get_item_text(index)
|
||||
@@ -38,55 +38,60 @@ func _ready():
|
||||
]:
|
||||
b.connect("pressed", $WorldEditor, "editor_command", [b.name, []])
|
||||
$WorldEditor.connect("editor_event", self, "editor_event")
|
||||
for k in vmode.keys():
|
||||
vmode[k].hide()
|
||||
$"%building_cursor".hide()
|
||||
$"%line_cursor".hide()
|
||||
# for k in vmode.keys():
|
||||
# vmode[k].hide()
|
||||
# $"%building_cursor".hide()
|
||||
# $"%line_cursor".hide()
|
||||
# $"%building_type".connect("item_selected", self, "change_building_type")
|
||||
# $"%NavPanel".connect("gui_input", self, "nav_gui_input")
|
||||
var ignore_events = [
|
||||
"result:get_closest_building",
|
||||
"mouse_drag",
|
||||
"mouse_press",
|
||||
"mouse_drag_on",
|
||||
"mouse_drag_off",
|
||||
"line_cursor_motion",
|
||||
"button:create_building",
|
||||
"lines_select_line",
|
||||
"lines_changed_line"
|
||||
]
|
||||
#var ignore_events = [
|
||||
# "mode_change_pre",
|
||||
# "mode_change_post",
|
||||
# "result:get_closest_building",
|
||||
# "result:get_building_types",
|
||||
# "mouse_drag",
|
||||
# "mouse_press",
|
||||
# "mouse_drag_on",
|
||||
# "mouse_drag_off",
|
||||
# "line_cursor_motion",
|
||||
# "button:create_building",
|
||||
# "lines_select_line",
|
||||
# "lines_changed_line"
|
||||
#]
|
||||
func editor_event(evname: String, args: Array):
|
||||
print(evname, args)
|
||||
if evname == "mode_change_pre":
|
||||
var mode_prev = args[0]
|
||||
if mode_prev == -1:
|
||||
for k in vmode.keys():
|
||||
vmode[k].hide()
|
||||
elif vmode.has(mode_prev):
|
||||
vmode[mode_prev].hide()
|
||||
elif evname == "mode_change_post":
|
||||
var mode_next = args[1]
|
||||
if vmode.has(mode_next):
|
||||
vmode[mode_next].show()
|
||||
if mode_next == 2:
|
||||
$WorldEditor.editor_command("get_building_types", [])
|
||||
elif mode_next == 6:
|
||||
$WorldEditor.editor_command("get_lines_list", [])
|
||||
elif evname == "result:get_building_types":
|
||||
print(evname, args)
|
||||
var btypes = args[0]
|
||||
$"%building_type".clear()
|
||||
for k in btypes.keys():
|
||||
$"%building_type".add_item(k)
|
||||
elif evname == "editor_camera_moved":
|
||||
$Area.global_transform.origin.x = $Camera.global_transform.origin.x
|
||||
$Area.global_transform.origin.z = $Camera.global_transform.origin.z
|
||||
# if evname == "mode_change_pre":
|
||||
# var mode_prev = args[0]
|
||||
# if mode_prev == -1:
|
||||
# for k in vmode.keys():
|
||||
# vmode[k].hide()
|
||||
# elif vmode.has(mode_prev):
|
||||
# vmode[mode_prev].hide()
|
||||
# elif evname == "mode_change_post":
|
||||
# var mode_next = args[1]
|
||||
# if vmode.has(mode_next):
|
||||
# vmode[mode_next].show()
|
||||
# if mode_next == 2:
|
||||
# $WorldEditor.editor_command("get_building_types", [])
|
||||
# elif mode_next == 6:
|
||||
# $WorldEditor.editor_command("get_lines_list", [])
|
||||
# elif evname == "result:get_building_types":
|
||||
# pass
|
||||
# print(evname, args)
|
||||
# var btypes = args[0]
|
||||
# $"%building_type".clear()
|
||||
# for k in btypes.keys():
|
||||
# $"%building_type".add_item(k)
|
||||
# if evname == "editor_camera_moved":
|
||||
# var cam = get_viewport().get_camera()
|
||||
# $"%selection_area".global_transform.origin.x = cam.global_transform.origin.x
|
||||
# $"%selection_area".global_transform.origin.z = cam.global_transform.origin.z
|
||||
# elif evname == "edit_update_building":
|
||||
# check_edit_building()
|
||||
elif evname in ignore_events:
|
||||
pass
|
||||
else:
|
||||
breakpoint
|
||||
# elif evname in ignore_events:
|
||||
# pass
|
||||
# else:
|
||||
# breakpoint
|
||||
#func mouse_drag(position):
|
||||
# if $WorldEditor.get_current_mode() != 2:
|
||||
# return
|
||||
@@ -154,7 +159,7 @@ func editor_event(evname: String, args: Array):
|
||||
# selected_building_xform = xform
|
||||
|
||||
#var selected_building
|
||||
var selected_building_xform
|
||||
#var selected_building_xform
|
||||
#func select_building(xform, id, mid):
|
||||
# selected_building = id
|
||||
# selected_building_xform = xform
|
||||
@@ -168,14 +173,14 @@ var selected_building_xform
|
||||
# if !$"%building_cursor".visible:
|
||||
# $"%building_cursor".show()
|
||||
# $"%building_cursor".global_transform.origin = xform.origin
|
||||
func _process(delta):
|
||||
#func _process(delta):
|
||||
# if Input.is_action_just_pressed("editor_cam1"):
|
||||
# setup_cam1()
|
||||
# if Input.is_action_just_pressed("editor_cam2"):
|
||||
# setup_cam2()
|
||||
# if Input.is_action_just_pressed("editor_cam3"):
|
||||
# setup_cam3()
|
||||
var mode = $"%buildings_edit_mode".selected
|
||||
# var mode = $"%buildings_edit_mode".selected
|
||||
# if mode == 2:
|
||||
# $"%building_rot_cursor".global_transform = selected_building_xform
|
||||
# if !$"%building_rot_cursor".visible:
|
||||
@@ -232,10 +237,10 @@ func _process(delta):
|
||||
## drag_delay -= delta
|
||||
#var motion = Vector2()
|
||||
#var old_mouse_pos = Vector2(-1, -1)
|
||||
var rotation_y = 0
|
||||
#var rotation_y = 0
|
||||
#var dragging = false
|
||||
#var drag_delay = 0.2
|
||||
var drag_start = Vector3()
|
||||
#var drag_start = Vector3()
|
||||
#func _unhandled_input(event):
|
||||
# var editor_mode = $WorldEditor.get_current_mode()
|
||||
# var camera_mode = $WorldEditor.get_camera_mode()
|
||||
@@ -274,5 +279,5 @@ var drag_start = Vector3()
|
||||
# $WorldEditor.editor_command("update_building_transform", [selected_building, xform])
|
||||
# $building_rot_cursor.global_transform = xform
|
||||
# selected_building_xform = xform
|
||||
func _physics_process(delta):
|
||||
assert($WorldEditor is WorldEditor)
|
||||
#func _physics_process(delta):
|
||||
# assert($WorldEditor is WorldEditor)
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
[gd_scene load_steps=16 format=2]
|
||||
[gd_scene load_steps=15 format=2]
|
||||
|
||||
[ext_resource path="res://main/editor.gd" type="Script" id=1]
|
||||
[ext_resource path="res://terrain/terrain_draw.png" type="Image" id=2]
|
||||
[ext_resource path="res://terrain/terrain.png" type="Image" id=3]
|
||||
[ext_resource path="res://terrain/terrain_edit.png" type="Image" id=4]
|
||||
@@ -48,7 +47,6 @@ size = Vector3( 4, 4, 120 )
|
||||
size = Vector3( 3, 60, 3 )
|
||||
|
||||
[node name="editor" type="Spatial"]
|
||||
script = ExtResource( 1 )
|
||||
|
||||
[node name="WorldEditor" type="WorldEditor" parent="."]
|
||||
|
||||
@@ -124,7 +122,7 @@ text = "NPC Mode"
|
||||
unique_name_in_owner = true
|
||||
margin_top = 206.0
|
||||
margin_right = 248.0
|
||||
margin_bottom = 374.0
|
||||
margin_bottom = 482.0
|
||||
|
||||
[node name="HSeparator" type="HSeparator" parent="VBoxContainer/v_buildings"]
|
||||
margin_right = 248.0
|
||||
@@ -184,11 +182,26 @@ margin_right = 248.0
|
||||
margin_bottom = 168.0
|
||||
text = "Save Buildings"
|
||||
|
||||
[node name="lines_list_building" type="ItemList" parent="VBoxContainer/v_buildings"]
|
||||
unique_name_in_owner = true
|
||||
margin_top = 172.0
|
||||
margin_right = 248.0
|
||||
margin_bottom = 252.0
|
||||
rect_min_size = Vector2( 0, 80 )
|
||||
size_flags_horizontal = 3
|
||||
|
||||
[node name="buildings_assign_to_line" type="Button" parent="VBoxContainer/v_buildings"]
|
||||
unique_name_in_owner = true
|
||||
margin_top = 256.0
|
||||
margin_right = 248.0
|
||||
margin_bottom = 276.0
|
||||
text = "Assign To Line"
|
||||
|
||||
[node name="v_navigation" type="VBoxContainer" parent="VBoxContainer"]
|
||||
unique_name_in_owner = true
|
||||
margin_top = 378.0
|
||||
margin_top = 486.0
|
||||
margin_right = 248.0
|
||||
margin_bottom = 400.0
|
||||
margin_bottom = 508.0
|
||||
|
||||
[node name="HSeparator" type="HSeparator" parent="VBoxContainer/v_navigation"]
|
||||
margin_right = 248.0
|
||||
@@ -202,9 +215,9 @@ text = "Navigation mode"
|
||||
|
||||
[node name="v_poi" type="VBoxContainer" parent="VBoxContainer"]
|
||||
unique_name_in_owner = true
|
||||
margin_top = 404.0
|
||||
margin_top = 512.0
|
||||
margin_right = 248.0
|
||||
margin_bottom = 426.0
|
||||
margin_bottom = 534.0
|
||||
|
||||
[node name="HSeparator" type="HSeparator" parent="VBoxContainer/v_poi"]
|
||||
margin_right = 248.0
|
||||
@@ -218,9 +231,9 @@ text = "POI mode"
|
||||
|
||||
[node name="v_road_lines" type="VBoxContainer" parent="VBoxContainer"]
|
||||
unique_name_in_owner = true
|
||||
margin_top = 430.0
|
||||
margin_top = 538.0
|
||||
margin_right = 248.0
|
||||
margin_bottom = 1080.0
|
||||
margin_bottom = 1188.0
|
||||
|
||||
[node name="HSeparator" type="HSeparator" parent="VBoxContainer/v_road_lines"]
|
||||
margin_right = 248.0
|
||||
@@ -270,7 +283,7 @@ margin_left = 79.0
|
||||
margin_right = 124.0
|
||||
margin_bottom = 20.0
|
||||
text = "Point"
|
||||
items = [ "", null, 0, false, false, 0, 0, null, "", true, "Create", null, 0, false, false, 11, 0, null, "", false, "Remove", null, 0, false, false, 12, 0, null, "", false, "", null, 0, false, false, 3, 0, null, "", true, "Point To Cursor", null, 0, false, false, 51, 0, null, "", false, "Cursor To Point", null, 0, false, false, 52, 0, null, "", false, "Item 6", null, 0, false, false, 6, 0, null, "", false, "Item 7", null, 0, false, false, 7, 0, null, "", false ]
|
||||
items = [ "", null, 0, false, false, 0, 0, null, "", true, "Create", null, 0, false, false, 11, 0, null, "", false, "Remove", null, 0, false, false, 12, 0, null, "", false, "", null, 0, false, false, 3, 0, null, "", true, "Point To Cursor", null, 0, false, false, 51, 0, null, "", false, "Cursor To Point", null, 0, false, false, 52, 0, null, "", false, "Item 6", null, 0, false, true, 6, 0, null, "", false, "Item 7", null, 0, false, true, 7, 0, null, "", false ]
|
||||
switch_on_hover = true
|
||||
|
||||
[node name="road_lines_line_menu" type="MenuButton" parent="VBoxContainer/v_road_lines/road_lines_base/VBoxContainer/road_lines_menu_block"]
|
||||
@@ -506,9 +519,9 @@ margin_bottom = 418.0
|
||||
|
||||
[node name="v_npc" type="VBoxContainer" parent="VBoxContainer"]
|
||||
unique_name_in_owner = true
|
||||
margin_top = 1084.0
|
||||
margin_top = 1192.0
|
||||
margin_right = 248.0
|
||||
margin_bottom = 1106.0
|
||||
margin_bottom = 1214.0
|
||||
|
||||
[node name="HSeparator" type="HSeparator" parent="VBoxContainer/v_npc"]
|
||||
margin_right = 248.0
|
||||
@@ -540,12 +553,13 @@ far = 1000.0
|
||||
[node name="DirectionalLight" type="DirectionalLight" parent="."]
|
||||
transform = Transform( 1, 0, 0, 0, 0.707107, 0.707107, 0, -0.707107, 0.707107, 0, 2, 0 )
|
||||
|
||||
[node name="Area" type="Area" parent="."]
|
||||
[node name="selection_area" type="Area" parent="."]
|
||||
unique_name_in_owner = true
|
||||
collision_layer = 32768
|
||||
collision_mask = 32768
|
||||
monitoring = false
|
||||
|
||||
[node name="CollisionShape" type="CollisionShape" parent="Area"]
|
||||
[node name="CollisionShape" type="CollisionShape" parent="selection_area"]
|
||||
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.1, 0 )
|
||||
shape = SubResource( 9 )
|
||||
|
||||
|
||||
Reference in New Issue
Block a user