Skip to content

Commit

Permalink
0.20
Browse files Browse the repository at this point in the history
  • Loading branch information
@rainlizard
rainlizard committed May 30, 2022
1 parent 4f001b3 commit afe6ebd
Show file tree
Hide file tree
Showing 14 changed files with 331 additions and 214 deletions.
4 changes: 2 additions & 2 deletions AutoLoad/Nodelist.gd
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
extends Node
var list = {}

func start(callingScene): #Called by Main
Nodelist.list["oMain"] = callingScene # node_added signal doesn't include the root node, probably because it has no "owner"
func start(callingScene): # Called by Main root scene
Nodelist.list["oMain"] = callingScene # Add callingScene manually since the node_added signal doesn't include adding it
get_tree().connect("node_added",self,"node_added")

func done(): #Called by ViewportContainer
Expand Down
128 changes: 68 additions & 60 deletions Scenes/ClmControls.gd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,43 +3,71 @@ onready var oEditor = Nodelist.list["oEditor"]
onready var oColumnDetails = Nodelist.list["oColumnDetails"]
onready var oMessage = Nodelist.list["oMessage"]
onready var oDataClm = Nodelist.list["oDataClm"]
onready var oCustomTooltip = Nodelist.list["oCustomTooltip"]
onready var oReadCubes = Nodelist.list["oReadCubes"]


export(NodePath) onready var nodeClm = get_node(nodeClm) as Node
export(NodePath) onready var nodeVoxelView = get_node(nodeVoxelView) as Node

onready var oColumnGridContainer = $"VBoxContainer/ColumnGridContainer"
onready var oHeightSpinBox = $"VBoxContainer/GridAdvancedValues/HeightSpinBox"
onready var oSolidMaskSpinBox = $"VBoxContainer/GridAdvancedValues/SolidMaskSpinBox"
onready var oPermanentSpinBox = $"VBoxContainer/GridAdvancedValues/PermanentSpinBox"
onready var oOrientationSpinBox = $"VBoxContainer/GridAdvancedValues/OrientationSpinBox"
onready var oLintelSpinBox = $"VBoxContainer/GridAdvancedValues/LintelSpinBox"
onready var oGridAdvancedValues = $"VBoxContainer/GridAdvancedValues"
onready var oGridSimpleValues = $"VBoxContainer/GridSimpleValues"
onready var oColumnIndexSpinBox = $"VBoxContainer/HBoxContainer/ColumnIndexSpinBox"
onready var oColumnFirstUnusedButton = $"VBoxContainer/ColumnFirstUnusedButton"
onready var oColumnViewDeleteButton = $"VBoxContainer/ColumnViewDeleteButton"
onready var oFloorTextureSpinBox = $"VBoxContainer/ColumnGridContainer/FloorTextureSpinBox"
onready var oHeightSpinBox = $"VBoxContainer/ColumnGridContainer/HeightSpinBox"
onready var oSolidMaskSpinBox = $"VBoxContainer/ColumnGridContainer/SolidMaskSpinBox"
onready var oPermanentSpinBox = $"VBoxContainer/ColumnGridContainer/PermanentSpinBox"
onready var oOrientationSpinBox = $"VBoxContainer/ColumnGridContainer/OrientationSpinBox"
onready var oLintelSpinBox = $"VBoxContainer/ColumnGridContainer/LintelSpinBox"
onready var oUtilizedSpinBox = $"VBoxContainer/HBoxContainer2/UtilizedSpinBox"
onready var oFloorTextureSpinBox = $"VBoxContainer/GridSimpleValues/FloorTextureSpinBox"

onready var oCube7SpinBox = $"VBoxContainer/ColumnGridContainer/Cube7SpinBox"
onready var oCube6SpinBox = $"VBoxContainer/ColumnGridContainer/Cube6SpinBox"
onready var oCube5SpinBox = $"VBoxContainer/ColumnGridContainer/Cube5SpinBox"
onready var oCube4SpinBox = $"VBoxContainer/ColumnGridContainer/Cube4SpinBox"
onready var oCube3SpinBox = $"VBoxContainer/ColumnGridContainer/Cube3SpinBox"
onready var oCube2SpinBox = $"VBoxContainer/ColumnGridContainer/Cube2SpinBox"
onready var oCube1SpinBox = $"VBoxContainer/ColumnGridContainer/Cube1SpinBox"
onready var oCube0SpinBox = $"VBoxContainer/ColumnGridContainer/Cube0SpinBox"
onready var oUtilizedSpinBox = $"VBoxContainer/HBoxContainer2/UtilizedSpinBox"
onready var oCube8SpinBox = $"VBoxContainer/GridSimpleValues/Cube8SpinBox"
onready var oCube7SpinBox = $"VBoxContainer/GridSimpleValues/Cube7SpinBox"
onready var oCube6SpinBox = $"VBoxContainer/GridSimpleValues/Cube6SpinBox"
onready var oCube5SpinBox = $"VBoxContainer/GridSimpleValues/Cube5SpinBox"
onready var oCube4SpinBox = $"VBoxContainer/GridSimpleValues/Cube4SpinBox"
onready var oCube3SpinBox = $"VBoxContainer/GridSimpleValues/Cube3SpinBox"
onready var oCube2SpinBox = $"VBoxContainer/GridSimpleValues/Cube2SpinBox"
onready var oCube1SpinBox = $"VBoxContainer/GridSimpleValues/Cube1SpinBox"
onready var cubeSpinBoxArray = [
oCube1SpinBox,
oCube2SpinBox,
oCube3SpinBox,
oCube4SpinBox,
oCube5SpinBox,
oCube6SpinBox,
oCube7SpinBox,
oCube8SpinBox,
]

