From 47a78de6094a83a2d7c17ded22d001c7502dfd01 Mon Sep 17 00:00:00 2001
From: Xiao Qi <xiaoqi.loh@digipen.edu>
Date: Sat, 25 Mar 2023 16:41:49 +0800
Subject: [PATCH] Added dependencies pull for shader compiler

---
 Assets/Animation Clips/Main | Bin 289 -> 0 bytes
 Dependencies.bat            |  11 ++++++++++-
 Dependencies.lua            |   3 ++-
 SHADE_Engine/premake5.lua   |  12 ------------
 premake5.lua                |   2 +-
 5 files changed, 13 insertions(+), 15 deletions(-)
 delete mode 100644 Assets/Animation Clips/Main

diff --git a/Assets/Animation Clips/Main b/Assets/Animation Clips/Main
deleted file mode 100644
index ac5a59fa92d3f11764856a8a751c2dab31a24899..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 289
vcmeZE%uTgY@J-CjWB5060WX)Qi<N?*g{7srfq|(BFIPxq0Weq$4SBf$>YxGN

diff --git a/Dependencies.bat b/Dependencies.bat
index 30c5e24f..5445a36a 100644
--- a/Dependencies.bat
+++ b/Dependencies.bat
@@ -21,10 +21,11 @@ echo "N - dotnet"
 echo "O - tinyddsloader"
 echo "P - fmod"
 echo "Q - vswhere"
+echo "R - ShaderCompiler"
 echo ---------------------------------------------------
 echo. 
 
-choice /C ABCDEFGHIJKLMNOPQ
+choice /C ABCDEFGHIJKLMNOPQR
 set _e=%ERRORLEVEL%
 
 if %_e%==1 goto VMA
@@ -44,6 +45,7 @@ if %_e%==14 goto dotnet
 if %_e%==15 goto tinyddsloader
 if %_e%==16 goto fmod
 if %_e%==17 goto vswhere
+if %_e%==18 goto ShaderCompiler
 
 :VMA
 echo -----------------------VMA----------------------------
@@ -163,6 +165,13 @@ echo -----------------------vswhere----------------------------
 rmdir "Dependencies/vswhere" /S /Q
 mkdir "Dependencies/vswhere"
 powershell -Command "& {wget https://github.com/microsoft/vswhere/releases/download/3.1.1/vswhere.exe -OutFile "Dependencies/vswhere/vswhere.exe"}"
+if %_e%==17 (goto:done) else (goto:ShaderCompiler)
+
+:ShaderCompiler
+echo ------------------ShaderCompiler------------------
+rmdir "Dependencies/ShaderCompiler" /S /Q
+mkdir "Dependencies/ShaderCompiler"
+git clone https://github.com/SHADE-DP/ShaderCompiler.git "Dependencies/ShaderCompiler"
 
 :done
 echo DONE!
diff --git a/Dependencies.lua b/Dependencies.lua
index 2694fe35..974fbbce 100644
--- a/Dependencies.lua
+++ b/Dependencies.lua
@@ -17,4 +17,5 @@ IncludeDir["VULKAN"] = "$(VULKAN_SDK)"
 IncludeDir["dotnet"] = "%{wks.location}\\Dependencies\\dotnet"
 IncludeDir["tinyddsloader"] = "%{wks.location}\\Dependencies\\tinyddsloader"
 IncludeDir["fmod"] = "%{wks.location}\\Dependencies\\fmod"
-IncludeDir["vswhere"] = "%{wks.location}\\Dependencies\\vswhere"
\ No newline at end of file
+IncludeDir["vswhere"] = "%{wks.location}\\Dependencies\\vswhere"
+IncludeDir["ShaderCompiler"] = "%{wks.location}\\Dependencies\\ShaderCompiler"
\ No newline at end of file
diff --git a/SHADE_Engine/premake5.lua b/SHADE_Engine/premake5.lua
index e4bcbc09..fbb8b19e 100644
--- a/SHADE_Engine/premake5.lua
+++ b/SHADE_Engine/premake5.lua
@@ -119,9 +119,6 @@ project "SHADE_Engine"
   filter "configurations:Debug"
     postbuildcommands 
     {
-      "xcopy  /r /y /q \"%{IncludeDir.ModelCompiler}\\bin\\Debug\\assimp-vc142-mtd.dll\" \"$(OutDir)\"",
-      "xcopy  /r /y /q \"%{IncludeDir.ModelCompiler}\\bin\\Debug\\ModelCompiler.exe\" \"$(OutDir)\"",
-      "xcopy  /r /y /q \"%{IncludeDir.FontCompiler}\\bin\\Debug\\FontCompiler.exe\" \"$(OutDir)\"",
       "xcopy  /r /y /q \"%{IncludeDir.fmod}\\lib\\fmodL.dll\" \"$(OutDir)\"",
       "xcopy  /r /y /q \"%{IncludeDir.fmod}\\lib\\fmodstudioL.dll\" \"$(OutDir)\"",
       "xcopy  /r /y /q \"%{IncludeDir.vswhere}\\vswhere.exe\" \"$(OutDir)\""
@@ -130,9 +127,6 @@ project "SHADE_Engine"
   filter "configurations:Release"
     postbuildcommands 
     {
-      "xcopy  /r /y /q \"%{IncludeDir.ModelCompiler}\\bin\\Release\\assimp-vc142-mt.dll\" \"$(OutDir)\"",
-      "xcopy  /r /y /q \"%{IncludeDir.ModelCompiler}\\bin\\Release\\ModelCompiler.exe\" \"$(OutDir)\"",
-      "xcopy  /r /y /q \"%{IncludeDir.FontCompiler}\\bin\\Release\\FontCompiler.exe\" \"$(OutDir)\"",
       "xcopy  /r /y /q \"%{IncludeDir.fmod}\\lib\\fmod.dll\" \"$(OutDir)\"",
       "xcopy  /r /y /q \"%{IncludeDir.fmod}\\lib\\fmodstudio.dll\" \"$(OutDir)\"",
       "xcopy  /r /y /q \"%{IncludeDir.vswhere}\\vswhere.exe\" \"$(OutDir)\""
@@ -146,12 +140,6 @@ project "SHADE_Engine"
       "xcopy  /r /y /q \"%{IncludeDir.fmod}\\lib\\fmodstudio.dll\" \"$(OutDir)\""
     }
 
-  filter "configurations:Publish"
-    postbuildcommands 
-    {
-      --"xcopy  /r /y /q \"%{IncludeDir.assimp}\\bin\\Release\\assimp-vc142-mt.dll\" \"$(OutDir)\""
-    }
-
   warnings 'Extra'
   
   filter "configurations:Debug"
diff --git a/premake5.lua b/premake5.lua
index 26f181b5..23ab63ac 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -27,9 +27,9 @@ workspace "SHADE"
   group "Dependencies"
 	include "Dependencies/FontCompiler/Dependencies/msdf"
 	include "Dependencies/imgui"
-	--include "Dependencies/tracy"
 	include "Dependencies/yamlcpp"
   include "Dependencies/reactphysics3d"
   include "Dependencies/ModelCompiler"
   include "Dependencies/FontCompiler"
+  include "Dependencies/ShaderCompiler"
   group ""