From: Mikko Rasa <tdb@tdb.fi>
Date: Mon, 11 Oct 2021 13:52:11 +0000 (+0300)
Subject: Adjust and re-export desertpillars data with new features
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=f3bdaf61bbb01f66bde924a917d29d63c87f9851;p=libs%2Fgl.git

Adjust and re-export desertpillars data with new features
---

diff --git a/demos/desertpillars/data/exported/Iron.mat b/demos/desertpillars/data/exported/Iron.mat
new file mode 100644
index 00000000..b987df27
--- /dev/null
+++ b/demos/desertpillars/data/exported/Iron.mat
@@ -0,0 +1,5 @@
+type pbr;
+base_color 0.550000 0.570000 0.570000 1.00000;
+metalness 1.00000;
+roughness 0.200000;
+emission 0.00000 0.00000 0.00000;
diff --git a/demos/desertpillars/data/exported/Iron.tech b/demos/desertpillars/data/exported/Iron.tech
index 9fbe305f..1e55ffba 100644
--- a/demos/desertpillars/data/exported/Iron.tech
+++ b/demos/desertpillars/data/exported/Iron.tech
@@ -1,13 +1,6 @@
 method ""
 {
-	material
-	{
-		type pbr;
-		base_color 0.550000 0.570000 0.570000 1.00000;
-		metalness 1.00000;
-		roughness 0.200000;
-		emission 0.00000 0.00000 0.00000;
-	};
+	material "Iron.mat";
 	shader "sphere.shader";
 };
 method "shadow"
diff --git a/demos/desertpillars/data/exported/Stone.tech b/demos/desertpillars/data/exported/Stone.tech
index 4faebac9..ec9a0b6f 100644
--- a/demos/desertpillars/data/exported/Stone.tech
+++ b/demos/desertpillars/data/exported/Stone.tech
@@ -15,5 +15,9 @@ method ""
 };
 method "shadow"
 {
-	shader "_occluder.glsl.shader";
+	shader "occluder.glsl.shader";
+};
+method "shadow_thsm"
+{
+	shader "occluder_thsm.glsl.shader";
 };
diff --git a/demos/desertpillars/data/exported/Tiles028.tech b/demos/desertpillars/data/exported/Tiles028.tech
index 6729b010..4a656d05 100644
--- a/demos/desertpillars/data/exported/Tiles028.tech
+++ b/demos/desertpillars/data/exported/Tiles028.tech
@@ -15,5 +15,9 @@ method ""
 };
 method "shadow"
 {
-	shader "_occluder.glsl.shader";
+	shader "occluder.glsl.shader";
+};
+method "shadow_thsm"
+{
+	shader "occluder_thsm.glsl.shader";
 };
diff --git a/demos/desertpillars/scene.blend b/demos/desertpillars/scene.blend
index 5d8d43f9..2a73dd58 100644
Binary files a/demos/desertpillars/scene.blend and b/demos/desertpillars/scene.blend differ