fix: Rebase issues.

SparkyStudios · Oct 26, 2024 · 7d35aaf · 7d35aaf
1 parent 9795970
commit 7d35aaf
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/...AmplitudeAudio/EditorPluginAmplitudeAudio/Assets/AmplitudeAudioControlCollectionAsset.cpp b/...AmplitudeAudio/EditorPluginAmplitudeAudio/Assets/AmplitudeAudioControlCollectionAsset.cpp
@@ -185,7 +185,7 @@ ezResult ezAmplitudeAudioControlCollectionAssetDocument::TransformAssetEntry(con
 }
 
 #if defined(AM_WINDOWS_VERSION)
-#  include <Foundation/Basics/Platform/Win/IncludeWindows.h>
+#  include <Foundation/Platform/Win/Utils/IncludeWindows.h>
 #endif
 
 EZ_STATICLINK_FILE(EditorPluginAmplitudeAudio, EditorPluginAmplitudeAudio_Assets_AmplitudeAudioControlCollectionAsset);
diff --git a/...deAudio/EditorPluginAmplitudeAudio/Assets/AmplitudeAudioControlCollectionAssetManager.cpp b/...deAudio/EditorPluginAmplitudeAudio/Assets/AmplitudeAudioControlCollectionAssetManager.cpp
@@ -59,7 +59,7 @@ void ezAmplitudeAudioControlCollectionAssetDocumentManager::InternalGetSupported
 }
 
 #if defined(AM_WINDOWS_VERSION)
-#  include <Foundation/Basics/Platform/Win/IncludeWindows.h>
+#  include <Foundation/Platform/Win/Utils/IncludeWindows.h>
 #endif
 
 EZ_STATICLINK_FILE(EditorPluginAmplitudeAudio, EditorPluginAmplitudeAudio_Assets_AmplitudeAudioControlCollectionAssetManager);
diff --git a/...rPlugins/AmplitudeAudio/EditorPluginAmplitudeAudio/Core/AmplitudeAudioControlsManager.cpp b/...rPlugins/AmplitudeAudio/EditorPluginAmplitudeAudio/Core/AmplitudeAudioControlsManager.cpp
@@ -432,7 +432,7 @@ ezResult ezAmplitudeAudioControlsManager::LoadControl(const ezVariantDictionary&
 }
 
 #if defined(AM_WINDOWS_VERSION)
-#  include <Foundation/Basics/Platform/Win/IncludeWindows.h>
+#  include <Foundation/Platform/Win/Utils/IncludeWindows.h>
 #endif
 
 EZ_STATICLINK_FILE(EditorPluginAmplitudeAudio, EditorPluginAmplitudeAudio_AmplitudeAudioControlsManager);
diff --git a/Code/EnginePlugins/AmplitudeAudioPlugin/AmplitudeAudioSingleton.cpp b/Code/EnginePlugins/AmplitudeAudioPlugin/AmplitudeAudioSingleton.cpp
@@ -995,7 +995,7 @@ void ezAmplitude::DetectPlatform() const
 }
 
 #if defined(AM_WINDOWS_VERSION)
-#  include <Foundation/Basics/Platform/Win/IncludeWindows.h>
+#  include <Foundation/Platform/Win/Utils/IncludeWindows.h>
 #endif
 
 EZ_STATICLINK_FILE(AmplitudeAudioPlugin, AmplitudeAudioPlugin_AmplitudeAudioSingleton);
diff --git a/Code/EnginePlugins/AmplitudeAudioPlugin/AmplitudeAudioStartup.cpp b/Code/EnginePlugins/AmplitudeAudioPlugin/AmplitudeAudioStartup.cpp
@@ -58,7 +58,7 @@ EZ_BEGIN_SUBSYSTEM_DECLARATION(SparkyStudios, AmplitudeAudioPlugin)
 EZ_END_SUBSYSTEM_DECLARATION;
 
 #if defined(AM_WINDOWS_VERSION)
-#  include <Foundation/Basics/Platform/Win/IncludeWindows.h>
+#  include <Foundation/Platform/Win/Utils/IncludeWindows.h>
 #endif
 
 EZ_STATICLINK_FILE(AmplitudeAudioPlugin, AmplitudeAudioPlugin_AmplitudeAudioPluginStartup);
diff --git a/Code/EnginePlugins/AmplitudeAudioPlugin/Components/AudioControlsComponent.cpp b/Code/EnginePlugins/AmplitudeAudioPlugin/Components/AudioControlsComponent.cpp
@@ -112,7 +112,7 @@ bool ezAudioControlsComponent::Unload()
 }
 
 #if defined(AM_WINDOWS_VERSION)
-#  include <Foundation/Basics/Platform/Win/IncludeWindows.h>
+#  include <Foundation/Platform/Win/Utils/IncludeWindows.h>
 #endif
 
 EZ_STATICLINK_FILE(AmplitudeAudioPlugin, AmplitudeAudioPlugin_Components_AudioControlsComponent);
diff --git a/Code/EnginePlugins/AmplitudeAudioPlugin/Resources/AudioControlCollectionResource.cpp b/Code/EnginePlugins/AmplitudeAudioPlugin/Resources/AudioControlCollectionResource.cpp
@@ -550,7 +550,7 @@ void ezAmplitudeAudioControlCollectionResource::UpdateMemoryUsage(MemoryUsage& o
 }
 
 #if defined(AM_WINDOWS_VERSION)
-#  include <Foundation/Basics/Platform/Win/IncludeWindows.h>
+#  include <Foundation/Platform/Win/Utils/IncludeWindows.h>
 #endif
 
 EZ_STATICLINK_FILE(AmplitudeAudioPlugin, AmplitudeAudioPlugin_Resources_AudioControlCollectionResource);
diff --git a/Code/EnginePlugins/AudioSystemPlugin/Implementation/Components/AudioTriggerComponent.cpp b/Code/EnginePlugins/AudioSystemPlugin/Implementation/Components/AudioTriggerComponent.cpp
@@ -340,7 +340,7 @@ void ezAudioTriggerComponentManager::CastRay(ObstructionOcclusionState& state, e
 
   if (state.m_ObstructionRaysValues.GetCount() <= rayIndex)
   {
-    state.m_ObstructionRaysValues.InsertAt(averageObstruction, rayIndex);
+    state.m_ObstructionRaysValues.InsertAt(rayIndex, averageObstruction);
   }
   else
   {
-Original file line number
+Diff line change
@@ Expand Up @@
       if (state.m_ObstructionRaysValues.GetCount() <= rayIndex)
       {
-        state.m_ObstructionRaysValues.InsertAt(averageObstruction, rayIndex);
+        state.m_ObstructionRaysValues.InsertAt(rayIndex, averageObstruction);
       }
       else
       {
@@ Expand Down @@