Merge branch 'main' into scenetransitions

Assets/Editor/Editor.SHConfig

@@ -1,4 +0,0 @@
-Start Maximized: true
-Working Scene ID: 97158628
-Window Size: {x: 1920, y: 1013}
-Style: 0

SHADE_Engine/src/AudioSystem/SHAudioSystem.cpp

@@ -16,6 +16,7 @@
 #include <FMOD/fmod.hpp>
 #include <FMOD/fmod_studio.hpp>
 #include <SDL_keyboard.h>
+#include "Camera/SHCameraSystem.h"
 
 const std::string AUDIO_FOLDER_PATH{ std::string(ASSET_ROOT)+ "/Audio/" };
 
@@ -53,8 +54,9 @@ namespace SHADE
 
     denseListener = &SHComponentManager::GetDense<SHAudioListenerComponent>();
     fmodStudioSystem->getCoreSystem(&fmodSystem);
+    fmodSystem->setSoftwareFormat(0, FMOD_SPEAKERMODE_5POINT1, 0);
+    result = fmodStudioSystem->initialize(AUDIO_SYS_MAX_CHANNELS, AUDIO_SYS_MAX_CHANNELS, FMOD_STUDIO_INIT_NORMAL | FMOD_INIT_NORMAL, extraDriverData);
     
-    result = fmodStudioSystem->initialize(AUDIO_SYS_MAX_CHANNELS, AUDIO_SYS_MAX_CHANNELS, FMOD_STUDIO_INIT_NORMAL, extraDriverData);
     ErrorCheck();
 
     fmodSystem->setSoftwareFormat(0, speakerMode, 0);
@@ -83,17 +85,10 @@ namespace SHADE
 
     LoadBank((AUDIO_FOLDER_PATH + "Master.bank").data());
     LoadBank((AUDIO_FOLDER_PATH + "Master.strings.bank").data());
-    //LoadBank((AUDIO_FOLDER_PATH + "Music.bank").data());
-    //LoadBank((AUDIO_FOLDER_PATH + "footsteps.bank").data());
     LoadBank((AUDIO_FOLDER_PATH + "Music.bank").data());
     LoadBank((AUDIO_FOLDER_PATH + "SFX.bank").data());
     LoadBank((AUDIO_FOLDER_PATH + "UI.bank").data());
 
-    //auto clip = CreateAudioClip("event:/Characters/sfx_footsteps_human");
-    //clip->Play();
-    //PlayEventOnce("event:/Characters/sfx_footsteps_raccoon");
-    //PlayEventOnce("event:/SFX/Dawn/Dawn_Attack");
-
   #ifdef SHEDITOR
 
     // Subscribe to Editor State Change Events
