From c8eaee35ccadcbdf511607b8f9e168eb7d06aa2a Mon Sep 17 00:00:00 2001
From: Ykkrosh <philip@wildfiregames.com>
Date: Fri, 10 Sep 2010 21:05:13 +0000
Subject: [PATCH] Add initial texture conversion settings.

Replace button texture with higher-quality PNG.

This was SVN commit r8102.
---
 .../mods/public/art/textures/animated/water/textures.xml  | 4 ++++
 .../data/mods/public/art/textures/skins/gaia/textures.xml | 4 ++++
 .../mods/public/art/textures/terrain/types/textures.xml   | 4 ++++
 binaries/data/mods/public/art/textures/textures.xml       | 4 ++++
 .../public/art/textures/ui/global/button/button_wood.dds  | 3 ---
 .../public/art/textures/ui/global/button/button_wood.png  | 3 +++
 .../public/art/textures/ui/global/button/textures.xml     | 5 +++++
 binaries/data/mods/public/art/textures/ui/textures.xml    | 4 ++++
 binaries/data/mods/public/gui/common/sprite1.xml          | 8 ++++----
 9 files changed, 32 insertions(+), 7 deletions(-)
 create mode 100644 binaries/data/mods/public/art/textures/animated/water/textures.xml
 create mode 100644 binaries/data/mods/public/art/textures/skins/gaia/textures.xml
 create mode 100644 binaries/data/mods/public/art/textures/terrain/types/textures.xml
 create mode 100644 binaries/data/mods/public/art/textures/textures.xml
 delete mode 100644 binaries/data/mods/public/art/textures/ui/global/button/button_wood.dds
 create mode 100644 binaries/data/mods/public/art/textures/ui/global/button/button_wood.png
 create mode 100644 binaries/data/mods/public/art/textures/ui/global/button/textures.xml
 create mode 100644 binaries/data/mods/public/art/textures/ui/textures.xml

diff --git a/binaries/data/mods/public/art/textures/animated/water/textures.xml b/binaries/data/mods/public/art/textures/animated/water/textures.xml
new file mode 100644
index 0000000000..894728518c
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/animated/water/textures.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Textures>
+  <File pattern="normal*" normal="true"/>
+</Textures>
diff --git a/binaries/data/mods/public/art/textures/skins/gaia/textures.xml b/binaries/data/mods/public/art/textures/skins/gaia/textures.xml
new file mode 100644
index 0000000000..ecaa13c157
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/skins/gaia/textures.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Textures>
+  <File pattern="*" alpha="transparency"/>
+</Textures>
diff --git a/binaries/data/mods/public/art/textures/terrain/types/textures.xml b/binaries/data/mods/public/art/textures/terrain/types/textures.xml
new file mode 100644
index 0000000000..98d59959af
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/terrain/types/textures.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Textures>
+  <File pattern="*" format="dxt1"/>
+</Textures>
diff --git a/binaries/data/mods/public/art/textures/textures.xml b/binaries/data/mods/public/art/textures/textures.xml
new file mode 100644
index 0000000000..9595166b64
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/textures.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Textures>
+  <File pattern="*" format="dxt5" mipmap="true" filter="box"/>
+</Textures>
diff --git a/binaries/data/mods/public/art/textures/ui/global/button/button_wood.dds b/binaries/data/mods/public/art/textures/ui/global/button/button_wood.dds
deleted file mode 100644
index b88dacf7c3..0000000000
--- a/binaries/data/mods/public/art/textures/ui/global/button/button_wood.dds
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:047a530d50b831b8e4751a53cae44d862bf755de433f73707fd603c7f94650c8
-size 16512
diff --git a/binaries/data/mods/public/art/textures/ui/global/button/button_wood.png b/binaries/data/mods/public/art/textures/ui/global/button/button_wood.png
new file mode 100644
index 0000000000..bf14b3101a
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/global/button/button_wood.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:54b30d3c072fc4ccdeef71459be305f0d3ea0e1e4566f9bfdfa4243f844c2b7d
+size 11879
diff --git a/binaries/data/mods/public/art/textures/ui/global/button/textures.xml b/binaries/data/mods/public/art/textures/ui/global/button/textures.xml
new file mode 100644
index 0000000000..01da4cd9cf
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/global/button/textures.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Textures>
+  <!-- Use RGBA for some small files that have ugly DXT artifacts -->
+  <File pattern="button_wood.*" format="rgba"/>
+</Textures>
diff --git a/binaries/data/mods/public/art/textures/ui/textures.xml b/binaries/data/mods/public/art/textures/ui/textures.xml
new file mode 100644
index 0000000000..13454bf539
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/textures.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Textures>
+  <File pattern="*" mipmap="false" alpha="transparency"/>
+</Textures>
diff --git a/binaries/data/mods/public/gui/common/sprite1.xml b/binaries/data/mods/public/gui/common/sprite1.xml
index 9869bb85d3..59d53bb541 100644
--- a/binaries/data/mods/public/gui/common/sprite1.xml
+++ b/binaries/data/mods/public/gui/common/sprite1.xml
@@ -405,14 +405,14 @@
 	</sprite>
 
 	<sprite name="wheatButton">
-		<image	texture="global/button/button_wood.dds"
+		<image	texture="global/button/button_wood.png"
 			real_texture_placement="0 0 160 31" 
 			size="0 0 100% 100%" 
 		/>
 	</sprite>
         
 	<sprite name="wheatButtonOver">
-		<image 	texture="global/button/button_wood.dds"
+		<image 	texture="global/button/button_wood.png"
 			real_texture_placement="0 32 160 64" 
 			size="0 0 100% 100%" 
 		/>
@@ -420,7 +420,7 @@
 
 	<sprite name="wheatButtonDisabled">
 		<effect grayscale="" />
-		<image 	texture="global/button/button_wood.dds"
+		<image 	texture="global/button/button_wood.png"
 			real_texture_placement="0 0 160 31" 
 			size="0 0 100% 100%" 
 		/>
@@ -428,7 +428,7 @@
 
 	<sprite name="wheatButtonGlow">
 		<effect	add_color="60 42 42 0" />
-		<image 	texture="global/button/button_wood.dds"
+		<image 	texture="global/button/button_wood.png"
 			real_texture_placement="0 0 160 31" 
 			size="0 0 100% 100%" 
 		/>