[Added] Services for assets and audio, main screen, simplified drawing, [Updated] Dockerfile, so the libraries get their own folder

src/screens/TitleScreen.cpp

@@ -1,48 +1,53 @@
 #include "TitleScreen.h"
 #include "AssetService.h"
 #include "StateService.h"
+#include "EFont.h"
+#include "AudioService.h"
 #include <iostream>
 
-TitleScreen::TitleScreen() {
-    assetDir = "assets";
-    font1 = LoadFontEx((assetDir+"/Fonts/Reckoner_Bold.ttf").c_str(), 100,0,0);
-    SetTextureFilter(font1.texture, TEXTURE_FILTER_BILINEAR);
-    font2 = LoadFont((assetDir+"/Fonts/Sansation.ttf").c_str());
-    SetTextureFilter(font2.texture, TEXTURE_FILTER_BILINEAR);
-    dimTitle = MeasureTextEx(font1, "Jelly rescue", 100,0);
-    dimSub = MeasureTextEx(font2, "Press Enter to continue", 30,0);
-    dimHead = MeasureTextEx(font2, "Made by Ian Vink", 20,0);
-    bg = LoadMusicStream((assetDir+"/Audio/Music/Crash_WarpRoomTheme.ogg").c_str());
-    bg.looping = true;
-    SetMasterVolume(1.0f);
-    SetMusicVolume(bg,1.0f);
-    PlayMusicStream(bg);
+TitleScreen::TitleScreen()
+{
+    Text textAbout = Text("Made by Ian Vink", EFont::SANSATION, 20,0, WHITE);
+    textAbout.setPosition({
+    (float)(GetScreenWidth()-textAbout.getDimensions().x)/1.2f, 
+    (float)(GetScreenHeight()-textAbout.getDimensions().y)/6.0f
+    });
+    Text textCenter = Text("Jelly rescue", EFont::RECKONER_BOLD, 100, 0, {255,25,25,255});
+    textCenter.setPosition({
+    (float)(GetScreenWidth()-textCenter.getDimensions().x)/2.0f, 
+    (float)(GetScreenHeight()-textCenter.getDimensions().y)/2.0f
+    });
+    Text testSub = Text("Press Enter", EFont::SANSATION, 30, 0, WHITE);
+    testSub.setPosition({
+    (float)(GetScreenWidth()-testSub.getDimensions().x)/2.0f, 
+    (float)(GetScreenHeight()-testSub.getDimensions().y)/1.5f
+    });
+
+    text.push_back(textAbout);
+    text.push_back(textCenter);
+    text.push_back(testSub);
+
+
+    AudioService::getInstance().setMusic(EMusic::MAIN);
+    AudioService::getInstance().playMusic();
+
+    // bg = LoadMusicStream("assets/Audio/Music/Crash_WarpRoomTheme.ogg");
+    // bg.looping = true;
+    // SetMasterVolume(1.0f);
+    // SetMusicVolume(bg, 1.0f);
+    // PlayMusicStream(bg);
 }
 
-TitleScreen::~TitleScreen() {
-    UnloadMusicStream(bg);
-    UnloadFont(font1);
-    UnloadFont(font2);
+TitleScreen::~TitleScreen()
+{
+    // UnloadMusicStream(bg);
 }
 
-void TitleScreen::step() {
-    draw();
-    logic();
-}
-
-void TitleScreen::logic() {
-    if(IsKeyPressed(KEY_ENTER)) {
-        StateService::getInstance().setScreen(ScreenState::MAIN);
+void TitleScreen::logic()
+{
+    if (IsKeyPressed(KEY_ENTER))
+    {
+        StateService::getInstance().setScreen(EScreen::MAIN);
         // std::cout << "Next screen!" << std::endl;
     }
-}
-
-void TitleScreen::draw() {
-        UpdateMusicStream(bg);
-        BeginDrawing();
-        ClearBackground(BLACK);                
-        DrawTextEx(font2,"Made by Ian Vink", {((float)GetScreenWidth()-dimHead.x)/1.2f, (float(GetScreenHeight()-dimHead.y)/6.0f)}, 20, 0, WHITE);
-        DrawTextEx(font1,"Jelly rescue", {((float)GetScreenWidth()-dimTitle.x)/2.0f, (float(GetScreenHeight()-dimTitle.y)/2.0f)}, 100,0, {255,25,25,255});
-        DrawTextEx(font2,"Press Enter to continue", {((float)GetScreenWidth()-dimSub.x)/2.0f, (float(GetScreenHeight()-dimSub.y)/1.5f)}, 30, 0, WHITE);
-        EndDrawing();
 }