refactor: 不再使用 Magpie.Core 命名空间

Blinue · Dec 16, 2024 · 4ec0f30 · 4ec0f30
1 parent 7e5e85c
commit 4ec0f30
Show file tree

Hide file tree

Showing 131 changed files with 210 additions and 235 deletions.
diff --git a/src/Magpie.Core/BackendDescriptorStore.cpp b/src/Magpie.Core/BackendDescriptorStore.cpp
@@ -2,7 +2,7 @@
 #include "BackendDescriptorStore.h"
 #include "Logger.h"
 
-namespace Magpie::Core {
+namespace Magpie {
 
 ID3D11ShaderResourceView* BackendDescriptorStore::GetShaderResourceView(ID3D11Texture2D* texture) noexcept {
 	if (auto it = _srvMap.find(texture); it != _srvMap.end()) {

diff --git a/src/Magpie.Core/BackendDescriptorStore.h b/src/Magpie.Core/BackendDescriptorStore.h
@@ -1,7 +1,7 @@
 #pragma once
 #include <parallel_hashmap/phmap.h>
 
-namespace Magpie::Core {
+namespace Magpie {
 
 class BackendDescriptorStore {
 public:

diff --git a/src/Magpie.Core/CursorDrawer.cpp b/src/Magpie.Core/CursorDrawer.cpp
@@ -17,7 +17,7 @@
 
 using namespace DirectX;
 
-namespace Magpie::Core {
+namespace Magpie {
 
 struct VertexPositionTexture {
 	VertexPositionTexture() = default;

diff --git a/src/Magpie.Core/CursorDrawer.h b/src/Magpie.Core/CursorDrawer.h
@@ -2,7 +2,7 @@
 #include <parallel_hashmap/phmap.h>
 #include "ScalingOptions.h"
 
-namespace Magpie::Core {
+namespace Magpie {
 
 class DeviceResources;
 

diff --git a/src/Magpie.Core/CursorManager.cpp b/src/Magpie.Core/CursorManager.cpp
@@ -8,7 +8,7 @@
 #include "Renderer.h"
 #include <dwmapi.h>
 
-namespace Magpie::Core {
+namespace Magpie {
 
 // 将源窗口的光标位置映射到缩放后的光标位置。当光标位于源窗口之外，与源窗口的距离不会缩放。
 // 对于光标，第一个像素映射到第一个像素，最后一个像素映射到最后一个像素，因此光标区域的缩放

diff --git a/src/Magpie.Core/CursorManager.h b/src/Magpie.Core/CursorManager.h
@@ -1,6 +1,6 @@
 #pragma once
 
-namespace Magpie::Core {
+namespace Magpie {
 
 class CursorManager {
 public:

diff --git a/src/Magpie.Core/DesktopDuplicationFrameSource.cpp b/src/Magpie.Core/DesktopDuplicationFrameSource.cpp
@@ -7,7 +7,7 @@
 #include "DirectXHelper.h"
 #include "SmallVector.h"
 
-namespace Magpie::Core {
+namespace Magpie {
 
 static winrt::com_ptr<IDXGIOutput1> FindMonitor(IDXGIAdapter1* adapter, HMONITOR hMonitor) noexcept {
 	winrt::com_ptr<IDXGIOutput> output;

diff --git a/src/Magpie.Core/DesktopDuplicationFrameSource.h b/src/Magpie.Core/DesktopDuplicationFrameSource.h
@@ -3,7 +3,7 @@
 #include "Win32Helper.h"
 #include "SmallVector.h"
 
-namespace Magpie::Core {
+namespace Magpie {
 
 class DesktopDuplicationFrameSource final : public FrameSourceBase {
 public:

diff --git a/src/Magpie.Core/DeviceResources.cpp b/src/Magpie.Core/DeviceResources.cpp
@@ -6,7 +6,7 @@
 #include "DirectXHelper.h"
 #include "ScalingWindow.h"
 
-namespace Magpie::Core {
+namespace Magpie {
 
 bool DeviceResources::Initialize() noexcept {
 #ifdef _DEBUG

diff --git a/src/Magpie.Core/DeviceResources.h b/src/Magpie.Core/DeviceResources.h
@@ -1,7 +1,7 @@
 #pragma once
 #include <parallel_hashmap/phmap.h>
 
-namespace Magpie::Core {
+namespace Magpie {
 
 class DeviceResources {
 public:

diff --git a/src/Magpie.Core/DirectXHelper.cpp b/src/Magpie.Core/DirectXHelper.cpp
@@ -4,7 +4,7 @@
 #include "Logger.h"
 #include "StrHelper.h"
 
-namespace Magpie::Core {
+namespace Magpie {
 
 bool DirectXHelper::CompileComputeShader(
 	std::string_view hlsl,

diff --git a/src/Magpie.Core/DirectXHelper.h b/src/Magpie.Core/DirectXHelper.h
@@ -1,6 +1,6 @@
 #pragma once
 
-namespace Magpie::Core {
+namespace Magpie {
 
 struct DirectXHelper {
 	static bool CompileComputeShader(

diff --git a/src/Magpie.Core/DwmSharedSurfaceFrameSource.cpp b/src/Magpie.Core/DwmSharedSurfaceFrameSource.cpp
@@ -5,7 +5,7 @@
 #include "DirectXHelper.h"
 #include "DeviceResources.h"
 
-namespace Magpie::Core {
+namespace Magpie {
 
 using DwmGetDxSharedSurfaceFunc = BOOL(
 	HWND hWnd,

diff --git a/src/Magpie.Core/DwmSharedSurfaceFrameSource.h b/src/Magpie.Core/DwmSharedSurfaceFrameSource.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "FrameSourceBase.h"
 
-namespace Magpie::Core {
+namespace Magpie {
 
 class DwmSharedSurfaceFrameSource final : public FrameSourceBase {
 public:

diff --git a/src/Magpie.Core/EffectCacheManager.cpp b/src/Magpie.Core/EffectCacheManager.cpp
@@ -34,7 +34,7 @@ struct serializer<
 		ar& size;
 		HRESULT hr = D3DCreateBlob(size, blob.put());
 		if (FAILED(hr)) {
-			Magpie::Core::Logger::Get().ComError("D3DCreateBlob 失败", hr);
+			Magpie::Logger::Get().ComError("D3DCreateBlob 失败", hr);
 			throw new std::exception();
 		}
 
@@ -46,7 +46,7 @@ struct serializer<
 
 }
 
-namespace Magpie::Core {
+namespace Magpie {
 
 template<typename Archive>
 void serialize(Archive& ar, EffectParameterDesc& o) {

diff --git a/src/Magpie.Core/EffectCacheManager.h b/src/Magpie.Core/EffectCacheManager.h
@@ -3,7 +3,7 @@
 #include "EffectDesc.h"
 #include <parallel_hashmap/phmap.h>
 
-namespace Magpie::Core {
+namespace Magpie {
 
 class EffectCacheManager {
 public:

diff --git a/src/Magpie.Core/EffectCompiler.cpp b/src/Magpie.Core/EffectCompiler.cpp
@@ -12,7 +12,7 @@
 #include "Win32Helper.h"
 #include "EffectDesc.h"
 
-namespace Magpie::Core {
+namespace Magpie {
 
 // 当前 MagpieFX 版本
 static constexpr uint32_t MAGPIE_FX_VERSION = 4;

diff --git a/src/Magpie.Core/EffectDrawer.cpp b/src/Magpie.Core/EffectDrawer.cpp
@@ -21,7 +21,7 @@
 #pragma warning(push)
 #pragma pop_macro("_UNICODE")
 
-namespace Magpie::Core {
+namespace Magpie {
 
 static SIZE CalcOutputSize(
 	const std::pair<std::string, std::string>& outputSizeExpr,

diff --git a/src/Magpie.Core/EffectDrawer.h b/src/Magpie.Core/EffectDrawer.h
@@ -3,7 +3,7 @@
 #include "SmallVector.h"
 #include "EffectHelper.h"
 
-namespace Magpie::Core {
+namespace Magpie {
 
 struct EffectOption;
 class DeviceResources;

diff --git a/src/Magpie.Core/EffectHelper.h b/src/Magpie.Core/EffectHelper.h
@@ -2,7 +2,7 @@
 #include <dxgi.h>
 #include <cstdint>
 
-namespace Magpie::Core {
+namespace Magpie {
 
 struct EffectHelper {
 	struct EffectIntermediateTextureFormatDesc {

diff --git a/src/Magpie.Core/EffectsProfiler.cpp b/src/Magpie.Core/EffectsProfiler.cpp
@@ -2,7 +2,7 @@
 #include "EffectsProfiler.h"
 #include "DeviceResources.h"
 
-namespace Magpie::Core {
+namespace Magpie {
 
 void EffectsProfiler::Start(ID3D11Device* d3dDevice, uint32_t passCount) {
 	assert(_passQueries.empty());

diff --git a/src/Magpie.Core/EffectsProfiler.h b/src/Magpie.Core/EffectsProfiler.h
@@ -2,7 +2,7 @@
 #include "SmallVector.h"
 #include "Win32Helper.h"
 
-namespace Magpie::Core {
+namespace Magpie {
 
 class DeviceResources;
 

diff --git a/src/Magpie.Core/ExclModeHelper.cpp b/src/Magpie.Core/ExclModeHelper.cpp
@@ -3,7 +3,7 @@
 #include "Logger.h"
 #include <shellapi.h>
 
-namespace Magpie::Core {
+namespace Magpie {
 
 // 模拟 D3D 独占全屏模式，以起到免打扰的效果
 // SHQueryUserNotificationState 通常被用来检测是否有 D3D 游戏独占全屏，以确定是否应该向用户推送通知/弹窗

diff --git a/src/Magpie.Core/ExclModeHelper.h b/src/Magpie.Core/ExclModeHelper.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "Win32Helper.h"
 
-namespace Magpie::Core {
+namespace Magpie {
 
 struct ExclModeHelper {
 	static wil::unique_mutex_nothrow EnterExclMode() noexcept;

diff --git a/src/Magpie.Core/FastHasher.cpp b/src/Magpie.Core/FastHasher.cpp
@@ -3,7 +3,7 @@
 #include "Logger.h"
 #include "StrHelper.h"
 
-namespace Magpie::Core {
+namespace Magpie {
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////
 //

diff --git a/src/Magpie.Core/FastHasher.h b/src/Magpie.Core/FastHasher.h
@@ -1,6 +1,6 @@
 #pragma once
 
-namespace Magpie::Core {
+namespace Magpie {
 
 struct FastHasher {
 	static uint64_t HashData(std::span<const BYTE> data) noexcept;

diff --git a/src/Magpie.Core/FrameSourceBase.cpp b/src/Magpie.Core/FrameSourceBase.cpp
@@ -11,7 +11,7 @@
 #include "BackendDescriptorStore.h"
 #include <dwmapi.h>
 
-namespace Magpie::Core {
+namespace Magpie {
 
 static constexpr uint16_t INITIAL_CHECK_COUNT = 16;
 static constexpr uint16_t INITIAL_SKIP_COUNT = 1;

diff --git a/src/Magpie.Core/FrameSourceBase.h b/src/Magpie.Core/FrameSourceBase.h
@@ -1,6 +1,6 @@
 #pragma once
 
-namespace Magpie::Core {
+namespace Magpie {
 
 class DeviceResources;
 class BackendDescriptorStore;

diff --git a/src/Magpie.Core/GDIFrameSource.cpp b/src/Magpie.Core/GDIFrameSource.cpp
@@ -6,7 +6,7 @@
 #include "DeviceResources.h"
 #include "ScalingWindow.h"
 
-namespace Magpie::Core {
+namespace Magpie {
 
 bool GDIFrameSource::_Initialize() noexcept {
 	if (!_CalcSrcRect()) {

diff --git a/src/Magpie.Core/GDIFrameSource.h b/src/Magpie.Core/GDIFrameSource.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "FrameSourceBase.h"
 
-namespace Magpie::Core {
+namespace Magpie {
 
 class GDIFrameSource final : public FrameSourceBase {
 public:

diff --git a/src/Magpie.Core/GraphicsCaptureFrameSource.cpp b/src/Magpie.Core/GraphicsCaptureFrameSource.cpp
@@ -17,7 +17,7 @@ using namespace Windows::Graphics::DirectX;
 using namespace Windows::Graphics::DirectX::Direct3D11;
 }
 
-namespace Magpie::Core {
+namespace Magpie {
 
 bool GraphicsCaptureFrameSource::_Initialize() noexcept {
 	ID3D11Device5* d3dDevice = _deviceResources->GetD3DDevice();

diff --git a/src/Magpie.Core/GraphicsCaptureFrameSource.h b/src/Magpie.Core/GraphicsCaptureFrameSource.h
@@ -4,7 +4,7 @@
 #include <Windows.Graphics.Capture.Interop.h>
 #include <ShlObj.h>
 
-namespace Magpie::Core {
+namespace Magpie {
 
 // 使用 Window Runtime 的 Windows.Graphics.Capture API 抓取窗口
 // 见 https://docs.microsoft.com/en-us/windows/uwp/audio-video-camera/screen-capture

diff --git a/src/Magpie.Core/ImGuiBackend.cpp b/src/Magpie.Core/ImGuiBackend.cpp
@@ -11,7 +11,7 @@
 #include "shaders/ImGuiImplVS.h"
 #include "shaders/ImGuiImplPS.h"
 
-namespace Magpie::Core {
+namespace Magpie {
 
 struct VERTEX_CONSTANT_BUFFER {
 	float mvp[4][4];

diff --git a/src/Magpie.Core/ImGuiBackend.h b/src/Magpie.Core/ImGuiBackend.h
@@ -1,7 +1,7 @@
 #pragma once
 #include <imgui.h>
 
-namespace Magpie::Core {
+namespace Magpie {
 
 class DeviceResources;
 

diff --git a/src/Magpie.Core/ImGuiFontsCacheManager.cpp b/src/Magpie.Core/ImGuiFontsCacheManager.cpp
@@ -137,7 +137,7 @@ struct serializer<
 
 }
 
-namespace Magpie::Core {
+namespace Magpie {
 
 // 缓存版本
 // 当缓存文件结构有更改时更新它，使旧缓存失效

diff --git a/src/Magpie.Core/ImGuiFontsCacheManager.h b/src/Magpie.Core/ImGuiFontsCacheManager.h
@@ -2,7 +2,7 @@
 #include <imgui.h>
 #include <parallel_hashmap/phmap.h>
 
-namespace Magpie::Core {
+namespace Magpie {
 
 class ImGuiFontsCacheManager {
 public:

diff --git a/src/Magpie.Core/ImGuiHelper.cpp b/src/Magpie.Core/ImGuiHelper.cpp
@@ -14,7 +14,7 @@ static void UnpackAccumulativeOffsetsIntoRanges(
 	outRanges[0] = 0;
 }
 
-const ImWchar* Magpie::Core::ImGuiHelper::GetGlyphRangesChineseSimplifiedOfficial() noexcept {
+const ImWchar* Magpie::ImGuiHelper::GetGlyphRangesChineseSimplifiedOfficial() noexcept {
 	// 存储了通用规范汉字表中的一级字表（3500字）以及其他一些常用字。
 	// 来自 https://zh.wiktionary.org/wiki/Appendix:%E9%80%9A%E7%94%A8%E8%A7%84%E8%8C%83%E6%B1%89%E5%AD%97%E8%A1%A8
 	// 由 CJKCharacterSetForImGui 生成，它位于 tools 文件夹中。
@@ -93,7 +93,7 @@ const ImWchar* Magpie::Core::ImGuiHelper::GetGlyphRangesChineseSimplifiedOfficia
 }
 
 // 来自 https://github.com/flyinghead/flycast/blob/541544292a3d051839672ffa7bd4524a3e1c1c51/core/rend/gui_util.cpp#L523
-const ImWchar* Magpie::Core::ImGuiHelper::GetGlyphRangesChineseTraditionalOfficial() noexcept {
+const ImWchar* Magpie::ImGuiHelper::GetGlyphRangesChineseTraditionalOfficial() noexcept {
 	// Store all official characters for Traditional Chinese.
 	// Sourced from https://https://en.wikipedia.org/wiki/List_of_Graphemes_of_Commonly-Used_Chinese_Characters
 	// (Stored as accumulative offsets from the initial unicode codepoint 0x4E00. This encoding is designed to helps us compact the source code size.)

diff --git a/src/Magpie.Core/ImGuiHelper.h b/src/Magpie.Core/ImGuiHelper.h
@@ -1,7 +1,7 @@
 #pragma once
 #include <imgui.h>
 
-namespace Magpie::Core {
+namespace Magpie {
 
 struct ImGuiHelper {
 	static const ImWchar* GetGlyphRangesChineseSimplifiedOfficial() noexcept;

diff --git a/src/Magpie.Core/ImGuiImpl.cpp b/src/Magpie.Core/ImGuiImpl.cpp
@@ -11,7 +11,7 @@
 #include "ScalingWindow.h"
 #include "CursorManager.h"
 
-namespace Magpie::Core {
+namespace Magpie {
 
 ImGuiImpl::~ImGuiImpl() noexcept {
 	if (ImGui::GetCurrentContext()) {

diff --git a/src/Magpie.Core/ImGuiImpl.h b/src/Magpie.Core/ImGuiImpl.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "ImGuiBackend.h"
 
-namespace Magpie::Core {
+namespace Magpie {
 
 class DeviceResources;
 

diff --git a/src/Magpie.Core/Logger.cpp b/src/Magpie.Core/Logger.cpp
@@ -4,7 +4,7 @@
 #include <spdlog/sinks/rotating_file_sink.h>
 #include <fmt/printf.h>
 
-namespace Magpie::Core {
+namespace Magpie {
 
 bool Logger::Initialize(
 	spdlog::level::level_enum logLevel,

diff --git a/src/Magpie.Core/OverlayDrawer.cpp b/src/Magpie.Core/OverlayDrawer.cpp
@@ -18,7 +18,7 @@
 
 using namespace std::chrono;
 
-namespace Magpie::Core {
+namespace Magpie {
 
 static const char* COLOR_INDICATOR = "■";
 static const wchar_t COLOR_INDICATOR_W = L'■';