Merge pull request #167 from pattakosn/win32

several minor fixes/improvements from trying to compile on linux
PanosK92 · Jan 30, 2025 · 62bf08b · 62bf08b
2 parents 6b9ee18 + 6acbc33
commit 62bf08b
Show file tree

Hide file tree

Showing 16 changed files with 77 additions and 85 deletions.
diff --git a/editor/Widgets/FileDialog.h b/editor/Widgets/FileDialog.h
@@ -25,6 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "IconLoader.h"
 #include "FileSystem/FileSystem.h"
 #include "../ImGui/ImGui_Extension.h"
+#include <chrono>
 //===================================
 
 enum FileDialog_Type

diff --git a/editor/main.cpp b/editor/main.cpp
@@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <vector>
 #include <string>
 
-#ifdef _MSC_VER // windows
+#ifdef _WIN32 // windows
 #include <Windows.h>
 #include <shellapi.h>
 

diff --git a/runtime/Audio/Audio.cpp b/runtime/Audio/Audio.cpp
@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "../World/Entity.h"
 #include "../Profiling/Profiler.h"
 SP_WARNINGS_OFF
-#if defined(_MSC_VER)
+#if defined(_WIN32)
 #include <fmod.hpp>
 #include <fmod_errors.h>
 #endif
@@ -35,7 +35,7 @@ SP_WARNINGS_ON
 
 //= NAMESPACES ======
 using namespace std;
-#if defined(_MSC_VER)
+#if defined(_WIN32)
 using namespace FMOD;
 #endif
 //===================
