Skip to content

Commit b8d1f92

Browse files
committed
Fixed lag with window title colours being set too often
1 parent ff7c1da commit b8d1f92

File tree

5 files changed

+17
-32
lines changed

5 files changed

+17
-32
lines changed

Autoload/Constants.gd

+5-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@ extends Node
22
const TILE_SIZE = 96
33
const SUBTILE_SIZE = 32
44
const PLAYERS_COUNT = 9
5-
# red blue green yellow white neutral Purple Black Orange
6-
const ownerFloorCol = [Color8(132,44,0,255), Color8(136,112,148,255), Color8(52, 92, 4,255), Color8(188,156,0,255), Color8(207,207,207,255), Color8(52,36,4,255), Color8(171, 80,120,255), Color8(32,32,32,255), Color8(188,108,53,255)] #Color8(180,160,124,255)
7-
const ownerRoomCol = [Color8(156,48,0,255), Color8(160,136,180,255), Color8(56,112,12,255), Color8(228,212,0,255), Color8(242,242,242,255), Color8(0,0,0,0), Color8(200,104,164,255), Color8(1,1,1,255), Color8(211,132,72,255)] #Color8(188,168,132,255)
5+
# red blue green yellow white neutral Purple Black Orange
6+
const ownerFloorCol = [Color8(132,44,0), Color8(136,112,148), Color8(52,92,4), Color8(188,156,0), Color8(207,207,207), Color8(52,36,4), Color8(171,80,120), Color8(32,32,32), Color8(188,108,53)] #Color8(180,160,124,255)
7+
const ownerRoomCol = [Color8(156,48,0), Color8(160,136,180), Color8(56,112,12), Color8(228,212,0), Color8(242,242,242), Color8(0,0,0,0), Color8(200,104,164), Color8(1,1,1), Color8(211,132,72)] #Color8(188,168,132,255)
8+
const windowTitleCol = [Color8(153,92,92), Color8(151,118,168), Color8(107,128,84), Color8(178,173,116), Color8(184,184,184), Color8(86,82,102), Color8(153,92,121), Color8(5,5,5), Color8(178,134,89)]
9+
810
const ownershipNames = ["Red","Blue","Green","Yellow","White","None","Purple","Black","Orange"]
911

1012
const listOrientations = [

Scenes/OwnerSelection.gd

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ onready var oCurrentFormat = Nodelist.list["oCurrentFormat"]
99
onready var gridItemScene = preload("res://Scenes/GenericGridItem.tscn")
1010
onready var oSelectedRect = $Control/SelectedRect
1111
onready var oCenteredLabel = $Control/CenteredLabel
12+
onready var oSelector = Nodelist.list["oSelector"]
1213

1314
var ownership_available = true
1415

@@ -117,7 +118,6 @@ func set_selection(value):
117118
for id in oOwnershipGridContainer.get_children():
118119
if id.get_meta("grid_value") == value:
119120
oSelectedRect.boundToItem = id
120-
onready var oSelector = Nodelist.list["oSelector"]
121121

122122
func update_ownership_options():
123123
match oSelector.mode:

Scenes/Selection.gd

+5-1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ onready var oLoadingBar = Nodelist.list["oLoadingBar"]
3030
onready var oBrushPreview = Nodelist.list["oBrushPreview"]
3131
onready var oPlaceThingsAnywhere = Nodelist.list["oPlaceThingsAnywhere"]
3232
onready var oSlabSideViewer = Nodelist.list["oSlabSideViewer"]
33+
onready var oUseSlabOwnerCheckBox = Nodelist.list["oUseSlabOwnerCheckBox"]
3334

3435
enum {
3536
CONSTRUCT_BRUSH
@@ -86,9 +87,9 @@ func newPaintSubtype(value):
8687

8788

8889
func newOwnership(value):
89-
oUi.update_theme_colour(value)
9090
oOwnerSelection.set_selection(value)
9191
paintOwnership = value
92+
oUi.update_theme_colour(value)
9293

9394
func newPaintSlab(value):
9495
oSelector.change_mode(oSelector.MODE_TILE)
@@ -256,6 +257,9 @@ func place_subtile(placeSubtile):
256257
return
257258
oEditor.mapHasBeenEdited = true
258259

260+
if oUseSlabOwnerCheckBox.pressed == true and visible == true:
261+
newOwnership(oDataOwnership.get_cellv_ownership(oSelector.cursorTile))
262+
259263
if paintThingType != null:
260264
var detectTerrainHeight = oDataClm.height[oDataClmPos.get_cell_clmpos(placeSubtile.x, placeSubtile.y)]
261265
var newPos:Vector3 = Vector3(placeSubtile.x + 0.5, placeSubtile.y + 0.5, detectTerrainHeight)

Scenes/Selector.gd

+1-2
Original file line numberDiff line numberDiff line change
@@ -303,8 +303,7 @@ func moved_to_new_subtile():
303303

304304
if mode == MODE_SUBTILE:
305305
canPlace = true
306-
if oUseSlabOwnerCheckBox.pressed == true and visible == true:
307-
oSelection.paintOwnership = oDataOwnership.get_cellv_ownership(cursorTile)
306+
308307

309308
#func fadeOutWalls(delta):
310309
# if Slabs.array[oSelection.cursorOverSlab][Slabs.SIDE_OF] == Slabs.SIDE_SLAB:

Scenes/Ui.gd

+5-25
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ onready var oMapBrowser = Nodelist.list["oMapBrowser"]
1717
onready var oCamera3D = Nodelist.list["oCamera3D"]
1818
onready var oPlayer = Nodelist.list["oPlayer"]
1919
onready var o3DCameraInfo = Nodelist.list["o3DCameraInfo"]
20+
onready var oSelection = Nodelist.list["oSelection"]
21+
onready var oSelector = Nodelist.list["oSelector"]
2022

2123
var FONT_SIZE_CR_LVL_BASE := 1.00 setget set_FONT_SIZE_CR_LVL_BASE
2224
var FONT_SIZE_CR_LVL_MAX := 8.00 setget set_FONT_SIZE_CR_LVL_MAX
@@ -69,32 +71,10 @@ func _unhandled_input(event):
6971
mouseOnUi = true
7072

7173

72-
73-
#func _process(delta):
74-
# if
75-
# var a = Control.new()
76-
# add_child(a)
77-
# print(a.get_focus_owner())
78-
79-
80-
8174
func update_theme_colour(val):
82-
var col
83-
match val:
84-
0: col = HSV_8(0,40,60)#Color8(132,44,0,255)
85-
1: col = HSV_8(279,30,66)#Color8(136,112,148,255)##
86-
2: col = HSV_8(88,34,50)#col = Color8(52,96,4,255)
87-
3: col = HSV_8(55,35,70)#col = Color8(188,156,0,255)
88-
4: col = HSV_8(0,0,72)#col = Color8(180,160,124,255)
89-
5: col = HSV_8(251,20,40)#col = Color8(64,62,72,255)
90-
6: col = HSV_8(330,40,60)
91-
7: col = HSV_8(0,0,2)
92-
8: col = HSV_8(30,50,70)
93-
# print(col.r8)
94-
# print(col.g8)
95-
# print(col.b8)
96-
97-
windowStyleBoxFlat.set('border_color', col)
75+
var col = Constants.windowTitleCol[val]
76+
if windowStyleBoxFlat.get('border_color') != col:
77+
windowStyleBoxFlat.set('border_color', col)
9878

9979
func HSV_8(h,s,v):
10080
return Color.from_hsv(h/359.0,s/100.0,v/100.0, 1.0)

0 commit comments

Comments
 (0)