@@ -115,35 +110,65 @@ namespace SHADE
   void SHADE::SHAudioSystem::Run(double dt)
   {
     static_cast<void>(dt); 
-    //if (GetKeyState(VK_SPACE) & 0x8000)
-    //  PlayEventOnce("event:/Characters/sfx_footsteps_raccoon");
 
     fmodStudioSystem->update();
-    if (!denseListener->empty())
+    //int listenerID = 0;
+    //for(auto& listener : *denseListener)
+    //{
+    //  if(!listener.isActive)
+    //    continue;
+    //  //SHAudioListenerComponent& listener = denseListener->at(0); //Loop through dense
+    //  SHTransformComponent* listenerTransform = SHComponentManager::GetComponent_s<SHTransformComponent>(listener.GetEID());
+    //  if (listenerTransform)
+    //  {
+    //    listener.SetPos(listenerTransform->GetWorldPosition()); 
+    //    SHQuaternion worldOrientation = listenerTransform->GetWorldOrientation();
+    //    SHVec3 orientatedFoward = (worldOrientation * SHQuaternion::FromEuler(SHVec3::Forward) * SHQuaternion::Conjugate(worldOrientation)).ToEuler();
+    //    SHVec3 orientatedUp = (worldOrientation * SHQuaternion::FromEuler(SHVec3::Up) * SHQuaternion::Conjugate(worldOrientation)).ToEuler();
+    //    listener.SetForward(orientatedFoward);
+    //    listener.SetUp(orientatedUp);
+
+    //    FMOD_3D_ATTRIBUTES attribs{ { 0 } };
+    //    attribs.position = { listener.pos.x, listener.pos.y, listener.pos.z };
+    //    attribs.forward = { orientatedFoward.x, orientatedFoward.y, orientatedFoward.z };
+    //    attribs.up = { orientatedUp.x, orientatedUp.y, orientatedUp.z };
+    //    
+    //    fmodStudioSystem->setListenerAttributes(listenerID++, &attribs);
+    //  }
+    //}
+
+    if(auto camSystem = SHSystemManager::GetSystem<SHCameraSystem>())
     {
-      SHAudioListenerComponent& listener = denseListener->at(0);
+      auto mainCamEID = camSystem->GetMainCameraEID();
-      SHTransformComponent* listenerTransform = SHComponentManager::GetComponent_s<SHTransformComponent>(listener.GetEID());
+      if(auto camComponent = SHComponentManager::GetComponent_s<SHCameraComponent>(mainCamEID))
-      if (listenerTransform)
       {
-        listener.SetPos(listenerTransform->GetWorldPosition()); // TODO: Clean up listener
+        FMOD_3D_ATTRIBUTES attribs{ { 0 } };
-        listener.SetForward({ (listenerTransform->GetLocalScale()[0] > 0.f) ? 1.f : -1.f, 0.f, 0.f }); //TODO: USE CORRECT FORWARD
+        SHVec3 pos = camComponent->GetPosition();
-        FMOD_VECTOR pos = { listener.pos[0] ,listener.pos[1] ,0.f };
+        SHVec3 forward, up, right;
-        FMOD_VECTOR forward = { listener.forward[0] ,listener.forward[1] ,listener.forward[2] };
+        camSystem->GetCameraAxis(*camComponent, forward, right, up);
-        FMOD_VECTOR up = { listener.up[0] ,listener.up[1] ,listener.up[2] };
+        attribs.position = { pos.x, pos.y, pos.z };
-        fmodSystem->set3DListenerAttributes(0, &pos, nullptr, &forward, &up);
+        attribs.forward = { forward.x, forward.y, forward.z };
+        attribs.up = { up.x, up.y, up.z };
+        fmodStudioSystem->setListenerAttributes(0, &attribs);
       }
     }
     
     auto [begin, end] = audioClipLibrary.GetDenseAccess();
-    for(auto it = begin; it != end; ++it)
+    for (auto& it = begin; it != end; ++it)
     {
       if(it->instance && (it->transformRef != MAX_EID))
       {
         if(SHTransformComponent* transformComponent = SHComponentManager::GetComponent_s<SHTransformComponent>(it->transformRef))
         {
-          FMOD_3D_ATTRIBUTES attribs{}; //TODO: Set other attribs
+          FMOD_3D_ATTRIBUTES attribs{ { 0 } };
           auto pos = transformComponent->GetWorldPosition();
+          SHQuaternion worldOrientation = transformComponent->GetWorldOrientation();
+          SHVec3 orientatedFoward = (worldOrientation * SHQuaternion::FromEuler(SHVec3::Forward) * SHQuaternion::Conjugate(worldOrientation)).ToEuler();
+          SHVec3 orientatedUp = (worldOrientation * SHQuaternion::FromEuler(SHVec3::Up) * SHQuaternion::Conjugate(worldOrientation)).ToEuler();
+
           attribs.position = {pos.x, pos.y, pos.z};
+          attribs.forward = {orientatedFoward.x, orientatedFoward.y, orientatedFoward.z};
+          attribs.up = {orientatedUp.x, orientatedUp.y, orientatedUp.z};
           it->instance->set3DAttributes(&attribs);
         }
       }

SHADE_Engine/src/Common/SHAllComponents.h

@@ -13,3 +13,4 @@
 #include "Graphics/MiddleEnd/Interface/SHRenderable.h"
 #include "Physics/Interface/SHColliderComponent.h"
 #include "Graphics/MiddleEnd/TextRendering/SHTextRenderableComponent.h"
+#include "AudioSystem/SHAudioListenerComponent.h"

SHADE_Engine/src/Editor/EditorWindow/AssetBrowser/SHAssetBrowser.cpp

@@ -254,7 +254,7 @@ namespace SHADE
     return ImRect(ImGui::GetItemRectMin(), ImGui::GetItemRectMax());
   }
 
-  ImRect SHAssetBrowser::DrawAsset(SHAsset const* const asset, FileExt const& ext /*= ""*/) noexcept
+  ImRect SHAssetBrowser::DrawAsset(SHAsset const* const asset, FileExt const& ext /*= ""*/, bool isSubAsset /*= false*/) noexcept
   {
     if (asset == nullptr)
       return ImRect(ImGui::GetItemRectMin(), ImGui::GetItemRectMax());
@@ -267,10 +267,20 @@ namespace SHADE
     bool highlighted = false;
     if(!filter.empty())
     {
-      ImGui::SetNextItemOpen(true);
+      //ImGui::SetNextItemOpen(true);
       if(SHStringUtilities::StringFindInsensitive(asset->name.data(), filter) == std::string::npos)
       {
-        return ImRect(ImGui::GetItemRectMin(), ImGui::GetItemRectMax());
+        bool subAssetFiltered = false;
+        for (auto const& subAsset : asset->subAssets)
+        {
+          subAssetFiltered |= (SHStringUtilities::StringFindInsensitive(subAsset->name.data(), filter) != std::string::npos);
+        }
+        if(!subAssetFiltered)
+          return ImRect(ImGui::GetItemRectMin(), ImGui::GetItemRectMax());
+        else if(!asset->subAssets.empty())
+        {
+          ImGui::SetNextItemOpen(true);
+        }
       }
       else 
       {
@@ -350,7 +360,12 @@ namespace SHADE
       case AssetType::TEXTURE:  break;
       case AssetType::MESH:  break;
       case AssetType::SCENE:
-          editor->LoadScene(asset->id);
+      {
+          if(editor->LoadScene(asset->id))
+          {
+            editor->editorConfig->workingSceneID = asset->id;
+          }
+      }
         break;
       case AssetType::PREFAB:  break;
       case AssetType::MATERIAL:
@@ -418,7 +433,7 @@ namespace SHADE
       for(auto const& subAsset : asset->subAssets)
       {
         const float horizontalLineSize = 25.0f;
-        const ImRect childRect = DrawAsset(subAsset);
+        const ImRect childRect = DrawAsset(subAsset, "", true);
         const float midPoint = (childRect.Min.y + childRect.Max.y) * 0.5f;
         drawList->AddLine(ImVec2(vertLineStart.x, midPoint), ImVec2(vertLineStart.x + horizontalLineSize, midPoint), treeLineColor, 1);
         vertLineEnd.y = midPoint;

SHADE_Engine/src/Editor/EditorWindow/AssetBrowser/SHAssetBrowser.h

@@ -24,7 +24,7 @@ namespace SHADE
     ImRect RecursivelyDrawTree(FolderPointer folder);
     void DrawCurrentFolder();
     ImRect DrawFile(SHFile& file) noexcept;
-    ImRect DrawAsset(SHAsset const* const asset, FileExt const& ext = "") noexcept;
+    ImRect DrawAsset(SHAsset const* const asset, FileExt const& ext = "", bool isSubAsset = false) noexcept;
     void DrawAssetBeingCreated() noexcept;
     void DrawAssetBrowserFilter();
 

SHADE_Engine/src/Editor/EditorWindow/HierarchyPanel/SHHierarchyPanel.cpp

@@ -29,6 +29,8 @@
 #include "Serialization/Prefab/SHPrefabManager.h"
 #include "../SHEditorWindowManager.h"
 #include "../AssetBrowser/SHAssetBrowser.h"
+#include "Assets/SHAssetManager.h"
+#include "Assets/Asset Types/SHPrefabAsset.h"
 
 
 namespace SHADE
@@ -99,7 +101,7 @@ namespace SHADE
       }
       ImGui::SeparatorEx(ImGuiSeparatorFlags_Horizontal);
 
-      if (!ImGui::IsAnyItemFocused())
+      if (!ImGui::IsAnyItemActive())
       {
         if (ImGui::IsKeyDown(ImGuiKey_LeftCtrl) && ImGui::IsKeyReleased(ImGuiKey_A))
         {
@@ -136,6 +138,23 @@ namespace SHADE
           draggingEntities.clear();
           ImGui::ClearDragDrop();
         }
+        //else if(SHDragDrop::currentDragDropTag == SHDragDrop::DRAG_RESOURCE)
+        //{
+        //  if (const AssetID* assetPayload = SHDragDrop::AcceptPayload<AssetID>(SHDragDrop::DRAG_RESOURCE)) //If payload is valid
+        //  {
+        //    auto assetId = *assetPayload;
+        //    auto createdEntitiesList = SHSerialization::DeserializeEntitiesFromString(SHAssetManager::GetData<SHPrefabAsset>(assetId)->data);
+        //    if (!createdEntitiesList.empty())
+        //    {
+        //      std::vector<EntityID> eidList;
+        //      std::ranges::transform(createdEntitiesList, std::back_inserter(eidList), [](std::pair<EntityID, EntityID> pair) {return pair.second; });
+        //      ParentSelectedEntities(eid, eidList);
+        //      SetScrollTo(createdEntitiesList.begin()->second);
+        //      SHPrefabManager::AddEntity(assetId, createdEntitiesList.begin()->second);
+        //      skipFrame = true;
+        //    }
+        //  }
+        //}
       }
     }
     ImGui::End();
@@ -359,6 +378,20 @@ namespace SHADE
         draggingEntities.clear();
         //ImGui::ClearDragDrop();
       }
+      if (const AssetID* assetPayload = SHDragDrop::AcceptPayload<AssetID>(SHDragDrop::DRAG_RESOURCE)) //If payload is valid
+      {
+        auto assetId = *assetPayload;
+        auto createdEntitiesList = SHSerialization::DeserializeEntitiesFromString(SHAssetManager::GetData<SHPrefabAsset>(assetId)->data);
+        if(!createdEntitiesList.empty())
+        {
+          std::vector<EntityID> eidList;
+          std::ranges::transform(createdEntitiesList, std::back_inserter(eidList), [](std::pair<EntityID, EntityID> pair){return pair.second;} );
+          ParentSelectedEntities(eid, eidList);
+          SetScrollTo(createdEntitiesList.begin()->second);
+          SHPrefabManager::AddEntity(assetId, createdEntitiesList.begin()->second);
+          skipFrame = true;
+        }
+      }
       SHDragDrop::EndTarget();
     }
 

SHADE_Engine/src/Editor/EditorWindow/HierarchyPanel/SHHierarchyPanelCommands.cpp

@@ -49,7 +49,8 @@ namespace SHADE
     data.createdEntities.clear();
     data.createdEntities = SHSerialization::DeserializeEntitiesFromString(data.entityData, data.parentEID);
     data.entityData = SHSerialization::ResolveSerializedEntityIndices(data.entityData, data.createdEntities);
-    SHEditorWindowManager::GetEditorWindow<SHHierarchyPanel>()->SetScrollTo(data.createdEntities.begin()->second);
+    if(!data.createdEntities.empty())
+      SHEditorWindowManager::GetEditorWindow<SHHierarchyPanel>()->SetScrollTo(data.createdEntities.begin()->second);
   }
 
   void SHPasteEntitiesCommand::Undo()

