Rework ViewLocator to fix init bug

src/Shared.zig

@@ -235,10 +235,8 @@ pub const Shared = struct {
     };
 
     pub inline fn init() !void {
-        for (std.enums.values(Shared.View.Views)) |view| {
-            var v = Shared.View.ViewLocator.Build(view);
-            v.init();
-        }
+        const menu = Shared.View.ViewLocator.Build(.Menu);
+        menu.init();
 
         raylib.setConfigFlags(
             @enumFromInt( //@intFromEnum(raylib.ConfigFlags.flag_window_always_run) +

src/ViewLocator.zig

@@ -3,33 +3,25 @@ const BaseViewModel = @import("./ViewModels/ViewModel.zig").ViewModel;
 const BaseView = @import("./Views/View.zig").View;
 
 pub const ViewLocator = struct {
+    const AllViews = [_]BaseView{
+        @import("./Views/RaylibSplashScreenView.zig").RaylibSplashScreenView,
+        @import("./Views/DylanSplashScreenView.zig").DylanSplashScreenView,
+        @import("./Views/PausedView.zig").PausedView,
+        @import("./Views/AsteroidsView.zig").AsteroidsView,
+        @import("./Views/MenuView.zig").MenuView,
+        @import("./Views/SettingsView.zig").SettingsView,
+        @import("./Views/GameOverView.zig").GameOverView,
+    };
+
     inline fn GetView(view: Views) BaseView {
-        switch (view) {
-            Views.Raylib_Splash_Screen => {
-                return @import("./Views/RaylibSplashScreenView.zig").RaylibSplashScreenView;
-            },
-            Views.Dylan_Splash_Screen => {
-                return @import("./Views/DylanSplashScreenView.zig").DylanSplashScreenView;
-            },
-            Views.Paused => {
-                return @import("./Views/PausedView.zig").PausedView;
-            },
-            Views.Asteroids => {
-                return @import("./Views/AsteroidsView.zig").AsteroidsView;
-            },
-            Views.Menu => {
-                return @import("./Views/MenuView.zig").MenuView;
-            },
-            Views.Settings => {
-                return @import("./Views/SettingsView.zig").SettingsView;
-            },
-            Views.Game_Over => {
-                return @import("./Views/GameOverView.zig").GameOverView;
-            },
-            else => {
-                return BaseView{ .DrawRoutine = DrawQuit };
-            },
+        inline for (AllViews) |v| {
+            if (v.Key == view) return v;
         }
+
+        return BaseView{
+            .Key = .Quit,
+            .DrawRoutine = DrawQuit,
+        };
     }
 
     fn DrawQuit() Views {

src/ViewModels/AsteroidsViewModel.zig

@@ -98,8 +98,6 @@ pub const AsteroidsViewModel = Shared.View.ViewModel.Create(
                 };
             }
 
-            Shared.Log.Info("About to call random...");
-
             // Initialization Big Meteor
             for (0..MAX_BIG_METEORS) |i| {
                 posx = Shared.Random.Get().float(f32) * screenSize.x;

src/ViewModels/MenuViewModel.zig

@@ -14,7 +14,6 @@ pub const MenuViewModel = Shared.View.ViewModel.Create(
     struct {
         pub var selection = Selection.Start;
         pub var Rectangles: [std.enums.directEnumArrayLen(Selection, 0) - 1]raylib.Rectangle = undefined;
-        pub var offset_y: f32 = 0;
 
         pub inline fn GetSelectionText(select: Selection) [:0]const u8 {
             const locale = Shared.Locale.GetLocale().?;
@@ -35,14 +34,5 @@ pub const MenuViewModel = Shared.View.ViewModel.Create(
             }
         }
     },
-    .{
-        .Init = init,
-        .DeInit = deinit,
-    },
+    .{},
 );
-
-fn init() void {
-    MenuViewModel.GetVM().offset_y = 0;
-}
-
-fn deinit() void {}

src/Views/AsteroidsView.zig

@@ -61,6 +61,7 @@ fn DrawWithCamera() Shared.View.Views {
 }
 
 pub const AsteroidsView = Shared.View.View{
+    .Key = .Asteroids,
     .DrawRoutine = &DrawWithCamera,
     .VM = &AsteroidsViewModel,
 };

src/Views/DylanSplashScreenView.zig

@@ -12,7 +12,7 @@ fn DrawFunction() Shared.View.Views {
     raylib.clearBackground(Shared.Color.Tone.Dark);
 
     const text = Shared.Locale.GetLocale().?.Dylan_Splash_Text;
-    const font = Shared.Font.Get(.Unknown);
+    const font = Shared.Font.Get(.TwoLines);
     const screenWidth: f32 = @floatFromInt(raylib.getScreenWidth());
     const screenHeight: f32 = @floatFromInt(raylib.getScreenHeight());
     const fontSize: f32 = screenWidth / 25;
@@ -86,6 +86,7 @@ fn DrawFunction() Shared.View.Views {
 }
 
 pub const DylanSplashScreenView = Shared.View.View{
+    .Key = .Dylan_Splash_Screen,
     .DrawRoutine = DrawFunction,
     .VM = &DylanSplashScreenViewModel,
 };

src/Views/GameOverView.zig

@@ -102,6 +102,7 @@ pub fn DrawFunction() Shared.View.Views {
 }
 
 pub const GameOverView = Shared.View.View{
+    .Key = .Game_Over,
     .DrawRoutine = &DrawFunction,
     .VM = &GameOverViewModel,
 };

src/Views/MenuView.zig

@@ -18,16 +18,9 @@ pub fn DrawFunction() Shared.View.Views {
     const title = locale.Title;
     const screenWidth = raylib.getScreenWidth();
     const screenHeight = raylib.getScreenHeight();
-    const screenHeightF: f32 = @floatFromInt(screenHeight);
     const fontSize = @divFloor(screenWidth, 20);
     const startY = @divFloor(screenHeight, 4);
 
-    const scroll_speed: f32 = 20 * raylib.getFrameTime();
-    vm.offset_y += scroll_speed;
-    if (vm.offset_y > screenHeightF) {
-        vm.offset_y -= screenHeightF;
-    }
-
     const foregroundColor = Shared.Color.Blue.Base;
     const backgroundColor = Shared.Color.Blue.Light.alpha(0.75);
     const accentColor = Shared.Color.Blue.Dark;
@@ -157,6 +150,7 @@ inline fn GetSelection() Shared.View.Views {
 }
 
 pub const MenuView = Shared.View.View{
+    .Key = .Menu,
     .DrawRoutine = DrawFunction,
     .VM = &MenuViewModel,
 };

src/Views/PausedView.zig

@@ -164,6 +164,7 @@ inline fn GetSelection() Shared.View.Views {
 }
 
 pub const PausedView = Shared.View.View{
+    .Key = .Paused,
     .DrawRoutine = &DrawFunction,
     .VM = &PausedViewModel,
 };

src/Views/RaylibSplashScreenView.zig

@@ -240,6 +240,7 @@ pub const States = enum {
 };
 
 pub const RaylibSplashScreenView = View{
+    .Key = .Raylib_Splash_Screen,
     .DrawRoutine = DrawFunction,
     .VM = &SplashScreenViewModel,
 };

src/Views/SettingsView.zig

@@ -14,5 +14,6 @@ pub fn DrawFunction() Shared.View.Views {
 }
 
 pub const SettingsView = Shared.View.View{
+    .Key = .Settings,
     .DrawRoutine = &DrawFunction,
 };

src/Views/View.zig

@@ -4,21 +4,24 @@ const Views = @import("../ViewLocator.zig").Views;
 const Shared = @import("../Shared.zig").Shared;
 
 pub const View = struct {
+    Key: Views,
     DrawRoutine: *const fn () Views,
     VM: *const ViewModel = undefined,
 
-    // Initialize View Model if needed
-    var isInitialized = false;
+    var initializedViews: std.EnumSet(Views) = std.EnumSet(Views).initEmpty();
+
     pub inline fn init(self: View) void {
-        if (isInitialized == false and @intFromPtr(self.VM) != 0 and @intFromPtr(self.VM.*.Init) != 0) {
+        if (!initializedViews.contains(self.Key) and @intFromPtr(self.VM) != 0 and @intFromPtr(self.VM.*.Init) != 0) {
             self.VM.*.Init();
-            isInitialized = true;
+            initializedViews.insert(self.Key);
         }
     }
     pub inline fn deinit(self: View) void {
-        if (@intFromPtr(self.VM) != 0 and @intFromPtr(self.VM.*.DeInit) != 0 and (isInitialized == true or @intFromPtr(self.VM.*.Init) == 0)) {
+        if (@intFromPtr(self.VM) != 0 and @intFromPtr(self.VM.*.DeInit) != 0) {
             self.VM.*.DeInit();
-            isInitialized = false;
+        }
+        if (initializedViews.contains(self.Key) == true) {
+            initializedViews.remove(self.Key);
         }
     }
     pub inline fn shouldBypassDeinit(self: View) bool {