update s3d

tyanmahou · Dec 10, 2024 · 616e2db · 616e2db
1 parent eed5d47
commit 616e2db
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 9 deletions.
diff --git a/Re-Abyss/Re-Abyss.vcxproj b/Re-Abyss/Re-Abyss.vcxproj
@@ -76,29 +76,29 @@
     <OutDir>$(SolutionDir)Intermediate\$(ProjectName)\Debug\</OutDir>
     <IntDir>$(SolutionDir)Intermediate\$(ProjectName)\Debug\Intermediate\</IntDir>
     <TargetName>$(ProjectName)(debug)</TargetName>
-    <IncludePath>$(SIV3D_0_6_13)\include;$(SIV3D_0_6_13)\include\ThirdParty;$(ProjectDir)\vendor\abyss\include;$(ProjectDir)\vendor\Emaject\include;$(ProjectDir)\vendor\Mkanta\include;$(ProjectDir)\vendor\S3DTiled\include;$(ProjectDir)\vendor\SQLite-for-Siv3D\includes;$(IncludePath)</IncludePath>
-    <LibraryPath>$(ProjectDir)\vendor\S3DTiled\lib;$(ProjectDir)\vendor\SQLite-for-Siv3D\lib;$(SIV3D_0_6_13)\lib\Windows;$(LibraryPath)</LibraryPath>
+    <IncludePath>$(SIV3D_0_6_15)\include;$(SIV3D_0_6_15)\include\ThirdParty;$(ProjectDir)\vendor\abyss\include;$(ProjectDir)\vendor\Emaject\include;$(ProjectDir)\vendor\Mkanta\include;$(ProjectDir)\vendor\S3DTiled\include;$(ProjectDir)\vendor\SQLite-for-Siv3D\includes;$(IncludePath)</IncludePath>
+    <LibraryPath>$(ProjectDir)\vendor\S3DTiled\lib;$(ProjectDir)\vendor\SQLite-for-Siv3D\lib;$(SIV3D_0_6_15)\lib\Windows;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>$(SolutionDir)Intermediate\$(ProjectName)\Release\</OutDir>
     <IntDir>$(SolutionDir)Intermediate\$(ProjectName)\Release\Intermediate\</IntDir>
-    <IncludePath>$(SIV3D_0_6_13)\include;$(SIV3D_0_6_13)\include\ThirdParty;$(ProjectDir)\vendor\abyss\include;$(ProjectDir)\vendor\Emaject\include;$(ProjectDir)\vendor\Mkanta\include;$(ProjectDir)\vendor\S3DTiled\include;$(ProjectDir)\vendor\SQLite-for-Siv3D\includes;$(IncludePath)</IncludePath>
-    <LibraryPath>$(ProjectDir)\vendor\S3DTiled\lib;$(ProjectDir)\vendor\SQLite-for-Siv3D\lib;$(SIV3D_0_6_13)\lib\Windows;$(LibraryPath)</LibraryPath>
+    <IncludePath>$(SIV3D_0_6_15)\include;$(SIV3D_0_6_15)\include\ThirdParty;$(ProjectDir)\vendor\abyss\include;$(ProjectDir)\vendor\Emaject\include;$(ProjectDir)\vendor\Mkanta\include;$(ProjectDir)\vendor\S3DTiled\include;$(ProjectDir)\vendor\SQLite-for-Siv3D\includes;$(IncludePath)</IncludePath>
+    <LibraryPath>$(ProjectDir)\vendor\S3DTiled\lib;$(ProjectDir)\vendor\SQLite-for-Siv3D\lib;$(SIV3D_0_6_15)\lib\Windows;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Develop|x64'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>$(SolutionDir)Intermediate\$(ProjectName)\Release\</OutDir>
     <IntDir>$(SolutionDir)Intermediate\$(ProjectName)\Release\Intermediate\</IntDir>
