Copy base shaders for Android builds

android/bloom/build.bat

@@ -4,6 +4,10 @@ if %ERRORLEVEL% EQU 0 (
 	echo ndk-build has failed, build cancelled
 	cd..
 
+	mkdir "assets\shaders\base"
+	xcopy "..\..\data\shaders\base\*.spv" "assets\shaders\base" /Y
+	
+
 	mkdir "assets\shaders\bloom"
 	xcopy "..\..\data\shaders\bloom\*.spv" "assets\shaders\bloom" /Y
 

android/cleanup.bat

@@ -0,0 +1 @@
+FOR /d /r . %%x IN (assets) DO @IF EXIST "%%x" rd /s /q "%%x"

android/computeparticles/build.bat

@@ -4,6 +4,10 @@ if %ERRORLEVEL% EQU 0 (
 	echo ndk-build has failed, build cancelled
 	cd..
 
+	mkdir "assets\shaders\base"
+	xcopy "..\..\data\shaders\base\*.spv" "assets\shaders\base" /Y
+	
+
 	mkdir "assets\shaders\computeparticles"
 	xcopy "..\..\data\shaders\computeparticles\*.spv" "assets\shaders\computeparticles" /Y
 

android/computeshader/build.bat

@@ -4,6 +4,10 @@ if %ERRORLEVEL% EQU 0 (
 	echo ndk-build has failed, build cancelled
 	cd..
 
+	mkdir "assets\shaders\base"
+	xcopy "..\..\data\shaders\base\*.spv" "assets\shaders\base" /Y
+	
+
 	mkdir "assets\shaders\computeshader"
 	xcopy "..\..\data\shaders\computeshader\*.spv" "assets\shaders\computeshader" /Y
 

android/deferred/build.bat

@@ -4,6 +4,10 @@ if %ERRORLEVEL% EQU 0 (
 	echo ndk-build has failed, build cancelled
 	cd..
 
+	mkdir "assets\shaders\base"
+	xcopy "..\..\data\shaders\base\*.spv" "assets\shaders\base" /Y
+	
+
 	mkdir "assets\shaders\deferred"
 	xcopy "..\..\data\shaders\deferred\*.spv" "assets\shaders\deferred" /Y
 

android/displacement/build.bat

@@ -4,6 +4,10 @@ if %ERRORLEVEL% EQU 0 (
 	echo ndk-build has failed, build cancelled
 	cd..
 
+	mkdir "assets\shaders\base"
+	xcopy "..\..\data\shaders\base\*.spv" "assets\shaders\base" /Y
+	
+
 	mkdir "assets\shaders\displacement"
 	xcopy "..\..\data\shaders\displacement\*.spv" "assets\shaders\displacement" /Y
 

android/distancefieldfonts/build.bat

@@ -4,6 +4,10 @@ if %ERRORLEVEL% EQU 0 (
 	echo ndk-build has failed, build cancelled
 	cd..
 
+	mkdir "assets\shaders\base"
+	xcopy "..\..\data\shaders\base\*.spv" "assets\shaders\base" /Y
+	
+
 	mkdir "assets\shaders\distancefieldfonts"
 	xcopy "..\..\data\shaders\distancefieldfonts\*.spv" "assets\shaders\distancefieldfonts" /Y
 

android/gears/build.bat

@@ -4,6 +4,10 @@ if %ERRORLEVEL% EQU 0 (
 	echo ndk-build has failed, build cancelled
 	cd..
 
+	mkdir "assets\shaders\base"
+	xcopy "..\..\data\shaders\base\*.spv" "assets\shaders\base" /Y
+	
+
 	mkdir "assets\shaders"
 	xcopy "..\..\data\shaders\gears.vert.spv" "assets\shaders" /Y
 	xcopy "..\..\data\shaders\gears.frag.spv" "assets\shaders" /Y

android/geometryshader/build.bat

@@ -4,6 +4,10 @@ if %ERRORLEVEL% EQU 0 (
 	echo ndk-build has failed, build cancelled
 	cd..
 
+	mkdir "assets\shaders\base"
+	xcopy "..\..\data\shaders\base\*.spv" "assets\shaders\base" /Y
+	
+
 	mkdir "assets\shaders\geometryshader"
 	xcopy "..\..\data\shaders\geometryshader\*.spv" "assets\shaders\geometryshader" /Y
     

android/instancing/build.bat

@@ -4,6 +4,10 @@ if %ERRORLEVEL% EQU 0 (
 	echo ndk-build has failed, build cancelled
 	cd..
 
+	mkdir "assets\shaders\base"
+	xcopy "..\..\data\shaders\base\*.spv" "assets\shaders\base" /Y
+	
+
 	mkdir "assets\shaders\instancing"
 	xcopy "..\..\data\shaders\instancing\*.spv" "assets\shaders\instancing" /Y
 

android/mesh/build.bat

@@ -4,6 +4,10 @@ if %ERRORLEVEL% EQU 0 (
 	echo ndk-build has failed, build cancelled
 	cd..
 
+	mkdir "assets\shaders\base"
+	xcopy "..\..\data\shaders\base\*.spv" "assets\shaders\base" /Y
+	
+
 	mkdir "assets\shaders\mesh"
 	xcopy "..\..\data\shaders\mesh\mesh.vert.spv" "assets\shaders\mesh" /Y
 	xcopy "..\..\data\shaders\mesh\mesh.frag.spv" "assets\shaders\mesh" /Y

android/multisampling/build.bat

@@ -4,6 +4,10 @@ if %ERRORLEVEL% EQU 0 (
 	echo ndk-build has failed, build cancelled
 	cd..
 
+	mkdir "assets\shaders\base"
+	xcopy "..\..\data\shaders\base\*.spv" "assets\shaders\base" /Y
+	
+
 	mkdir "assets\shaders\mesh"
 	xcopy "..\..\data\shaders\mesh\*.spv" "assets\shaders\mesh" /Y
 

android/multithreading/build.bat

@@ -4,6 +4,10 @@ if %ERRORLEVEL% EQU 0 (
 	echo ndk-build has failed, build cancelled
 	cd..
 
+	mkdir "assets\shaders\base"
+	xcopy "..\..\data\shaders\base\*.spv" "assets\shaders\base" /Y
+	
+
 	mkdir "assets\shaders\multithreading"
 	xcopy "..\..\data\shaders\multithreading\*.spv" "assets\shaders\multithreading" /Y
 

android/occlusionquery/build.bat

@@ -4,6 +4,10 @@ if %ERRORLEVEL% EQU 0 (
 	echo ndk-build has failed, build cancelled
 	cd..
 
+	mkdir "assets\shaders\base"
+	xcopy "..\..\data\shaders\base\*.spv" "assets\shaders\base" /Y
+	
+
 	mkdir "assets\shaders\occlusionquery"
 	xcopy "..\..\data\shaders\occlusionquery\*.spv" "assets\shaders\occlusionquery" /Y
 

android/offscreen/build.bat

@@ -4,6 +4,10 @@ if %ERRORLEVEL% EQU 0 (
 	echo ndk-build has failed, build cancelled
 	cd..
 
+	mkdir "assets\shaders\base"
+	xcopy "..\..\data\shaders\base\*.spv" "assets\shaders\base" /Y
+	
+
 	mkdir "assets\shaders\offscreen"
 	xcopy "..\..\data\shaders\offscreen\*.spv" "assets\shaders\offscreen" /Y
 

android/parallaxmapping/build.bat

@@ -4,6 +4,10 @@ if %ERRORLEVEL% EQU 0 (
 	echo ndk-build has failed, build cancelled
 	cd..
 
+	mkdir "assets\shaders\base"
+	xcopy "..\..\data\shaders\base\*.spv" "assets\shaders\base" /Y
+	
+
 	mkdir "assets\shaders\parallax"
 	xcopy "..\..\data\shaders\parallax\*.spv" "assets\shaders\parallax" /Y
 

android/particlefire/build.bat

@@ -4,6 +4,10 @@ if %ERRORLEVEL% EQU 0 (
 	echo ndk-build has failed, build cancelled
 	cd..
 
+	mkdir "assets\shaders\base"
+	xcopy "..\..\data\shaders\base\*.spv" "assets\shaders\base" /Y
+	
+
 	mkdir "assets\shaders\particlefire"
 	xcopy "..\..\data\shaders\particlefire\*.spv" "assets\shaders\particlefire" /Y
 

android/pipelines/build.bat

@@ -4,6 +4,10 @@ if %ERRORLEVEL% EQU 0 (
 	echo ndk-build has failed, build cancelled
 	cd..
 
+	mkdir "assets\shaders\base"
+	xcopy "..\..\data\shaders\base\*.spv" "assets\shaders\base" /Y
+	
+
 	mkdir "assets\shaders\pipelines"
 	xcopy "..\..\data\shaders\pipelines\*.spv" "assets\shaders\pipelines" /Y
 

android/pushconstants/build.bat

@@ -4,11 +4,15 @@ if %ERRORLEVEL% EQU 0 (
 	echo ndk-build has failed, build cancelled
 	cd..
 
+	mkdir "assets\shaders\base"
+	xcopy "..\..\data\shaders\base\*.spv" "assets\shaders\base" /Y
+	
+
 	mkdir "assets\shaders\pushconstants"
 	xcopy "..\..\data\shaders\pushconstants\*.spv" "assets\shaders\pushconstants" /Y
 
 	mkdir "assets\models"
-	xcopy "..\..\data\models\samplescene.obj" "assets\models" /Y 
+	xcopy "..\..\data\models\samplescene.dae" "assets\models" /Y 
 	
 	mkdir "res\drawable"
 	xcopy "..\..\android\images\icon.png" "res\drawable" /Y

android/radialblur/build.bat

@@ -4,6 +4,10 @@ if %ERRORLEVEL% EQU 0 (
 	echo ndk-build has failed, build cancelled
 	cd..
 
+	mkdir "assets\shaders\base"
+	xcopy "..\..\data\shaders\base\*.spv" "assets\shaders\base" /Y
+	
+
 	mkdir "assets\shaders\radialblur"
 	xcopy "..\..\data\shaders\radialblur\*.spv" "assets\shaders\radialblur" /Y
 

android/raytracing/build.bat

@@ -4,6 +4,10 @@ if %ERRORLEVEL% EQU 0 (
 	echo ndk-build has failed, build cancelled
 	cd..
 
+	mkdir "assets\shaders\base"
+	xcopy "..\..\data\shaders\base\*.spv" "assets\shaders\base" /Y
+	
+
 	mkdir "assets\shaders\raytracing"
 	xcopy "..\..\data\shaders\raytracing\*.spv" "assets\shaders\raytracing" /Y
 

android/shadowmapping/build.bat

@@ -4,6 +4,10 @@ if %ERRORLEVEL% EQU 0 (
 	echo ndk-build has failed, build cancelled
 	cd..
 
+	mkdir "assets\shaders\base"
+	xcopy "..\..\data\shaders\base\*.spv" "assets\shaders\base" /Y
+	
+
 	mkdir "assets\shaders\shadowmapping"
 	xcopy "..\..\data\shaders\shadowmapping\*.spv" "assets\shaders\shadowmapping" /Y
 

android/shadowmappingomni/build.bat

@@ -4,6 +4,10 @@ if %ERRORLEVEL% EQU 0 (
 	echo ndk-build has failed, build cancelled
 	cd..
 
+	mkdir "assets\shaders\base"
+	xcopy "..\..\data\shaders\base\*.spv" "assets\shaders\base" /Y
+	
+
 	mkdir "assets\shaders\shadowmapomni"
 	xcopy "..\..\data\shaders\shadowmapomni\*.spv" "assets\shaders\shadowmapomni" /Y
 

android/skeletalanimation/build.bat

@@ -4,6 +4,10 @@ if %ERRORLEVEL% EQU 0 (
 	echo ndk-build has failed, build cancelled
 	cd..
 
+	mkdir "assets\shaders\base"
+	xcopy "..\..\data\shaders\base\*.spv" "assets\shaders\base" /Y
+	
+
 	mkdir "assets\shaders\skeletalanimation"
 	xcopy "..\..\data\shaders\skeletalanimation\*.spv" "assets\shaders\skeletalanimation" /Y
 	mkdir "assets\shaders\base"

android/sphericalenvmapping/build.bat

@@ -4,6 +4,10 @@ if %ERRORLEVEL% EQU 0 (
 	echo ndk-build has failed, build cancelled
 	cd..
 
+	mkdir "assets\shaders\base"
+	xcopy "..\..\data\shaders\base\*.spv" "assets\shaders\base" /Y
+	
+
 	mkdir "assets\shaders\sphericalenvmapping"
 	xcopy "..\..\data\shaders\sphericalenvmapping\*.spv" "assets\shaders\sphericalenvmapping" /Y
 

android/tessellation/build.bat

@@ -4,6 +4,10 @@ if %ERRORLEVEL% EQU 0 (
 	echo ndk-build has failed, build cancelled
 	cd..
 
+	mkdir "assets\shaders\base"
+	xcopy "..\..\data\shaders\base\*.spv" "assets\shaders\base" /Y
+	
+
 	mkdir "assets\shaders\tessellation"
 	xcopy "..\..\data\shaders\tessellation\*.spv" "assets\shaders\tessellation" /Y
 

android/textoverlay/build.bat

@@ -4,6 +4,10 @@ if %ERRORLEVEL% EQU 0 (
 	echo ndk-build has failed, build cancelled
 	cd..
 
+	mkdir "assets\shaders\base"
+	xcopy "..\..\data\shaders\base\*.spv" "assets\shaders\base" /Y
+	
+
 	mkdir "assets\shaders\textoverlay"
 	xcopy "..\..\data\shaders\textoverlay\*.spv" "assets\shaders\textoverlay" /Y
 

android/texture/build.bat

@@ -4,6 +4,10 @@ if %ERRORLEVEL% EQU 0 (
 	echo ndk-build has failed, build cancelled
 	cd..
 
+	mkdir "assets\shaders\base"
+	xcopy "..\..\data\shaders\base\*.spv" "assets\shaders\base" /Y
+	
+
 	mkdir "assets\shaders\texture"
 	xcopy "..\..\data\shaders\texture\*.spv" "assets\shaders\texture" /Y
 

android/texturearray/build.bat

@@ -4,6 +4,10 @@ if %ERRORLEVEL% EQU 0 (
 	echo ndk-build has failed, build cancelled
 	cd..
 
+	mkdir "assets\shaders\base"
+	xcopy "..\..\data\shaders\base\*.spv" "assets\shaders\base" /Y
+	
+
 	mkdir "assets\shaders\texturearray"
 	xcopy "..\..\data\shaders\texturearray\*.spv" "assets\shaders\texturearray" /Y
 

android/texturecubemap/build.bat

@@ -4,6 +4,10 @@ if %ERRORLEVEL% EQU 0 (
 		echo ndk-build has failed, build cancelled
 	cd..
 
+	mkdir "assets\shaders\base"
+	xcopy "..\..\data\shaders\base\*.spv" "assets\shaders\base" /Y
+	
+
 	mkdir "assets\shaders\cubemap"
 	xcopy "..\..\data\shaders\cubemap\*.spv" "assets\shaders\cubemap" /Y
 

android/triangle/build.bat

@@ -4,6 +4,10 @@ if %ERRORLEVEL% EQU 0 (
 	echo ndk-build has failed, build cancelled
 	cd..
 
+	mkdir "assets\shaders\base"
+	xcopy "..\..\data\shaders\base\*.spv" "assets\shaders\base" /Y
+	
+
 	mkdir "assets\shaders"
 	xcopy "..\..\data\shaders\triangle.vert.spv" "assets\shaders" /Y
 	xcopy "..\..\data\shaders\triangle.frag.spv" "assets\shaders" /Y

android/vulkanscene/build.bat

@@ -4,6 +4,10 @@ if %ERRORLEVEL% EQU 0 (
 	echo ndk-build has failed, build cancelled
 	cd..
 
+	mkdir "assets\shaders\base"
+	xcopy "..\..\data\shaders\base\*.spv" "assets\shaders\base" /Y
+	
+
 	mkdir "assets\shaders\vulkanscene"
 	xcopy "..\..\data\shaders\vulkanscene\*.spv" "assets\shaders\vulkanscene" /Y