Fix paths

marwan995 · May 14, 2024 · 1bbfc67 · 1bbfc67
1 parent d062c58
commit 1bbfc67
Show file tree

Hide file tree

Showing 21 changed files with 8 additions and 45,743 deletions.
diff --git a/source/audio/Laser.wav → assets/audio/Laser.wav b/source/audio/Laser.wav → assets/audio/Laser.wav
diff --git a/source/audio/Play Theme.wav → assets/audio/Play Theme.wav b/source/audio/Play Theme.wav → assets/audio/Play Theme.wav
diff --git a/source/audio/Rocket Explosion.wav → assets/audio/Rocket Explosion.wav b/source/audio/Rocket Explosion.wav → assets/audio/Rocket Explosion.wav
diff --git a/source/audio/Rocket Launch.wav → assets/audio/Rocket Launch.wav b/source/audio/Rocket Launch.wav → assets/audio/Rocket Launch.wav
diff --git a/source/audio/Shotgun.wav → assets/audio/Shotgun.wav b/source/audio/Shotgun.wav → assets/audio/Shotgun.wav
diff --git a/source/audio/cut.wav → assets/audio/cut.wav b/source/audio/cut.wav → assets/audio/cut.wav
diff --git a/x/source/DARK SSD.png → assets/textures/DARK SSD.png b/x/source/DARK SSD.png → assets/textures/DARK SSD.png
diff --git a/x/source/DATA HALL.png → assets/textures/DATA HALL.png b/x/source/DATA HALL.png → assets/textures/DATA HALL.png
diff --git a/x/source/GPU BOOSTER.png → assets/textures/GPU BOOSTER.png b/x/source/GPU BOOSTER.png → assets/textures/GPU BOOSTER.png
diff --git a/x/source/JUSTICE CPU.png → assets/textures/JUSTICE CPU.png b/x/source/JUSTICE CPU.png → assets/textures/JUSTICE CPU.png
diff --git a/x/source/MOTHER OF BOARDS.png → assets/textures/MOTHER OF BOARDS.png b/x/source/MOTHER OF BOARDS.png → assets/textures/MOTHER OF BOARDS.png
diff --git a/x/source/RAM ROOM.png → assets/textures/RAM ROOM.png b/x/source/RAM ROOM.png → assets/textures/RAM ROOM.png
diff --git a/x/source/start.png → assets/textures/START.png b/x/source/start.png → assets/textures/START.png
diff --git a/source/audio/audio.cpp b/source/audio/audio.cpp
@@ -16,7 +16,7 @@ void our::Audio::play(std::string audio_file){
     std::thread audioThread([this, audio_file]() {
 
         // Get the full path of the audio file
-        std::filesystem::path audioPath = std::filesystem::current_path().append("source").append("audio").append(audio_file).string();
+        std::filesystem::path audioPath = std::filesystem::current_path().append("assets").append("audio").append(audio_file).string();
         std::string audioName = audioPath.string();
         // Play the audio file
         ma_engine_play_sound(&engine, audioName.c_str(), NULL);

diff --git a/source/common/application.cpp b/source/common/application.cpp
@@ -288,7 +288,7 @@ int our::Application::run(int run_for_frames)
         ImGui_ImplOpenGL3_NewFrame();
         ImGui_ImplGlfw_NewFrame();
         ImGui::NewFrame();
-        if (currentState == states["play"] && alpha > 0&&lastRoam!=currentRoam)
+        if (currentState == states["play"] && alpha > 0 && lastRoam != currentRoam)
         {
             // Calculate fading alpha value based on time or other conditions
             alpha -= (.25 * (current_frame_time - last_frame_time));
@@ -305,22 +305,21 @@ int our::Application::run(int run_for_frames)
             ImGui::SetNextWindowPos(imagePos);
             ImGui::SetNextWindowSize(imageSize);
             ImGui::Begin("ImageWindow", nullptr, ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoBackground | ImGuiWindowFlags_NoScrollbar);
-        
-            std::filesystem::path roomPath = std::filesystem::current_path().append("x").append("source").append(currentRoam+".png").string();
+
+            std::filesystem::path roomPath = std::filesystem::current_path().append("assets").append("textures").append(currentRoam + ".png").string();
             // Display image
-            ImGui::Image((ImTextureID)our::texture_utils::loadImage(roomPath.string(), true)->getOpenGLName(),
-            imageSize,ImVec2(0, 0), ImVec2(1, 1),imageColor);
+            ImGui::Image(reinterpret_cast<ImTextureID>(our::texture_utils::loadImage(roomPath.string(), true)->getOpenGLName()), imageSize, ImVec2(0, 0), ImVec2(1, 1), imageColor);
 
             // End ImGui window
             ImGui::End();
-            if(alpha<=0){
+            if (alpha <= 0)
+            {
                 lastRoam = currentRoam;
-                alpha=0.5f;
+                alpha = 0.5f;
             }
         }
         if (currentState)
             currentState->onImmediateGui(); // Call to run any required Immediate GUI.
-        //! look here MARWAAANNNN
         // If ImGui is using the mouse or keyboard, then we don't want the captured events to affect our keyboard and mouse objects.
         // For example, if you're focusing on an input and writing "W", the keyboard object shouldn't record this event.
         // keyboard.setEnabled(!io.WantCaptureKeyboard, window);

diff --git a/x/Explosion/Star Wars.mtl b/x/Explosion/Star Wars.mtl