-    <IncludePath>$(SIV3D_0_6_13)\include;$(SIV3D_0_6_13)\include\ThirdParty;$(ProjectDir)\vendor\abyss\include;$(ProjectDir)\vendor\Emaject\include;$(ProjectDir)\vendor\Mkanta\include;$(ProjectDir)\vendor\S3DTiled\include;$(ProjectDir)\vendor\SQLite-for-Siv3D\includes;$(IncludePath)</IncludePath>
-    <LibraryPath>$(ProjectDir)\vendor\S3DTiled\lib;$(ProjectDir)\vendor\SQLite-for-Siv3D\lib;$(SIV3D_0_6_13)\lib\Windows;$(LibraryPath)</LibraryPath>
+    <IncludePath>$(SIV3D_0_6_15)\include;$(SIV3D_0_6_15)\include\ThirdParty;$(ProjectDir)\vendor\abyss\include;$(ProjectDir)\vendor\Emaject\include;$(ProjectDir)\vendor\Mkanta\include;$(ProjectDir)\vendor\S3DTiled\include;$(ProjectDir)\vendor\SQLite-for-Siv3D\includes;$(IncludePath)</IncludePath>
+    <LibraryPath>$(ProjectDir)\vendor\S3DTiled\lib;$(ProjectDir)\vendor\SQLite-for-Siv3D\lib;$(SIV3D_0_6_15)\lib\Windows;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Staging|x64'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>$(SolutionDir)Intermediate\$(ProjectName)\Release\</OutDir>
     <IntDir>$(SolutionDir)Intermediate\$(ProjectName)\Release\Intermediate\</IntDir>
-    <IncludePath>$(SIV3D_0_6_13)\include;$(SIV3D_0_6_13)\include\ThirdParty;$(ProjectDir)\vendor\abyss\include;$(ProjectDir)\vendor\Emaject\include;$(ProjectDir)\vendor\Mkanta\include;$(ProjectDir)\vendor\S3DTiled\include;$(ProjectDir)\vendor\SQLite-for-Siv3D\includes;$(IncludePath)</IncludePath>
-    <LibraryPath>$(ProjectDir)\vendor\S3DTiled\lib;$(ProjectDir)\vendor\SQLite-for-Siv3D\lib;$(SIV3D_0_6_13)\lib\Windows;$(LibraryPath)</LibraryPath>
+    <IncludePath>$(SIV3D_0_6_15)\include;$(SIV3D_0_6_15)\include\ThirdParty;$(ProjectDir)\vendor\abyss\include;$(ProjectDir)\vendor\Emaject\include;$(ProjectDir)\vendor\Mkanta\include;$(ProjectDir)\vendor\S3DTiled\include;$(ProjectDir)\vendor\SQLite-for-Siv3D\includes;$(IncludePath)</IncludePath>
+    <LibraryPath>$(ProjectDir)\vendor\S3DTiled\lib;$(ProjectDir)\vendor\SQLite-for-Siv3D\lib;$(SIV3D_0_6_15)\lib\Windows;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>

diff --git a/Re-Abyss/build/Resource.rc b/Re-Abyss/build/Resource.rc
@@ -1,4 +1,4 @@
-# include <Siv3D/Windows/Resource.hpp>
+# include <Siv3D/Windows/Resource.hpp>
 
 //////////////////////////////////////////////////////
 //
@@ -32,8 +32,12 @@ Resource(engine/shader/d3d11/line3d.vs)
 Resource(engine/shader/d3d11/forward3d.ps)
 Resource(engine/shader/d3d11/line3d.ps)
 Resource(engine/shader/d3d11/copy.ps)
+Resource(engine/shader/d3d11/gaussian_blur_5.ps)
 Resource(engine/shader/d3d11/gaussian_blur_9.ps)
+Resource(engine/shader/d3d11/gaussian_blur_13.ps)
 Resource(engine/shader/d3d11/apply_srgb_curve.ps)
+Resource(engine/shader/d3d11/quad_warp.vs)
+Resource(engine/shader/d3d11/quad_warp.ps)
 Resource(engine/shader/d3d11/sky.ps)
 Resource(engine/shader/glsl/sprite.vert)
 Resource(engine/shader/glsl/shape.frag)
@@ -57,8 +61,12 @@ Resource(engine/shader/glsl/line3d.vert)
 Resource(engine/shader/glsl/forward3d.frag)
 Resource(engine/shader/glsl/line3d.frag)
 Resource(engine/shader/glsl/copy.frag)
+Resource(engine/shader/glsl/gaussian_blur_5.frag)
 Resource(engine/shader/glsl/gaussian_blur_9.frag)
+Resource(engine/shader/glsl/gaussian_blur_13.frag)
 Resource(engine/shader/glsl/apply_srgb_curve.frag)
+Resource(engine/shader/glsl/quad_warp.vert)
+Resource(engine/shader/glsl/quad_warp.frag)
 Resource(engine/shader/glsl/sky.frag)
 
 //