From 34b45f1e677d939f29b7c338f1583ed1d3b061a8 Mon Sep 17 00:00:00 2001 From: iwubcode Date: Sun, 23 Jul 2023 13:27:33 -0500 Subject: [PATCH] temp add all new files in one go --- Source/Core/Common/CMakeLists.txt | 1 + Source/Core/DolphinLib.props | 102 +++++++++++++++++++++++-- Source/Core/VideoCommon/CMakeLists.txt | 99 ++++++++++++++++++++++-- 3 files changed, 186 insertions(+), 16 deletions(-) diff --git a/Source/Core/Common/CMakeLists.txt b/Source/Core/Common/CMakeLists.txt index 8f3eeb0a27..d915ea75bd 100644 --- a/Source/Core/Common/CMakeLists.txt +++ b/Source/Core/Common/CMakeLists.txt @@ -89,6 +89,7 @@ add_library(common IOFile.h JitRegister.cpp JitRegister.h + JsonUtil.cpp JsonUtil.h JsonUtil.cpp Lazy.h diff --git a/Source/Core/DolphinLib.props b/Source/Core/DolphinLib.props index c8b3b0ed4d..541bd71613 100644 --- a/Source/Core/DolphinLib.props +++ b/Source/Core/DolphinLib.props @@ -658,12 +658,18 @@ + + + + + + @@ -687,26 +693,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + - + + + - - + + + + + + + + + + @@ -1304,12 +1349,17 @@ + + + + + @@ -1329,22 +1379,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + - + + - + + + - - + + + + + + + + + diff --git a/Source/Core/VideoCommon/CMakeLists.txt b/Source/Core/VideoCommon/CMakeLists.txt index 6361e639c4..db6a88fa4b 100644 --- a/Source/Core/VideoCommon/CMakeLists.txt +++ b/Source/Core/VideoCommon/CMakeLists.txt @@ -14,18 +14,29 @@ add_library(videocommon Assets/CustomAssetLibrary.h Assets/CustomAssetLoader.cpp Assets/CustomAssetLoader.h + Assets/CustomAssetLoader2.cpp + Assets/CustomAssetLoader2.h Assets/CustomTextureData.cpp Assets/CustomTextureData.h Assets/DirectFilesystemAssetLibrary.cpp Assets/DirectFilesystemAssetLibrary.h Assets/MaterialAsset.cpp Assets/MaterialAsset.h + Assets/MaterialAssetUtils.cpp + Assets/MaterialAssetUtils.h Assets/MeshAsset.cpp Assets/MeshAsset.h + Assets/RenderTargetAsset.cpp + Assets/RenderTargetAsset.h Assets/ShaderAsset.cpp Assets/ShaderAsset.h Assets/TextureAsset.cpp Assets/TextureAsset.h + Assets/TextureSamplerValue.cpp + Assets/TextureSamplerValue.h + Assets/Types.h + Assets/WatchableFilesystemAssetLibrary.cpp + Assets/WatchableFilesystemAssetLibrary.h AsyncRequests.cpp AsyncRequests.h AsyncShaderCompiler.cpp @@ -66,41 +77,113 @@ add_library(videocommon GeometryShaderGen.h GeometryShaderManager.cpp GeometryShaderManager.h + GraphicsModEditor/Controls/AssetDisplay.cpp + GraphicsModEditor/Controls/AssetDisplay.h + GraphicsModEditor/Controls/CameraChoiceControl.cpp + GraphicsModEditor/Controls/CameraChoiceControl.h + GraphicsModEditor/Controls/MaterialControl.cpp + GraphicsModEditor/Controls/MaterialControl.h + GraphicsModEditor/Controls/MaterialGenerateWindow.cpp + GraphicsModEditor/Controls/MaterialGenerateWindow.h + GraphicsModEditor/Controls/MeshControl.cpp + GraphicsModEditor/Controls/MeshControl.h + GraphicsModEditor/Controls/MeshExtractWindow.cpp + GraphicsModEditor/Controls/MeshExtractWindow.h + GraphicsModEditor/Controls/MeshImportWindow.cpp + GraphicsModEditor/Controls/MeshImportWindow.h + GraphicsModEditor/Controls/MiscControls.cpp + GraphicsModEditor/Controls/MiscControls.h + GraphicsModEditor/Controls/RenderTargetControl.cpp + GraphicsModEditor/Controls/RenderTargetControl.h + GraphicsModEditor/Controls/ShaderControl.cpp + GraphicsModEditor/Controls/ShaderControl.h + GraphicsModEditor/Controls/TagSelectionWindow.cpp + GraphicsModEditor/Controls/TagSelectionWindow.h + GraphicsModEditor/Controls/TextureControl.cpp + GraphicsModEditor/Controls/TextureControl.h + GraphicsModEditor/EditorAssetSource.cpp + GraphicsModEditor/EditorAssetSource.h + GraphicsModEditor/EditorBackend.cpp + GraphicsModEditor/EditorBackend.h + GraphicsModEditor/EditorEvents.h + GraphicsModEditor/EditorFilter.cpp + GraphicsModEditor/EditorFilter.h + GraphicsModEditor/EditorMain.cpp + GraphicsModEditor/EditorMain.h + GraphicsModEditor/EditorState.cpp + GraphicsModEditor/EditorState.h + GraphicsModEditor/EditorTypes.h + GraphicsModEditor/MaterialGeneration.cpp + GraphicsModEditor/MaterialGeneration.h + GraphicsModEditor/Panels/ActiveTargetsPanel.cpp + GraphicsModEditor/Panels/ActiveTargetsPanel.h + GraphicsModEditor/Panels/AssetBrowserPanel.cpp + GraphicsModEditor/Panels/AssetBrowserPanel.h + GraphicsModEditor/Panels/PropertiesPanel.cpp + GraphicsModEditor/Panels/PropertiesPanel.h + GraphicsModEditor/RenderTargetGeneration.cpp + GraphicsModEditor/RenderTargetGeneration.h + GraphicsModEditor/SceneDumper.cpp + GraphicsModEditor/SceneDumper.h + GraphicsModEditor/SceneUtils.cpp + GraphicsModEditor/SceneUtils.h + GraphicsModEditor/ShaderGeneration.cpp + GraphicsModEditor/ShaderGeneration.h GraphicsModSystem/Config/GraphicsMod.cpp GraphicsModSystem/Config/GraphicsMod.h + GraphicsModSystem/Config/GraphicsModAction.cpp + GraphicsModSystem/Config/GraphicsModAction.h GraphicsModSystem/Config/GraphicsModAsset.cpp GraphicsModSystem/Config/GraphicsModAsset.h - GraphicsModSystem/Config/GraphicsModFeature.cpp - GraphicsModSystem/Config/GraphicsModFeature.h GraphicsModSystem/Config/GraphicsModGroup.cpp GraphicsModSystem/Config/GraphicsModGroup.h + GraphicsModSystem/Config/GraphicsModHashPolicy.cpp + GraphicsModSystem/Config/GraphicsModHashPolicy.h + GraphicsModSystem/Config/GraphicsModTag.cpp + GraphicsModSystem/Config/GraphicsModTag.h GraphicsModSystem/Config/GraphicsTarget.cpp GraphicsModSystem/Config/GraphicsTarget.h - GraphicsModSystem/Config/GraphicsTargetGroup.cpp - GraphicsModSystem/Config/GraphicsTargetGroup.h GraphicsModSystem/Constants.h + GraphicsModSystem/Runtime/Actions/CustomMeshAction.cpp + GraphicsModSystem/Runtime/Actions/CustomMeshAction.h GraphicsModSystem/Runtime/Actions/CustomPipelineAction.cpp GraphicsModSystem/Runtime/Actions/CustomPipelineAction.h + GraphicsModSystem/Runtime/Actions/ModifyLight.cpp + GraphicsModSystem/Runtime/Actions/ModifyLight.h GraphicsModSystem/Runtime/Actions/MoveAction.cpp GraphicsModSystem/Runtime/Actions/MoveAction.h GraphicsModSystem/Runtime/Actions/PrintAction.cpp GraphicsModSystem/Runtime/Actions/PrintAction.h + GraphicsModSystem/Runtime/Actions/RelativeCameraAction.cpp + GraphicsModSystem/Runtime/Actions/RelativeCameraAction.h GraphicsModSystem/Runtime/Actions/ScaleAction.cpp GraphicsModSystem/Runtime/Actions/ScaleAction.h GraphicsModSystem/Runtime/Actions/SkipAction.cpp GraphicsModSystem/Runtime/Actions/SkipAction.h - GraphicsModSystem/Runtime/CustomPipeline.cpp - GraphicsModSystem/Runtime/CustomPipeline.h - GraphicsModSystem/Runtime/CustomShaderCache.cpp - GraphicsModSystem/Runtime/CustomShaderCache.h + GraphicsModSystem/Runtime/Actions/TransformAction.cpp + GraphicsModSystem/Runtime/Actions/TransformAction.h + GraphicsModSystem/Runtime/CameraManager.cpp + GraphicsModSystem/Runtime/CameraManager.h + GraphicsModSystem/Runtime/CustomResourceManager.cpp + GraphicsModSystem/Runtime/CustomResourceManager.h + GraphicsModSystem/Runtime/CustomShaderCache2.cpp + GraphicsModSystem/Runtime/CustomShaderCache2.h + GraphicsModSystem/Runtime/CustomTextureCache2.cpp + GraphicsModSystem/Runtime/CustomTextureCache2.h GraphicsModSystem/Runtime/FBInfo.cpp GraphicsModSystem/Runtime/FBInfo.h GraphicsModSystem/Runtime/GraphicsModAction.h GraphicsModSystem/Runtime/GraphicsModActionData.h GraphicsModSystem/Runtime/GraphicsModActionFactory.cpp GraphicsModSystem/Runtime/GraphicsModActionFactory.h + GraphicsModSystem/Runtime/GraphicsModBackend.cpp + GraphicsModSystem/Runtime/GraphicsModBackend.h + GraphicsModSystem/Runtime/GraphicsModHash.cpp + GraphicsModSystem/Runtime/GraphicsModHash.h GraphicsModSystem/Runtime/GraphicsModManager.cpp GraphicsModSystem/Runtime/GraphicsModManager.h + GraphicsModSystem/Runtime/GraphicsModRuntimeBackend.cpp + GraphicsModSystem/Runtime/GraphicsModRuntimeBackend.h HiresTextures.cpp HiresTextures.h IndexGenerator.cpp