SHADE_Engine/src/Editor/EditorWindow/Inspector/SHEditorInspector.cpp

@@ -171,10 +171,15 @@ namespace SHADE
         if (auto toggleButton = SHComponentManager::GetComponent_s<SHToggleButtonComponent>(eid))
         {
           DrawComponent(toggleButton);
-        }if (auto slider = SHComponentManager::GetComponent_s<SHSliderComponent>(eid))
+        }
+        if (auto slider = SHComponentManager::GetComponent_s<SHSliderComponent>(eid))
         {
           DrawComponent(slider);
         }
+        if(auto listenerComponent = SHComponentManager::GetComponent_s<SHAudioListenerComponent>(eid))
+        {
+          DrawComponent(listenerComponent);
+        }
         ImGui::Separator();
         // Render Scripts
         SHScriptEngine* scriptEngine = static_cast<SHScriptEngine*>(SHSystemManager::GetSystem<SHScriptEngine>());
@@ -198,7 +203,7 @@ namespace SHADE
           DrawAddComponentWithEnforcedComponentButton<SHColliderComponent, SHTransformComponent>(eid);
           DrawAddComponentWithEnforcedComponentButton<SHTextRenderableComponent, SHTransformComponent>(eid);
           DrawAddComponentWithEnforcedComponentButton<SHAnimatorComponent, SHTransformComponent, SHRenderable>(eid);
