String() error fix

10 files changed, 19 insertions, 25 deletions

diff --git a/engine/Components/ResourceManager.go b/engine/Components/ResourceManager.go
index c4953e3..1301b0c 100644
--- a/engine/Components/ResourceManager.go
+++ b/engine/Components/ResourceManager.go
@@ -9,18 +9,7 @@ import (
 	rl "github.com/gen2brain/raylib-go/raylib"
 )
 
-var Resources ResourceManager
-
-type ResourceManager struct {
-	LoadedPackages map[string]*settings.AppVersion
-	Textures TextrueManager
-	objects map[string]*coreobjects.DynamicObject
-	Scenes map[string]coreobjects.Scene
-}
-
-// Initializes the shared resource manager
-func InitManager() {
-	Resources = ResourceManager{
+var Resources ResourceManager = ResourceManager{
 		LoadedPackages: make(map[string]*settings.AppVersion),
 		objects: make(map[string]*coreobjects.DynamicObject),
 		Scenes: make(map[string]coreobjects.Scene),
@@ -29,6 +18,13 @@ func InitManager() {
 			NameToId: make(map[string]uint64),
 		},
 	}
+
+
+type ResourceManager struct {
+	LoadedPackages map[string]*settings.AppVersion
+	Textures TextrueManager
+	objects map[string]*coreobjects.DynamicObject
+	Scenes map[string]coreobjects.Scene
 }
 
 func (base *ResourceManager) RegisterObject(PackageName string, obejctName string, new *coreobjects.DynamicObject) error { 
@@ -52,7 +48,7 @@ func (base *ResourceManager) GetObject(name string) (*coreobjects.DynamicObject,
 func (base *ResourceManager) String() string {
 	var outp, jsonErr = json.Marshal(base)
 	if jsonErr != nil {
-		return fmt.Sprintf("Failed to parse settings: %s", jsonErr.Error())
+		return fmt.Sprintf("Failed to parse resource manager %s", jsonErr.Error())
 	}
 	return string(outp)
 }
diff --git a/engine/Components/TextureManager.go b/engine/Components/TextureManager.go
index 27449b1..eac1898 100644
--- a/engine/Components/TextureManager.go
+++ b/engine/Components/TextureManager.go
@@ -7,7 +7,6 @@ import (
 	rl "github.com/gen2brain/raylib-go/raylib"
 )
 
-
 type TextrueManager struct {
 	Textures []*rl.Texture2D
 	NameToId map[string]uint64
@@ -48,7 +47,7 @@ func (base *TextrueManager) GetTextureByName(textureName string) (*rl.Texture2D,
 func (base *TextrueManager) String() string {
 	var outp, jsonErr = json.Marshal(base)
 	if jsonErr != nil {
-		return fmt.Sprintf("Failed to parse settings: %s", jsonErr.Error())
+		return fmt.Sprintf("Failed to parse texture manager: %s", jsonErr.Error())
 	}
 	return string(outp)
 }
diff --git a/engine/Dynamic/Descriptors/Objects.go b/engine/Dynamic/Descriptors/Objects.go
index eb3fb78..756f819 100644
--- a/engine/Dynamic/Descriptors/Objects.go
+++ b/engine/Dynamic/Descriptors/Objects.go
@@ -135,7 +135,7 @@ func (base *ObjectColliderBlock) parseAsBox() coreobjects.Collider {
 func (base *ObjectDescriptor) String() string {
 	var outp, jsonErr = json.Marshal(base)
 	if jsonErr != nil {
-		return fmt.Sprintf("Failed to parse settings: %s", jsonErr.Error())
+		return fmt.Sprintf("Failed to parse object: %s", jsonErr.Error())
 	}
 	return string(outp)
 }
diff --git a/engine/Dynamic/Package.go b/engine/Dynamic/Package.go
index 1edcbc2..1ed7301 100644
--- a/engine/Dynamic/Package.go
+++ b/engine/Dynamic/Package.go
@@ -54,7 +54,7 @@ type Package struct {
 func (base *Package) String() string {
 	var outp, jsonErr = json.Marshal(base)
 	if jsonErr != nil {
-		return fmt.Sprintf("Failed to parse settings: %s", jsonErr.Error())
+		return fmt.Sprintf("Failed to parse package: %s", jsonErr.Error())
 	}
 	return string(outp)
 }
diff --git a/engine/Settings/Flags.go b/engine/Settings/Flags.go
index 6c5d1f4..5b4abbd 100644
--- a/engine/Settings/Flags.go
+++ b/engine/Settings/Flags.go
@@ -15,7 +15,7 @@ var appliedFlags *Flags
 func (base Flags) String() string {
 	var outp, jsonErr = json.Marshal(base)
 	if jsonErr != nil {
-		return fmt.Sprintf("Failed to parse settings: %s", jsonErr.Error())
+		return fmt.Sprintf("Failed to parse flags: %s", jsonErr.Error())
 	}
 	return string(outp)
 }
diff --git a/engine/UI/FlexElement.go b/engine/UI/FlexElement.go
index b8107ee..1c307da 100644
--- a/engine/UI/FlexElement.go
+++ b/engine/UI/FlexElement.go
@@ -92,7 +92,7 @@ func (base *layoutCache) CalculateRowsLocations (rows []UIElement, WeightToPixel
 func (base layoutCache) String() string {
 	var outp, jsonErr = json.Marshal(base)
 	if jsonErr != nil {
-		return fmt.Sprintf("Failed to parse settings: %s", jsonErr.Error())
+		return fmt.Sprintf("Failed to parse layour cache: %s", jsonErr.Error())
 	}
 	return string(outp)
 }
diff --git a/engine/UI/GridRow.go b/engine/UI/GridRow.go
index 4940948..58d834d 100644
--- a/engine/UI/GridRow.go
+++ b/engine/UI/GridRow.go
@@ -76,10 +76,10 @@ func (base *GridRow) RecalculateCache(span *rl.Rectangle) {
 		X: float32(rl.GetScreenWidth()),
 		Y: float32(rl.GetScreenHeight()),
 	}
-	rl.TraceLog(rl.LogInfo, "Span: %vx%v \tPadding: %v", span.Width, span.Height, *base.Style.Padding)
+	// rl.TraceLog(rl.LogInfo, "Span: %vx%v \tPadding: %v", span.Width, span.Height, *base.Style.Padding)
 	base.cache.CalculateOffsets(span.Width, span.Height, *base.Style.Padding, *base.Style.Padding)
 	var weightToScale = getWeightToPixelsRatio(base, base.cache.Width)
-	rl.TraceLog(rl.LogInfo, "Ratio: %v", weightToScale)
+	// rl.TraceLog(rl.LogInfo, "Ratio: %v", weightToScale)
 	var spacingPx = base.Spacing * span.Width
 	base.cache.CalculateRowsLocations(base.Objects, weightToScale, spacingPx, span.X)
 }
@@ -87,7 +87,7 @@ func (base *GridRow) RecalculateCache(span *rl.Rectangle) {
 func (base GridRow) String() string {
 	var outp, jsonErr = json.Marshal(base)
 	if jsonErr != nil {
-		return fmt.Sprintf("Failed to parse settings: %s", jsonErr.Error())
+		return fmt.Sprintf("Failed to parse grid row: %s", jsonErr.Error())
 	}
 	return string(outp)
 }
diff --git a/engine/UI/Label.go b/engine/UI/Label.go
index 9d47187..08f5943 100644
--- a/engine/UI/Label.go
+++ b/engine/UI/Label.go
@@ -105,7 +105,7 @@ func (base *Label) getTextHeight(position *rl.Rectangle) int32 {
 func (base Label) String() string {
 	var outp, jsonErr = json.Marshal(base)
 	if jsonErr != nil {
-		return fmt.Sprintf("Failed to parse settings: %s", jsonErr.Error())
+		return fmt.Sprintf("Failed to parse label: %s", jsonErr.Error())
 	}
 	return string(outp)
 }
diff --git a/engine/UI/Void.go b/engine/UI/Void.go
index 61d83e8..e23d252 100644
--- a/engine/UI/Void.go
+++ b/engine/UI/Void.go
@@ -33,7 +33,7 @@ func (base *Void) Draw(*rl.Rectangle) {
 func (base Void) String() string {
 	var outp, jsonErr = json.Marshal(base)
 	if jsonErr != nil {
-		return fmt.Sprintf("Failed to parse settings: %s", jsonErr.Error())
+		return fmt.Sprintf("Failed to parse void: %s", jsonErr.Error())
 	}
 	return string(outp)
 }
diff --git a/engine/main.go b/engine/main.go
index 932b787..1ec01ec 100644
--- a/engine/main.go
+++ b/engine/main.go
@@ -16,7 +16,6 @@ const MainMenuName string = "core/MainMenu"
 
 func main() {
 	settings.ReadSettings()
-	components.InitManager()
 	dynamic.ReadPackages()
 
 	// The core package contains the main menu and necessary logic.