Introduce GUIFixedSizeElement protocol to workaround some annoying co…

…nstraint solving limitations (fixes #189)
stackotter · Jan 14, 2024 · e3f224e · e3f224e
1 parent ec79c1d
commit e3f224e
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 5 deletions.
diff --git a/Sources/Core/Renderer/GUI/GUI.swift b/Sources/Core/Renderer/GUI/GUI.swift
@@ -287,7 +287,7 @@ struct GUI {
     group.add(GUISprite.selectedHotbarSlot, .bottom(0), .left(20 * selectedSlot))
 
     for (i, slot) in slots.enumerated() {
-      group.add(GUIInventorySlot(slot: slot), .bottom(4), .left(20 * i + 4))
+      group.add(GUIInventorySlot(slot: slot), .bottom(2), .left(20 * i + 4))
     }
   }
 

diff --git a/Sources/Core/Renderer/GUI/GUIElement/GUIGroupElement.swift b/Sources/Core/Renderer/GUI/GUIElement/GUIGroupElement.swift
@@ -1,6 +1,6 @@
 import FirebladeMath
 
-struct GUIGroupElement: GUIElement {
+struct GUIGroupElement: GUIFixedSizeElement {
   var size: Vec2i
   var children: [(GUIElement, Constraints)]
 
@@ -27,7 +27,7 @@ struct GUIGroupElement: GUIElement {
       var elementMeshes = try element.meshes(context: context)
 
       let elementSize: Vec2i
-      if let group = element as? GUIGroupElement {
+      if let group = element as? GUIFixedSizeElement {
         elementSize = group.size
       } else {
         elementSize = elementMeshes.size()

diff --git a/Sources/Core/Renderer/GUI/GUIElement/GUIInventoryItem.swift b/Sources/Core/Renderer/GUI/GUIElement/GUIInventoryItem.swift
@@ -2,9 +2,11 @@ import Foundation
 import FirebladeMath
 import DeltaCore
 
-struct GUIInventoryItem: GUIElement {
+struct GUIInventoryItem: GUIElement, GUIFixedSizeElement {
   var itemId: Int
 
+  let size = Vec2i(16, 16)
+
   func meshes(context: GUIContext) throws -> [GUIElementMesh] {
     guard let model = context.itemModelPalette.model(for: itemId) else {
       throw GUIRendererError.invalidItemId(itemId)

diff --git a/Sources/Core/Renderer/GUI/GUIElement/GUIInventorySlot.swift b/Sources/Core/Renderer/GUI/GUIElement/GUIInventorySlot.swift
@@ -1,9 +1,11 @@
 import FirebladeMath
 import DeltaCore
 
-struct GUIInventorySlot: GUIElement {
+struct GUIInventorySlot: GUIElement, GUIFixedSizeElement {
   var slot: Slot
 
+  let size = Vec2i(17, 18)
+
   func meshes(context: GUIContext) throws -> [GUIElementMesh] {
     guard let stack = slot.stack else {
       return []

diff --git a/Sources/Core/Renderer/GUI/GUIFixedSizeElement.swift b/Sources/Core/Renderer/GUI/GUIFixedSizeElement.swift
@@ -0,0 +1,5 @@
+import FirebladeMath
+
+protocol GUIFixedSizeElement: GUIElement {
+  var size: Vec2i { get }
+}