-          
+          DrawAddComponentWithEnforcedComponentButton<SHAudioListenerComponent, SHTransformComponent>(eid);
 
           ImGui::EndMenu();
         }

SHADE_Engine/src/Editor/SHEditor.cpp

@@ -579,19 +579,23 @@ namespace SHADE
     return false;
   }
 
-  void SHEditor::LoadScene(AssetID const& assetID) noexcept
+  bool SHEditor::LoadScene(AssetID const& assetID) noexcept
   {
     if(shWindow->IsUnsavedChanges())
     {
       //Unsaved changes prompt
       isUnsavedChangesPromptOpen = true;
       sceneToLoad = assetID;
+      return false;
     }
     else
     {
       //Load the scene
       sceneToLoad = 0;
+      editorConfig->workingSceneID = assetID;
+      SHConfigurationManager::SaveEditorConfig();
       SHSceneManager::RestartScene(assetID);
+      return true;
     }
   }
 

SHADE_Engine/src/Editor/SHEditor.h

@@ -115,7 +115,7 @@ namespace SHADE
 
     bool SaveScene(std::string const& newSceneName = {});
 
-    void LoadScene(AssetID const& assetID) noexcept;
+    bool LoadScene(AssetID const& assetID) noexcept;
 
     void Play();
     void Pause();