@@ -44,7 +44,7 @@ namespace spartan
 {
     namespace
     { 
-        #if defined(_MSC_VER)
+        #if defined(_WIN32)
         FMOD::System* fmod_system  = nullptr;
         uint32_t fmod_result       = 0;
         uint32_t fmod_max_channels = 32;
@@ -55,7 +55,7 @@ namespace spartan
 
     void Audio::Initialize()
     {
-        #if defined(_MSC_VER)
+        #if defined(_WIN32)
         // Create FMOD instance
         if (!HandleErrorFmod(System_Create(&fmod_system)))
             return;
@@ -96,7 +96,7 @@ namespace spartan
 
     void Audio::Shutdown()
     {
-        #if defined(_MSC_VER)
+        #if defined(_WIN32)
         if (!fmod_system)
             return;
 
@@ -107,7 +107,7 @@ namespace spartan
 
     void Audio::Tick()
     {
-        #if defined(_MSC_VER)
+        #if defined(_WIN32)
         // Don't play audio if the engine is not in game mode
         if (!Engine::IsFlagSet(EngineMode::Playing))
             return;
@@ -138,14 +138,14 @@ namespace spartan
 
     void Audio::SetListenerEntity(Entity* entity)
     {
-        #if defined(_MSC_VER)
+        #if defined(_WIN32)
         m_listener = entity;
         #endif
     }
 
     bool Audio::HandleErrorFmod(int result)
     {
-        #if defined(_MSC_VER)
+        #if defined(_WIN32)
         if (result != FMOD_OK)
         {
             SP_LOG_ERROR("%s", FMOD_ErrorString(static_cast<FMOD_RESULT>(result)));
@@ -158,7 +158,7 @@ namespace spartan
 
     bool Audio::CreateSound(const string& file_path, int sound_mode, void*& sound)
     {
-        #if defined(_MSC_VER)
+        #if defined(_WIN32)
         return Audio::HandleErrorFmod(fmod_system->createSound(file_path.c_str(), sound_mode, nullptr, reinterpret_cast<FMOD::Sound**>(&sound)));
         #else
         return true;
@@ -167,7 +167,7 @@ namespace spartan
 
     bool Audio::CreateStream(const string& file_path, int sound_mode, void*& sound)
     {
-        #if defined(_MSC_VER)
+        #if defined(_WIN32)
         return Audio::HandleErrorFmod(fmod_system->createStream(file_path.c_str(), sound_mode, nullptr, reinterpret_cast<FMOD::Sound**>(&sound)));
         #else
         return true;
@@ -178,7 +178,7 @@ namespace spartan
     {
         if (MUTE == 0)
         {
-            #if defined(_MSC_VER)
+            #if defined(_WIN32)
             return Audio::HandleErrorFmod(fmod_system->playSound(static_cast<FMOD::Sound*>(sound), nullptr, false, reinterpret_cast<FMOD::Channel**>(&channel)));
             #else
             return false;

diff --git a/runtime/Audio/AudioClip.cpp b/runtime/Audio/AudioClip.cpp
@@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "Audio.h"
 #include "../IO/FileStream.h"
 #include "../World/Entity.h"
-#if defined(_MSC_VER)
+#if defined(_WIN32)
 #include <fmod.hpp>
 #endif
 //===========================
@@ -37,7 +37,7 @@ using namespace spartan::math;
 
 namespace spartan
 {
-#if defined(_MSC_VER)
+#if defined(_WIN32)
     namespace
     {
         FMOD_RESULT F_CALLBACK channel_callback(FMOD_CHANNELCONTROL* channelcontrol, FMOD_CHANNELCONTROL_TYPE controlType, FMOD_CHANNELCONTROL_CALLBACK_TYPE callbackType, void* commandData1, void* commandData2)
@@ -84,20 +84,17 @@ namespace spartan
 
     AudioClip::~AudioClip()
     {
-        #if defined(_MSC_VER)
-
+        #if defined(_WIN32)
         if (FMOD::Sound* sound = static_cast<FMOD::Sound*>(m_fmod_sound))
         {
             Audio::HandleErrorFmod(sound->release());
         }
-
         #endif
     }
 
     void AudioClip::LoadFromFile(const string& file_path)
     {
-        #if defined(_MSC_VER)
-
+        #if defined(_WIN32)
         // native
         if (FileSystem::GetExtensionFromFilePath(file_path) == EXTENSION_AUDIO)
         {
@@ -118,29 +115,25 @@ namespace spartan
         // load
         (m_playMode == PlayMode::Memory) ? CreateSound(GetResourceFilePath()) : CreateStream(GetResourceFilePath());
         m_object_size = estimate_memory_usage(static_cast<FMOD::Sound*>(m_fmod_sound));
-
         #endif
     }
 
     void AudioClip::SaveToFile(const string& file_path)
     {
-        #if defined(_MSC_VER)
-
+        #if defined(_WIN32)
         auto file = make_unique<FileStream>(file_path, FileStream_Write);
         if (!file->IsOpen())
             return;
 
         file->Write(GetResourceFilePath());
 
         file->Close();
-
         #endif
     }
 
     void AudioClip::Play(const bool loop, const bool is_3d)
     {
-        #if defined(_MSC_VER)
-
+        #if defined(_WIN32)
         if (IsPlaying())
             return;
 
@@ -155,28 +148,25 @@ namespace spartan
 
         SetLoop(loop);
         Set3d(is_3d);
-
         #endif
     }
 
     void AudioClip::Pause()
     {
-        #if defined(_MSC_VER)
-
+        #if defined(_WIN32)
         if (!IsPaused())
             return;
 
         if (FMOD::Channel* channel = static_cast<FMOD::Channel*>(m_fmod_channel))
         {
             Audio::HandleErrorFmod(static_cast<FMOD::Channel*>(m_fmod_channel)->setPaused(true));
         }
-
         #endif
     }
 
     void AudioClip::Stop()
     {
-        #if defined(_MSC_VER)
+        #if defined(_WIN32)
         if (!IsPlaying())
             return;
 
@@ -189,7 +179,7 @@ namespace spartan
 
     bool AudioClip::GetLoop() const
     {
-        #if defined(_MSC_VER)
+        #if defined(_WIN32)
         if (FMOD::Channel* channel = static_cast<FMOD::Channel*>(m_fmod_channel))
         {
             FMOD_MODE current_mode;
@@ -204,7 +194,7 @@ namespace spartan
 
     void AudioClip::SetLoop(const bool loop)
     {
-        #if defined(_MSC_VER)
+        #if defined(_WIN32)
         if (FMOD::Channel* channel = static_cast<FMOD::Channel*>(m_fmod_channel))
         {
             FMOD_MODE current_mode;
@@ -229,7 +219,7 @@ namespace spartan
 
     bool AudioClip::SetVolume(float volume)
     {
-        #if defined(_MSC_VER)
+        #if defined(_WIN32)
         if (FMOD::Channel* channel = static_cast<FMOD::Channel*>(m_fmod_channel))
         {
             return Audio::HandleErrorFmod(static_cast<FMOD::Channel*>(m_fmod_channel)->setVolume(volume));
@@ -241,7 +231,7 @@ namespace spartan
 
     bool AudioClip::SetMute(const bool mute)
     {
-        #if defined(_MSC_VER)
+        #if defined(_WIN32)
         if (FMOD::Channel* channel = static_cast<FMOD::Channel*>(m_fmod_channel))
         {
             return Audio::HandleErrorFmod(static_cast<FMOD::Channel*>(m_fmod_channel)->setMute(mute));
@@ -253,7 +243,7 @@ namespace spartan
 
     bool AudioClip::SetPriority(const int priority)
     {
-        #if defined(_MSC_VER)
+        #if defined(_WIN32)
         if (FMOD::Channel* channel = static_cast<FMOD::Channel*>(m_fmod_channel))
         {
             return Audio::HandleErrorFmod(static_cast<FMOD::Channel*>(m_fmod_channel)->setPriority(priority));
@@ -265,7 +255,7 @@ namespace spartan
 
     bool AudioClip::SetPitch(const float pitch)
     {
-        #if defined(_MSC_VER)
+        #if defined(_WIN32)
         if (FMOD::Channel* channel = static_cast<FMOD::Channel*>(m_fmod_channel))
         {
             return Audio::HandleErrorFmod(static_cast<FMOD::Channel*>(m_fmod_channel)->setPitch(pitch));
@@ -277,7 +267,7 @@ namespace spartan
 
     bool AudioClip::SetPan(const float pan)
     {
-        #if defined(_MSC_VER)
+        #if defined(_WIN32)
         if (FMOD::Channel* channel = static_cast<FMOD::Channel*>(m_fmod_channel))
         {
             return Audio::HandleErrorFmod(channel->setPan(pan));
@@ -289,7 +279,7 @@ namespace spartan
 
     void AudioClip::Set3d(const bool enabled)
     {
-        #if defined(_MSC_VER)
+        #if defined(_WIN32)
         if (FMOD::Channel* channel = static_cast<FMOD::Channel*>(m_fmod_channel))
         {
             channel->setMode(enabled ? FMOD_3D : FMOD_2D);
@@ -299,7 +289,7 @@ namespace spartan
 
     bool AudioClip::Get3d() const
     {
-        #if defined(_MSC_VER)
+        #if defined(_WIN32)
         if (FMOD::Channel* channel = static_cast<FMOD::Channel*>(m_fmod_channel))
         {
             FMOD_MODE current_mode;
@@ -316,7 +306,7 @@ namespace spartan
 
     bool AudioClip::Update()
     {
-        #if defined(_MSC_VER)
+        #if defined(_WIN32)
         if (!m_entity)
             return true;
 
@@ -335,7 +325,7 @@ namespace spartan
     {
         bool is_playing = false;
 
-        #if defined(_MSC_VER)
+        #if defined(_WIN32)
         if (FMOD::Channel* channel = static_cast<FMOD::Channel*>(m_fmod_channel))
         {
             Audio::HandleErrorFmod(channel->isPlaying(&is_playing));
@@ -349,7 +339,7 @@ namespace spartan
     {
         bool is_paused = false;
 
-        #if defined(_MSC_VER)
+        #if defined(_WIN32)
         if (FMOD::Channel* channel = static_cast<FMOD::Channel*>(m_fmod_channel))
         {
             Audio::HandleErrorFmod(channel->getPaused(&is_paused));
@@ -361,8 +351,7 @@ namespace spartan
 
     float AudioClip::GetProgress()
     {
-        #if defined(_MSC_VER)
-
+        #if defined(_WIN32)
         if (FMOD::Channel* channel = static_cast<FMOD::Channel*>(m_fmod_channel))
         {
             // Get total sound length
@@ -388,7 +377,7 @@ namespace spartan
 
     bool AudioClip::CreateSound(const string& file_path)
     {
-        #if defined(_MSC_VER)
+        #if defined(_WIN32)
         // Create sound
         if (!Audio::CreateSound(file_path, GetSoundMode(), m_fmod_sound))
             return false;
@@ -403,7 +392,7 @@ namespace spartan
 
     bool AudioClip::CreateStream(const string& file_path)
     {
-        #if defined(_MSC_VER)
+        #if defined(_WIN32)
         // Create sound
         if (!Audio::CreateStream(file_path, GetSoundMode(), m_fmod_sound))
             return false;
@@ -419,11 +408,10 @@ namespace spartan
     int AudioClip::GetSoundMode() const
     {
         unsigned int sound_mode  = 0;
-        #if defined(_MSC_VER)
+        #if defined(_WIN32)
         sound_mode              |= FMOD_2D;
         sound_mode              |= FMOD_3D_LINEARROLLOFF;
         sound_mode              |= FMOD_LOOP_OFF;
-
         #endif
         return sound_mode;
     }

diff --git a/runtime/Core/Definitions.cpp b/runtime/Core/Definitions.cpp
@@ -43,7 +43,7 @@ namespace spartan
         static std::string callstack_str;
         std::stringstream callstack;
 
-#ifdef _MSC_VER
+#ifdef _WIN32
         HANDLE process = GetCurrentProcess();
         HANDLE thread = GetCurrentThread();
 

diff --git a/runtime/Core/Definitions.h b/runtime/Core/Definitions.h
@@ -80,7 +80,7 @@ struct sp_info
 #define WIDE_STR_HELPER(x) L ## x
 #define WIDE_STR(x) WIDE_STR_HELPER(x)
 
-#if defined(_MSC_VER)
+#if defined(_WIN32)
     #define SP_WARNING_WINDOW(text_message)                                                  \
     {                                                                                        \
         MessageBeep(MB_ICONWARNING);                                                         \
@@ -98,7 +98,7 @@ struct sp_info
 //================================================================================
 
 //= ERROR WINDOW =================================================================
-#if defined(_MSC_VER)
+#if defined(_WIN32)
     #define SP_ERROR_WINDOW(text_message)                                                \
     {                                                                                    \
         MessageBeep(MB_ICONERROR);                                                       \