调整了项目结构

ArchitectureColoredPainting/ArchitectureColoredPainting.vcxproj

@@ -55,7 +55,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <IncludePath>$(SolutionDir)include;$(IncludePath)</IncludePath>
+    <IncludePath>$(IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
   </PropertyGroup>
@@ -68,11 +68,11 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <LanguageStandard>stdcpp20</LanguageStandard>
-      <AdditionalIncludeDirectories>$(SolutionDir)ArchitectureColoredPainting\src\Editor\RightBar;$(SolutionDir)ArchitectureColoredPainting\src\Editor\;$(SolutionDir)FramelessHelper\include;$(SolutionDir)FramelessHelper\qmake\inc\core;$(SolutionDir)FramelessHelper\include\FramelessHelper\Core;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)include;$(SolutionDir)ArchitectureColoredPainting\src\Editor\RightBar;$(SolutionDir)ArchitectureColoredPainting\src\Editor\;$(SolutionDir)FramelessHelper\include;$(SolutionDir)FramelessHelper\qmake\inc\core;$(SolutionDir)FramelessHelper\include\FramelessHelper\Core;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>FRAMELESSHELPER_WIDGETS_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>$(SolutionDir)FramelessHelper\qmake\FramelessHelperCore\debug\FramelessHelperCore.lib;$(SolutionDir)FramelessHelper\qmake\FramelessHelperWidgets\debug\FramelessHelperWidgets.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'" Label="Configuration">
@@ -146,7 +146,6 @@
     <ClCompile Include="src\Renderer\Painting\StraightLine.cpp" />
     <ClCompile Include="src\SvgParser.cpp" />
     <ClCompile Include="src\TitleWidget.cpp" />
-    <QtRcc Include="MainWindow.qrc" />
     <QtUic Include="EditorWidget.ui" />
     <QtUic Include="FramelessWindow.ui" />
     <QtUic Include="MainWindow.ui" />
@@ -155,27 +154,23 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="..\data.json" />
-    <None Include="darkstyle.qss" />
+    <None Include="res\Shaders\depth_init.comp" />
-    <None Include="lightstyle.qss" />
+    <None Include="res\Shaders\depth_mipmap.comp" />
-    <None Include="Shaders\depth_init.comp" />
+    <None Include="res\Shaders\element.comp" />
-    <None Include="Shaders\depth_mipmap.comp" />
+    <None Include="res\Shaders\final.frag" />
-    <None Include="Shaders\element.comp" />
+    <None Include="res\Shaders\final.vert" />
-    <None Include="Shaders\final.frag" />
+    <None Include="res\Shaders\model.frag" />
-    <None Include="Shaders\final.vert" />
+    <None Include="res\Shaders\model.vert" />
-    <None Include="Shaders\model.frag" />
+    <None Include="res\Shaders\model_shadow.frag" />
-    <None Include="Shaders\model.vert" />
+    <None Include="res\Shaders\model_shadow.geom" />
-    <None Include="Shaders\model_shadow.frag" />
+    <None Include="res\Shaders\model_shadow.vert" />
-    <None Include="Shaders\model_shadow.geom" />
+    <None Include="res\Shaders\painting.comp" />
-    <None Include="Shaders\model_shadow.vert" />
+    <None Include="res\Shaders\painting.frag" />
-    <None Include="Shaders\painting.comp">
+    <None Include="res\Shaders\painting.vert" />
-      <FileType>Document</FileType>
+    <None Include="res\Shaders\shader.frag" />
-    </None>
+    <None Include="res\Shaders\shader.vert" />
-    <None Include="Shaders\painting.frag" />
+    <None Include="res\Shaders\shadow_mapping.comp" />
-    <None Include="Shaders\painting.vert" />
+    <None Include="res\Shaders\ssgi.comp" />
-    <None Include="Shaders\shader.frag" />
-    <None Include="Shaders\shader.vert" />
-    <None Include="Shaders\shadow_mapping.comp" />
-    <None Include="Shaders\ssgi.comp" />
   </ItemGroup>
   <ItemGroup>
     <QtMoc Include="src\Editor\RightBar\LayerTreeWidget.h" />
@@ -223,6 +218,14 @@
     <ClInclude Include="src\Renderer\Painting\StraightLine.h" />
     <QtMoc Include="src\Renderer\RendererGLWidget.h" />
   </ItemGroup>
+  <ItemGroup>
+    <QtRcc Include="res\MainWindow.qrc" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\FramelessHelper\qmake\FramelessHelperWidgets\FramelessHelperWidgets.vcxproj">
+      <Project>{e7a71e05-4aa5-31db-a17d-542fc7bd83a3}</Project>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Condition="Exists('$(QtMsBuild)\qt.targets')">
     <Import Project="$(QtMsBuild)\qt.targets" />