SHADE_Engine/src/Serialization/SHSerialization.cpp

@@ -246,6 +246,7 @@ namespace SHADE
     AddComponentToComponentNode<SHTextRenderableComponent>(components, eid);
     AddComponentToComponentNode<SHAnimatorComponent>(components, eid);
     AddComponentToComponentNode<SHUIComponent>(components, eid);
+    AddComponentToComponentNode<SHAudioListenerComponent>(components, eid);
 
     node[ComponentsNode] = components;
 
@@ -306,6 +307,7 @@ namespace SHADE
     AddComponentID<SHTextRenderableComponent>(componentIDList, componentsNode);
     AddComponentID<SHAnimatorComponent>(componentIDList, componentsNode);
     AddComponentID<SHUIComponent>(componentIDList, componentsNode);
+    AddComponentID<SHAudioListenerComponent>(componentIDList, componentsNode);
 
     return componentIDList;
   }
@@ -392,5 +394,6 @@ namespace SHADE
     SHSerializationHelper::InitializeComponentFromNode<SHLightComponent>(componentsNode, eid);
     SHSerializationHelper::InitializeComponentFromNode<SHAnimatorComponent>(componentsNode, eid);
     SHSerializationHelper::InitializeComponentFromNode<SHUIComponent>(componentsNode, eid);
+    SHSerializationHelper::InitializeComponentFromNode<SHAudioListenerComponent>(componentsNode, eid);
   }
 }