diff --git a/Autoload/Slabset.gd b/Autoload/Slabset.gd index 61468dd0..0eb1f480 100644 --- a/Autoload/Slabset.gd +++ b/Autoload/Slabset.gd @@ -6,6 +6,7 @@ var numberOfThings = 0 # dat[slabID][variation][subtile] var dat = [] +var blank_dat_entry = [] var CODETIME_START enum dir { @@ -21,6 +22,8 @@ enum dir { center = 27 } + + func load_slabset(): var oGame = Nodelist.list["oGame"] @@ -46,8 +49,22 @@ func load_slabset(): for subtile in 9: dat[slabID][variation][subtile] = 0 + blank_dat_entry = [] + blank_dat_entry.resize(28) + for variation in 28: + blank_dat_entry[variation] = [] + blank_dat_entry[variation].resize(9) + for subtile in 9: + blank_dat_entry[variation][subtile] = 0 + print('Created Slabset : '+str(OS.get_ticks_msec()-CODETIME_START)+'ms') +func fetch_slab(slabID, variation, subtile): + if dat.size() > slabID: + return dat[slabID][variation][subtile] + else: + return blank_dat_entry[variation][subtile] + func create_cfg_slabset(filePath): #"res://slabset.cfg" var oMessage = Nodelist.list["oMessage"] @@ -115,7 +132,6 @@ func create_cfg_slabset(filePath): #"res://slabset.cfg" else: oMessage.big("Error", "Couldn't save file, maybe try saving to another directory.") - func get_dir_text(variationNumber): match variationNumber: 00: return 'S' diff --git a/Scenes/Main.tscn b/Scenes/Main.tscn index c79bfa01..4f1484ae 100644 --- a/Scenes/Main.tscn +++ b/Scenes/Main.tscn @@ -5403,32 +5403,32 @@ margin_bottom = 342.0 size_flags_horizontal = 3 columns = 2 -[node name="Label9" type="Label" parent="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer"] -margin_top = 5.0 +[node name="ObjAddButton" type="Button" parent="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer"] margin_right = 113.0 -margin_bottom = 26.0 -text = "Object index" +margin_bottom = 27.0 +size_flags_horizontal = 3 +text = "Add" -[node name="SpinBoxPropertiesValue9" parent="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer" instance=ExtResource( 152 )] +[node name="ObjDeleteButton" type="Button" parent="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer"] margin_left = 117.0 margin_right = 191.0 -margin_bottom = 31.0 -size_flags_horizontal = 10 +margin_bottom = 27.0 +size_flags_horizontal = 3 +text = "Delete" -[node name="Button" type="Button" parent="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer"] -margin_top = 35.0 +[node name="Label9" type="Label" parent="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer"] +margin_top = 36.0 margin_right = 113.0 -margin_bottom = 62.0 -size_flags_horizontal = 3 -text = "Add" +margin_bottom = 57.0 +text = "Object index" -[node name="Button2" type="Button" parent="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer"] +[node name="ObjObjectIndexSpinBox" parent="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer" instance=ExtResource( 152 )] margin_left = 117.0 -margin_top = 35.0 +margin_top = 31.0 margin_right = 191.0 margin_bottom = 62.0 -size_flags_horizontal = 3 -text = "Delete" +size_flags_horizontal = 10 +max_value = 1e+06 [node name="Label6" type="Label" parent="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer"] margin_top = 71.0 @@ -5436,12 +5436,13 @@ margin_right = 113.0 margin_bottom = 92.0 text = "ThingType" -[node name="SpinBoxPropertiesValue6" parent="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer" instance=ExtResource( 152 )] +[node name="ObjThingTypeSpinBox" parent="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer" instance=ExtResource( 152 )] margin_left = 117.0 margin_top = 66.0 margin_right = 191.0 margin_bottom = 97.0 size_flags_horizontal = 10 +max_value = 1e+06 [node name="Label7" type="Label" parent="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer"] margin_top = 106.0 @@ -5449,12 +5450,13 @@ margin_right = 113.0 margin_bottom = 127.0 text = "Subtype" -[node name="SpinBoxPropertiesValue8" parent="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer" instance=ExtResource( 152 )] +[node name="ObjSubtypeSpinBox" parent="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer" instance=ExtResource( 152 )] margin_left = 117.0 margin_top = 101.0 margin_right = 191.0 margin_bottom = 132.0 size_flags_horizontal = 10 +max_value = 1e+06 [node name="Label" type="Label" parent="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer"] margin_top = 141.0 @@ -5462,12 +5464,13 @@ margin_right = 113.0 margin_bottom = 162.0 text = "IsLight" -[node name="SpinBoxPropertiesValue" parent="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer" instance=ExtResource( 152 )] +[node name="ObjIsLightSpinBox" parent="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer" instance=ExtResource( 152 )] margin_left = 117.0 margin_top = 136.0 margin_right = 191.0 margin_bottom = 167.0 size_flags_horizontal = 10 +max_value = 1.0 [node name="Label8" type="Label" parent="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer"] margin_top = 176.0 @@ -5475,12 +5478,13 @@ margin_right = 113.0 margin_bottom = 197.0 text = "EffectRange" -[node name="SpinBoxPropertiesValue7" parent="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer" instance=ExtResource( 152 )] +[node name="ObjEffectRangeSpinBox" parent="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer" instance=ExtResource( 152 )] margin_left = 117.0 margin_top = 171.0 margin_right = 191.0 margin_bottom = 202.0 size_flags_horizontal = 10 +max_value = 1e+06 [node name="Label2" type="Label" parent="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer"] margin_top = 211.0 @@ -5488,12 +5492,13 @@ margin_right = 113.0 margin_bottom = 232.0 text = "Subtile" -[node name="SpinBoxPropertiesValue2" parent="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer" instance=ExtResource( 152 )] +[node name="ObjSubtileSpinBox" parent="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer" instance=ExtResource( 152 )] margin_left = 117.0 margin_top = 206.0 margin_right = 191.0 margin_bottom = 237.0 size_flags_horizontal = 10 +max_value = 8.0 [node name="Label3" type="Label" parent="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer"] margin_top = 246.0 @@ -5501,12 +5506,14 @@ margin_right = 113.0 margin_bottom = 267.0 text = "RelativeX" -[node name="SpinBoxPropertiesValue3" parent="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer" instance=ExtResource( 152 )] +[node name="ObjRelativeXSpinBox" parent="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer" instance=ExtResource( 152 )] margin_left = 117.0 margin_top = 241.0 margin_right = 191.0 margin_bottom = 272.0 size_flags_horizontal = 10 +min_value = -255.0 +step = 0.01 [node name="Label4" type="Label" parent="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer"] margin_top = 281.0 @@ -5514,12 +5521,14 @@ margin_right = 113.0 margin_bottom = 302.0 text = "RelativeY" -[node name="SpinBoxPropertiesValue4" parent="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer" instance=ExtResource( 152 )] +[node name="ObjRelativeYSpinBox" parent="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer" instance=ExtResource( 152 )] margin_left = 117.0 margin_top = 276.0 margin_right = 191.0 margin_bottom = 307.0 size_flags_horizontal = 10 +min_value = -255.0 +step = 0.01 [node name="Label5" type="Label" parent="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer"] margin_top = 316.0 @@ -5527,12 +5536,14 @@ margin_right = 113.0 margin_bottom = 337.0 text = "RelativeZ" -[node name="SpinBoxPropertiesValue5" parent="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer" instance=ExtResource( 152 )] +[node name="ObjRelativeZSpinBox" parent="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer" instance=ExtResource( 152 )] margin_left = 117.0 margin_top = 311.0 margin_right = 191.0 margin_bottom = 342.0 size_flags_horizontal = 10 +min_value = -255.0 +step = 0.01 [node name="SlabsetCopyValues" type="Button" parent="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer"] visible = false @@ -6731,6 +6742,16 @@ script = SubResource( 20 ) [connection signal="value_changed" from="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer2/VBoxContainer/GridContainer/SlabsetIDSpinBox" to="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/DkSlabsetVoxelView" method="_on_SlabsetIDSpinBox_value_changed"] [connection signal="value_changed" from="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer2/VBoxContainer/GridContainer/VariationNumberSpinBox" to="Ui/UiSystem/SlabsetWindow" method="_on_VariationNumberSpinBox_value_changed"] [connection signal="value_changed" from="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer2/VBoxContainer/GridContainer/VariationNumberSpinBox" to="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/DkSlabsetVoxelView" method="_on_VariationNumberSpinBox_value_changed"] +[connection signal="pressed" from="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer/ObjAddButton" to="Ui/UiSystem/SlabsetWindow" method="_on_ObjAddButton_pressed"] +[connection signal="pressed" from="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer/ObjDeleteButton" to="Ui/UiSystem/SlabsetWindow" method="_on_ObjDeleteButton_pressed"] +[connection signal="value_changed" from="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer/ObjThingTypeSpinBox" to="Ui/UiSystem/SlabsetWindow" method="_on_ObjThingTypeSpinBox_value_changed"] +[connection signal="value_changed" from="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer/ObjSubtypeSpinBox" to="Ui/UiSystem/SlabsetWindow" method="_on_ObjSubtypeSpinBox_value_changed"] +[connection signal="value_changed" from="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer/ObjIsLightSpinBox" to="Ui/UiSystem/SlabsetWindow" method="_on_ObjIsLightSpinBox_value_changed"] +[connection signal="value_changed" from="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer/ObjEffectRangeSpinBox" to="Ui/UiSystem/SlabsetWindow" method="_on_ObjEffectRangeSpinBox_value_changed"] +[connection signal="value_changed" from="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer/ObjSubtileSpinBox" to="Ui/UiSystem/SlabsetWindow" method="_on_ObjSubtileSpinBox_value_changed"] +[connection signal="value_changed" from="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer/ObjRelativeXSpinBox" to="Ui/UiSystem/SlabsetWindow" method="_on_ObjRelativeXSpinBox_value_changed"] +[connection signal="value_changed" from="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer/ObjRelativeYSpinBox" to="Ui/UiSystem/SlabsetWindow" method="_on_ObjRelativeYSpinBox_value_changed"] +[connection signal="value_changed" from="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer/ObjRelativeZSpinBox" to="Ui/UiSystem/SlabsetWindow" method="_on_ObjRelativeZSpinBox_value_changed"] [connection signal="pressed" from="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/SlabsetCopyValues" to="Ui/UiSystem/SlabsetWindow" method="_on_SlabsetCopyValues_pressed"] [connection signal="pressed" from="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ExportSlabsDat" to="Ui/UiSystem/SlabsetWindow" method="_on_ExportSlabsDat_pressed"] [connection signal="pressed" from="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ExportSlabsCfg" to="Ui/UiSystem/SlabsetWindow" method="_on_ExportSlabsCfg_pressed"] diff --git a/Scenes/PickSlabWindow.gd b/Scenes/PickSlabWindow.gd index edc35322..d9aea3db 100644 --- a/Scenes/PickSlabWindow.gd +++ b/Scenes/PickSlabWindow.gd @@ -91,14 +91,14 @@ func add_slabs(): match slabID: Slabs.PORTAL: for i in 9: - columnArray[i] = Slabset.dat[slabID][8][i] + columnArray[i] = Slabset.fetch_slab(slabID, 8, i) Slabs.WALL_AUTOMATIC: for i in 9: - columnArray[i] = Slabset.dat[Slabs.WALL_WITH_BANNER][slabVariation][i] + columnArray[i] = Slabset.fetch_slab(Slabs.WALL_WITH_BANNER, slabVariation, i) _: if slabID < 1000: for i in 9: - columnArray[i] = Slabset.dat[slabID][slabVariation][i] # !!!!!!!!!!!!! + columnArray[i] = Slabset.fetch_slab(slabID, slabVariation, i) else: # Custom slab pass diff --git a/Scenes/SlabPlacement.gd b/Scenes/SlabPlacement.gd index eecf4635..150cdecf 100644 --- a/Scenes/SlabPlacement.gd +++ b/Scenes/SlabPlacement.gd @@ -755,7 +755,7 @@ func dkdat_position_to_column_data(asset3x3group): var index = asset3x3group[subtile] / 9 var variation = index % 28 var slabID = index / 28 - var dkClmIndex = Slabset.dat[slabID][variation][subtile] + var dkClmIndex = Slabset.fetch_slab(slabID, variation, subtile) # Get the cube data from oDkClm slabCubes.append(Columnset.cubes[dkClmIndex]) diff --git a/Scenes/SlabsetWindow.gd b/Scenes/SlabsetWindow.gd index 13f06b74..2354d456 100644 --- a/Scenes/SlabsetWindow.gd +++ b/Scenes/SlabsetWindow.gd @@ -18,6 +18,19 @@ onready var oPickSlabWindow = Nodelist.list["oPickSlabWindow"] onready var oTabCustomSlabs = Nodelist.list["oTabCustomSlabs"] onready var oExportSlabsetClmDialog = Nodelist.list["oExportSlabsetClmDialog"] +onready var oObjObjectIndexSpinBox = Nodelist.list["oObjObjectIndexSpinBox"] +onready var oObjAddButton = Nodelist.list["oObjAddButton"] +onready var oObjDeleteButton = Nodelist.list["oObjDeleteButton"] +onready var oObjThingTypeSpinBox = Nodelist.list["oObjThingTypeSpinBox"] +onready var oObjSubtypeSpinBox = Nodelist.list["oObjSubtypeSpinBox"] +onready var oObjIsLightSpinBox = Nodelist.list["oObjIsLightSpinBox"] +onready var oObjEffectRangeSpinBox = Nodelist.list["oObjEffectRangeSpinBox"] +onready var oObjSubtileSpinBox = Nodelist.list["oObjSubtileSpinBox"] +onready var oObjRelativeXSpinBox = Nodelist.list["oObjRelativeXSpinBox"] +onready var oObjRelativeYSpinBox = Nodelist.list["oObjRelativeYSpinBox"] +onready var oObjRelativeZSpinBox = Nodelist.list["oObjRelativeZSpinBox"] + + var scnColumnSetter = preload('res://Scenes/ColumnSetter.tscn') # Declare member variables here. Examples: @@ -149,7 +162,7 @@ func update_columns_ui(): for subtile in columnSettersArray.size(): var spinbox = columnSettersArray[subtile].get_node("CustomSpinBox") spinbox.disconnect("value_changed",self,"_on_Slabset3x3ColumnSpinBox_value_changed") - var clmIndex = Slabset.dat[slabID][variation][subtile] + var clmIndex = Slabset.fetch_slab(slabID, variation, subtile) spinbox.value = clmIndex spinbox.connect("value_changed",self,"_on_Slabset3x3ColumnSpinBox_value_changed") @@ -262,3 +275,43 @@ func _on_ExportSlabsetClmDialog_file_selected(filePath): oMessage.quick("Saved: " + filePath) else: oMessage.big("Error", "Couldn't save file, maybe try saving to another directory.") + + +func _on_ObjAddButton_pressed(): + pass # Replace with function body. + + +func _on_ObjDeleteButton_pressed(): + pass # Replace with function body. + + +func _on_ObjThingTypeSpinBox_value_changed(value): + pass # Replace with function body. + + +func _on_ObjSubtypeSpinBox_value_changed(value): + pass # Replace with function body. + + +func _on_ObjIsLightSpinBox_value_changed(value): + pass # Replace with function body. + + +func _on_ObjEffectRangeSpinBox_value_changed(value): + pass # Replace with function body. + + +func _on_ObjSubtileSpinBox_value_changed(value): + pass # Replace with function body. + + +func _on_ObjRelativeXSpinBox_value_changed(value): + pass # Replace with function body. + + +func _on_ObjRelativeYSpinBox_value_changed(value): + pass # Replace with function body. + + +func _on_ObjRelativeZSpinBox_value_changed(value): + pass # Replace with function body. diff --git a/Scenes/VoxelViewer.gd b/Scenes/VoxelViewer.gd index f580121e..4268dbde 100644 --- a/Scenes/VoxelViewer.gd +++ b/Scenes/VoxelViewer.gd @@ -141,7 +141,7 @@ func do_all(): var x = (variation*3) + xSubtile + separation var z = (variation*3) + ySubtile + separation - var clmIndex = Slabset.dat[slabID][variation][subtile] + var clmIndex = Slabset.fetch_slab(slabID, variation, subtile) oVoxelGen.column_gen(genArray, x-1.5, z-1.5, clmIndex, surrClmIndex, true, Columnset)