ArchitectureColoredPainting/ArchitectureColoredPainting.vcxproj.filters

@@ -247,62 +247,56 @@
     </QtMoc>
   </ItemGroup>
   <ItemGroup>
-    <None Include="Shaders\shader.frag">
-      <Filter>Resource Files\Shaders</Filter>
-    </None>
-    <None Include="Shaders\shader.vert">
-      <Filter>Resource Files\Shaders</Filter>
-    </None>
-    <None Include="Shaders\model.frag">
-      <Filter>Resource Files\Shaders</Filter>
-    </None>
-    <None Include="Shaders\model.vert">
-      <Filter>Resource Files\Shaders</Filter>
-    </None>
-    <None Include="Shaders\final.vert">
-      <Filter>Resource Files\Shaders</Filter>
-    </None>
-    <None Include="Shaders\final.frag">
-      <Filter>Resource Files\Shaders</Filter>
-    </None>
-    <None Include="Shaders\painting.frag">
-      <Filter>Resource Files\Shaders</Filter>
-    </None>
-    <None Include="Shaders\painting.vert">
-      <Filter>Resource Files\Shaders</Filter>
-    </None>
-    <None Include="Shaders\painting.comp">
-      <Filter>Resource Files\Shaders</Filter>
-    </None>
-    <None Include="Shaders\model_shadow.frag">
-      <Filter>Resource Files\Shaders</Filter>
-    </None>
-    <None Include="Shaders\model_shadow.vert">
-      <Filter>Resource Files\Shaders</Filter>
-    </None>
-    <None Include="Shaders\depth_mipmap.comp">
-      <Filter>Resource Files\Shaders</Filter>
-    </None>
-    <None Include="Shaders\depth_init.comp">
-      <Filter>Resource Files\Shaders</Filter>
-    </None>
-    <None Include="Shaders\model_shadow.geom">
-      <Filter>Resource Files\Shaders</Filter>
-    </None>
-    <None Include="Shaders\shadow_mapping.comp">
-      <Filter>Resource Files\Shaders</Filter>
-    </None>
-    <None Include="Shaders\ssgi.comp">
-      <Filter>Resource Files\Shaders</Filter>
-    </None>
-    <None Include="darkstyle.qss">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="lightstyle.qss">
-      <Filter>Resource Files</Filter>
-    </None>
     <None Include="..\data.json" />
-    <None Include="Shaders\element.comp">
+    <None Include="res\Shaders\depth_init.comp">
+      <Filter>Resource Files\Shaders</Filter>
+    </None>
+    <None Include="res\Shaders\depth_mipmap.comp">
+      <Filter>Resource Files\Shaders</Filter>
+    </None>
+    <None Include="res\Shaders\element.comp">
+      <Filter>Resource Files\Shaders</Filter>
+    </None>
+    <None Include="res\Shaders\final.frag">
+      <Filter>Resource Files\Shaders</Filter>
+    </None>
+    <None Include="res\Shaders\final.vert">
+      <Filter>Resource Files\Shaders</Filter>
+    </None>
+    <None Include="res\Shaders\model.frag">
+      <Filter>Resource Files\Shaders</Filter>
+    </None>
+    <None Include="res\Shaders\model.vert">
+      <Filter>Resource Files\Shaders</Filter>
+    </None>
+    <None Include="res\Shaders\model_shadow.frag">
+      <Filter>Resource Files\Shaders</Filter>
+    </None>
+    <None Include="res\Shaders\model_shadow.geom">
+      <Filter>Resource Files\Shaders</Filter>
+    </None>
+    <None Include="res\Shaders\model_shadow.vert">
+      <Filter>Resource Files\Shaders</Filter>
+    </None>
+    <None Include="res\Shaders\painting.comp">
+      <Filter>Resource Files\Shaders</Filter>
+    </None>
+    <None Include="res\Shaders\painting.frag">
+      <Filter>Resource Files\Shaders</Filter>
+    </None>
+    <None Include="res\Shaders\painting.vert">
+      <Filter>Resource Files\Shaders</Filter>
+    </None>
+    <None Include="res\Shaders\shader.frag">
+      <Filter>Resource Files\Shaders</Filter>
+    </None>
+    <None Include="res\Shaders\shader.vert">
+      <Filter>Resource Files\Shaders</Filter>
+    </None>
+    <None Include="res\Shaders\shadow_mapping.comp">
+      <Filter>Resource Files\Shaders</Filter>
+    </None>
+    <None Include="res\Shaders\ssgi.comp">
       <Filter>Resource Files\Shaders</Filter>
     </None>
   </ItemGroup>
@@ -419,7 +413,7 @@
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <QtRcc Include="MainWindow.qrc">
+    <QtRcc Include="res\MainWindow.qrc">
       <Filter>Resource Files</Filter>
     </QtRcc>
   </ItemGroup>