small main.go refactor

3 files changed, 8 insertions, 29 deletions

diff --git a/engine/Components/ResourceManager.go b/engine/Components/ResourceManager.go
index 7dae454..c4953e3 100644
--- a/engine/Components/ResourceManager.go
+++ b/engine/Components/ResourceManager.go
@@ -15,17 +15,15 @@ type ResourceManager struct {
 	LoadedPackages map[string]*settings.AppVersion
 	Textures TextrueManager
 	objects map[string]*coreobjects.DynamicObject
-	Worlds map[string]*World
-	Menus map[string]coreobjects.Scene
+	Scenes map[string]coreobjects.Scene
 }
 
 // Initializes the shared resource manager
 func InitManager() {
 	Resources = ResourceManager{
 		LoadedPackages: make(map[string]*settings.AppVersion),
-		Worlds: make(map[string]*World),
 		objects: make(map[string]*coreobjects.DynamicObject),
-		Menus: make(map[string]coreobjects.Scene),
+		Scenes: make(map[string]coreobjects.Scene),
 		Textures: TextrueManager{
 			Textures: make([]*rl.Texture2D, 0),
 			NameToId: make(map[string]uint64),
diff --git a/engine/Dynamic/Package.go b/engine/Dynamic/Package.go
index c9a4ef6..1edcbc2 100644
--- a/engine/Dynamic/Package.go
+++ b/engine/Dynamic/Package.go
@@ -135,7 +135,7 @@ func (base *Package) LoadWorlds() {
 	}
 	for _, v := range base.Worlds {
 		var parsed = v.Parse()
-		components.Resources.Worlds[v.Name] = &parsed
+		components.Resources.Scenes[v.Name] = &parsed
 	}
 }
 
@@ -208,6 +208,6 @@ func loadMenusFromDir(dir string) (map[string]*DynamicMenu, error) {
 
 func (base *Package) LoadMenus() {
 	for k, v := range base.Menus {
-		components.Resources.Menus[fmt.Sprintf("%s/%s", base.Description.Name, k)] = v
+		components.Resources.Scenes[fmt.Sprintf("%s/%s", base.Description.Name, k)] = v
 	}
 }
diff --git a/engine/main.go b/engine/main.go
index 0ee6fec..4410d6b 100644
--- a/engine/main.go
+++ b/engine/main.go
@@ -16,6 +16,7 @@ import (
 )
 
 const CorePackageName string = "core"
+const MainMenuName string = "core/MainMenu"
 
 func main() {
 	settings.ReadSettings()
@@ -34,12 +35,8 @@ func main() {
 	// TEMPORARY SECTION
 	// for _, v := range dynamic.Manager.AvaliablePackages {
 		// log.Printf("%s: %s", k, &v)
-		//components.Resources.LoadedPackages[v.Description.Name] = v.Description.Version
-		//v.LoadTextures()
-		//v.LoadObjects()
-		//v.LoadWorlds()
-		//v.LoadMenus()
-	//}
+		// v.Load()
+	// }
 
 	var coreLoadErr = dynamic.Manager.LoadPackage(CorePackageName)
 	if coreLoadErr != nil {
@@ -52,22 +49,6 @@ func main() {
 
 	var manager = coreobjects.InitSceneManager()
 	// render.StartLoop(manager, components.Resources.Worlds["MainWorld"])
-	render.StartLoop(manager, components.Resources.Menus["core/MainMenu"])
+	render.StartLoop(manager, components.Resources.Scenes[MainMenuName])
 	// render.StartLoop(manager, builtin.MainMenu())
 }
-
-func test_desc() (ui.UIElement, error) {
-	var file, fErr = os.ReadFile("MainMenu.json")  
-	if fErr != nil {
-		return nil, fErr
-	}
-	var desc = descriptors.UIElementDescriptor{}
-	if jsonErr := json.Unmarshal(file, &desc); jsonErr != nil {
-		return nil, jsonErr
-	}
-	var parsed, parseErr = desc.Parse()
-	if parseErr != nil {
-		return nil, parseErr
-	}
-	return parsed, nil
-}