diff --git a/application/globalVars.go b/application/globalVars.go index 7d6b893..cc0df8c 100644 --- a/application/globalVars.go +++ b/application/globalVars.go @@ -8,11 +8,17 @@ const ( ) const ( - SceneTitle = iota + ScenePlayerData = iota + SceneTitle SceneOptions SceneGame ) -var CurrentScene = SceneTitle +const ( + DirAssets = "./assets/" + DirPlayerData = "./playerData/" +) + +var CurrentScene = ScenePlayerData var ShouldQuit = false diff --git a/assets/Map.png b/assets/Map.png new file mode 100644 index 0000000..f0d4db6 Binary files /dev/null and b/assets/Map.png differ diff --git a/main.go b/main.go index 25a1b4a..1bd73f3 100644 --- a/main.go +++ b/main.go @@ -16,6 +16,8 @@ func main() { // MAIN LOOP for !application.ShouldQuit { switch application.CurrentScene { + case application.ScenePlayerData: + scenes.PlayerData() case application.SceneTitle: scenes.Title() case application.SceneOptions: diff --git a/scenes/options.go b/scenes/options.go index 7b8fbf5..1f73205 100644 --- a/scenes/options.go +++ b/scenes/options.go @@ -3,6 +3,7 @@ package scenes import ( "ColouringApp/application" "fmt" + gui "github.com/gen2brain/raylib-go/raygui" raylib "github.com/gen2brain/raylib-go/raylib" ) diff --git a/scenes/playerData.go b/scenes/playerData.go new file mode 100644 index 0000000..e903158 --- /dev/null +++ b/scenes/playerData.go @@ -0,0 +1,29 @@ +package scenes + +import ( + "ColouringApp/application" + "time" + + raylib "github.com/gen2brain/raylib-go/raylib" +) + +func PlayerData() { + // Load player data here + for !application.ShouldQuit { + application.ShouldQuit = raylib.WindowShouldClose() + if application.CurrentScene != application.ScenePlayerData { + break + } + + raylib.BeginDrawing() + raylib.ClearBackground(raylib.Black) + + raylib.DrawText("Loading...", 10, application.WindowHeight-30, 20, raylib.White) + + raylib.EndDrawing() + + // Just a placeholder + time.Sleep(1 * time.Second) + application.CurrentScene = application.SceneTitle + } +} diff --git a/scenes/title.go b/scenes/title.go index 5239c2b..6f5805e 100644 --- a/scenes/title.go +++ b/scenes/title.go @@ -9,10 +9,12 @@ import ( func Title() { var ( - titleText = "Example Game" - ) + titleText = application.WindowTitle + mapImage = raylib.LoadTexture(application.DirAssets + "Map.png") - // load resources here + mapX = 0 + mapY = 0 + ) for !application.ShouldQuit { application.ShouldQuit = raylib.WindowShouldClose() @@ -36,8 +38,26 @@ func Title() { application.ShouldQuit = true } + // Map thing? + raylib.DrawRectangleLines(120, 39, application.WindowWidth-130, application.WindowHeight-49, raylib.White) + raylib.BeginScissorMode(121, 40, application.WindowWidth-132, application.WindowHeight-51) + + mapX += 1 + mapX = 0 + mapY = 0 + if mapX > 1920 { + mapX = 0 + } + + mapY += 1 + if mapY > 1080 { + mapY = 0 + } + raylib.DrawTexture(mapImage, int32(-mapX), int32(-mapY), raylib.White) + + raylib.EndScissorMode() raylib.EndDrawing() } - // unload resources here + raylib.UnloadTexture(mapImage) }