func _ready():
oColumnIndexSpinBox.connect("value_changed", nodeVoxelView, "_on_ColumnIndexSpinBox_value_changed")

oCube7SpinBox.connect("value_changed", self, "_on_cube_value_changed", [7])
oCube6SpinBox.connect("value_changed", self, "_on_cube_value_changed", [6])
oCube5SpinBox.connect("value_changed", self, "_on_cube_value_changed", [5])
oCube4SpinBox.connect("value_changed", self, "_on_cube_value_changed", [4])
oCube3SpinBox.connect("value_changed", self, "_on_cube_value_changed", [3])
oCube2SpinBox.connect("value_changed", self, "_on_cube_value_changed", [2])
oCube1SpinBox.connect("value_changed", self, "_on_cube_value_changed", [1])
oCube0SpinBox.connect("value_changed", self, "_on_cube_value_changed", [0])
oFloorTextureSpinBox.connect("mouse_entered", self, "_on_floortexture_mouse_entered")
oFloorTextureSpinBox.connect("mouse_exited", self, "_on_floortexture_mouse_exited")

for i in cubeSpinBoxArray.size():
cubeSpinBoxArray[i].connect("value_changed", self, "_on_cube_value_changed", [i])
cubeSpinBoxArray[i].connect("mouse_entered", self, "_on_cube_mouse_entered", [i])
cubeSpinBoxArray[i].connect("mouse_exited", self, "_on_cube_mouse_exited", [i])

oGridAdvancedValues.visible = false

func _on_floortexture_mouse_entered():
oCustomTooltip.set_floortexture(oFloorTextureSpinBox.value)
func _on_floortexture_mouse_exited():
oCustomTooltip.set_text("")


func _on_cube_mouse_entered(cubeNumber):
var cubeIndex = int(cubeSpinBoxArray[cubeNumber].value)
if cubeIndex < oReadCubes.names.size():
oCustomTooltip.set_text(oReadCubes.names[cubeIndex])

func _on_cube_mouse_exited(cubeNumber):
oCustomTooltip.set_text("")

func _on_ColumnDuplicateButton_pressed():
var clmIndex = int(oColumnIndexSpinBox.value)
Expand Down Expand Up @@ -78,20 +106,21 @@ func _on_ColumnIndexSpinBox_value_changed(value):
oUtilizedSpinBox.value = nodeClm.utilized[clmIndex]
oHeightSpinBox.value = nodeClm.height[clmIndex]
oSolidMaskSpinBox.value = nodeClm.solidMask[clmIndex]
oCube7SpinBox.value = nodeClm.cubes[clmIndex][7]
oCube6SpinBox.value = nodeClm.cubes[clmIndex][6]
oCube5SpinBox.value = nodeClm.cubes[clmIndex][5]
oCube4SpinBox.value = nodeClm.cubes[clmIndex][4]
oCube3SpinBox.value = nodeClm.cubes[clmIndex][3]
oCube2SpinBox.value = nodeClm.cubes[clmIndex][2]
oCube1SpinBox.value = nodeClm.cubes[clmIndex][1]
oCube0SpinBox.value = nodeClm.cubes[clmIndex][0]
oCube8SpinBox.value = nodeClm.cubes[clmIndex][7]
oCube7SpinBox.value = nodeClm.cubes[clmIndex][6]
oCube6SpinBox.value = nodeClm.cubes[clmIndex][5]
oCube5SpinBox.value = nodeClm.cubes[clmIndex][4]
oCube4SpinBox.value = nodeClm.cubes[clmIndex][3]
oCube3SpinBox.value = nodeClm.cubes[clmIndex][2]
oCube2SpinBox.value = nodeClm.cubes[clmIndex][1]
oCube1SpinBox.value = nodeClm.cubes[clmIndex][0]

for i in get_incoming_connections():
var nodeID = i["source"]
if nodeID is CustomSpinBox or nodeID is CheckBox:
nodeID.set_block_signals(false)


oCustomTooltip.visible = false # Tooltip becomes incorrect when changing column index so just turn it off until you hover your mouse over it again

func _on_cube_value_changed(value, cubeNumber): # signal connected by GDScript
if nodeClm == oDataClm:
Expand All @@ -102,14 +131,17 @@ func _on_cube_value_changed(value, cubeNumber): # signal connected by GDScript

oHeightSpinBox.value = nodeClm.get_real_height(nodeClm.cubes[clmIndex])
oSolidMaskSpinBox.value = nodeClm.calculate_solid_mask(nodeClm.cubes[clmIndex])


_on_cube_mouse_entered(cubeNumber) # Update tooltip

func _on_FloorTextureSpinBox_value_changed(value):
if nodeClm == oDataClm:
oEditor.mapHasBeenEdited = true
var clmIndex = int(oColumnIndexSpinBox.value)
nodeClm.floorTexture[clmIndex] = int(value)
nodeVoxelView.update_column_view()

_on_floortexture_mouse_entered() # Update tooltip

func _on_LintelSpinBox_value_changed(value):
if nodeClm == oDataClm:
Expand Down Expand Up @@ -179,29 +211,5 @@ func _on_ColumnViewDeleteButton_pressed():
nodeVoxelView.oAllVoxelObjects.visible = true
nodeVoxelView.oSelectedVoxelObject.visible = false




#func connect_all_signals(connectToNode, voxelViewNode):
# $"VBoxContainer/HBoxContainer/ColumnIndexSpinBox".connect("value_changed", voxelViewNode, "_on_ColumnIndexSpinBox_value_changed")
#
# $"VBoxContainer/HBoxContainer/ColumnIndexSpinBox".connect("value_changed", connectToNode, "_on_ColumnIndexSpinBox_value_changed")
# $"VBoxContainer/ColumnFirstUnusedButton".connect("pressed", connectToNode, "_on_ColumnFirstUnusedButton_pressed")
# $"VBoxContainer/ColumnViewDeleteButton".connect("pressed", connectToNode, "_on_ColumnViewDeleteButton_pressed")
# $"VBoxContainer/ColumnGridContainer/Cube7SpinBox".connect("value_changed", connectToNode, "_on_cube_value_changed", [7])
# $"VBoxContainer/ColumnGridContainer/Cube6SpinBox".connect("value_changed", connectToNode, "_on_cube_value_changed", [6])
# $"VBoxContainer/ColumnGridContainer/Cube5SpinBox".connect("value_changed", connectToNode, "_on_cube_value_changed", [5])
# $"VBoxContainer/ColumnGridContainer/Cube4SpinBox".connect("value_changed", connectToNode, "_on_cube_value_changed", [4])
# $"VBoxContainer/ColumnGridContainer/Cube3SpinBox".connect("value_changed", connectToNode, "_on_cube_value_changed", [3])
# $"VBoxContainer/ColumnGridContainer/Cube2SpinBox".connect("value_changed", connectToNode, "_on_cube_value_changed", [2])
# $"VBoxContainer/ColumnGridContainer/Cube1SpinBox".connect("value_changed", connectToNode, "_on_cube_value_changed", [1])
# $"VBoxContainer/ColumnGridContainer/Cube0SpinBox".connect("value_changed", connectToNode, "_on_cube_value_changed", [0])
# $"VBoxContainer/ColumnGridContainer/FloorTextureSpinBox".connect("value_changed", connectToNode, "_on_FloorTextureSpinBox_value_changed")
# $"VBoxContainer/ColumnGridContainer/HeightSpinBox".connect("value_changed", connectToNode, "_on_HeightSpinBox_value_changed")
# $"VBoxContainer/ColumnGridContainer/SolidMaskSpinBox".connect("value_changed", connectToNode, "_on_SolidMaskSpinBox_value_changed")
# $"VBoxContainer/ColumnGridContainer/PermanentSpinBox".connect("value_changed", connectToNode, "_on_PermanentSpinBox_value_changed")
# $"VBoxContainer/ColumnGridContainer/OrientationSpinBox".connect("value_changed", connectToNode, "_on_OrientationSpinBox_value_changed")
# $"VBoxContainer/ColumnGridContainer/LintelSpinBox".connect("value_changed", connectToNode, "_on_LintelSpinBox_value_changed")



func _on_CheckboxShowAll_toggled(checkboxValue):
oGridAdvancedValues.visible = checkboxValue
Loading

0 comments on commit afe6ebd

Please sign in to comment.