From ce875e675e5bbd7aee45c40aae6a45f27a95d787 Mon Sep 17 00:00:00 2001
From: Stan <stan@wildfiregames.com>
Date: Tue, 31 Jan 2023 16:28:04 +0000
Subject: [PATCH] Fix two broken models causing black glitches. - They had
 vertexes groups without weights. - Both of them were unused one incorrectly
 so. - Also fix the material while at it. Refs #6714

This was SVN commit r27515.
---
 .../structures/celts/merchant_sail_folded.xml | 38 -------------------
 .../structures/romans/trireme_fore_sail.xml   | 32 ++++++++--------
 .../art/actors/structures/romans/trireme.xml  |  4 +-
 .../others/celt_merchant_sail_folded_idle.dae |  3 --
 .../props/celt_merchant_sail_folded.dae       |  3 --
 .../meshes/props/rome_trireme_fore_sail.dae   |  4 +-
 6 files changed, 20 insertions(+), 64 deletions(-)
 delete mode 100644 binaries/data/mods/public/art/actors/props/structures/celts/merchant_sail_folded.xml
 delete mode 100644 binaries/data/mods/public/art/animation/others/celt_merchant_sail_folded_idle.dae
 delete mode 100644 binaries/data/mods/public/art/meshes/props/celt_merchant_sail_folded.dae

diff --git a/binaries/data/mods/public/art/actors/props/structures/celts/merchant_sail_folded.xml b/binaries/data/mods/public/art/actors/props/structures/celts/merchant_sail_folded.xml
deleted file mode 100644
index beeb523b07..0000000000
--- a/binaries/data/mods/public/art/actors/props/structures/celts/merchant_sail_folded.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="100" name="sail mesh">
-      <mesh>props/celt_merchant_sail_folded.dae</mesh>
-      <animations>
-        <animation file="others/celt_merchant_sail_folded_idle.dae" name="idle" speed="100"/>
-      </animations>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="1" name="swirl">
-      <textures>
-        <texture file="props/celt_sail_swirl.dds" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="circle">
-      <textures>
-        <texture file="props/celt_sail_circle.dds" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="face">
-      <textures>
-        <texture file="props/celt_sail_face.dds" name="baseTex"/>
-      </textures>
-    </variant>
-  </group>
-  <group>
-    <variant>
-      <textures>
-        <texture file="default_norm.png" name="normTex"/>
-        <texture file="null_black.dds" name="specTex"/>
-      </textures>
-    </variant>
-  </group>
-  <material>player_trans_norm_spec.xml</material>
-</actor>
diff --git a/binaries/data/mods/public/art/actors/props/structures/romans/trireme_fore_sail.xml b/binaries/data/mods/public/art/actors/props/structures/romans/trireme_fore_sail.xml
index 942a741d9e..92b51d0a30 100644
--- a/binaries/data/mods/public/art/actors/props/structures/romans/trireme_fore_sail.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/romans/trireme_fore_sail.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <float/>
-  <group>
-    <variant file="others/ships/rome_fore_sail_base.xml" name="Trireme Sail">
-      <mesh>props/rome_trireme_fore_sail.dae</mesh>
-      <textures>
-        <texture file="props/sail_blank_netting_new.png" name="baseTex"/>
-        <texture file="props/ptol_sail_norm.png" name="normTex"/>
-        <texture file="props/sail_spec_1.png" name="specTex"/>
-      </textures>
-    </variant>
-  </group>
-  <material>player_trans_parallax_spec.xml</material>
-</actor>
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <float/>
+  <group>
+    <variant file="others/ships/rome_fore_sail_base.xml" name="Trireme Sail">
+      <mesh>props/rome_trireme_fore_sail.dae</mesh>
+      <textures>
+        <texture file="props/sail_blank_netting_new.png" name="baseTex"/>
+        <texture file="props/ptol_sail_norm.png" name="normTex"/>
+        <texture file="props/sail_spec_1.png" name="specTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>player_trans_norm_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/structures/romans/trireme.xml b/binaries/data/mods/public/art/actors/structures/romans/trireme.xml
index e6173fd966..0080e4559b 100644
--- a/binaries/data/mods/public/art/actors/structures/romans/trireme.xml
+++ b/binaries/data/mods/public/art/actors/structures/romans/trireme.xml
@@ -6,7 +6,7 @@
     <variant frequency="1" file="others/ships/rome_trireme_oars.xml" name="Rome Trireme">
       <mesh>structural/rome_ship_trireme.dae</mesh>
       <props>
-        <prop actor="props/structures/romans/bireme_fore_sail.xml" attachpoint="fore_sail"/>
+        <prop actor="props/structures/romans/trireme_fore_sail.xml" attachpoint="fore_sail"/>
         <prop actor="props/structures/romans/trireme_main_sail.xml" attachpoint="main_sail"/>
         <prop actor="props/structures/romans/rome_bridge_base.xml" attachpoint="bridge"/>
         <prop actor="props/units/siege_artillery/bolt_projectile_med.xml" attachpoint="projectile"/>
@@ -24,5 +24,5 @@
     <variant frequency="1" file="others/ships/rome_trireme_shields_02.xml" name="Roman Trireme Shields-02"/>
     <variant frequency="1" file="others/ships/rome_trireme_shields_03.xml" name="Roman Trireme Shields-02"/>
   </group>
-  <material>player_trans_ao_parallax_spec.xml</material>
+  <material>player_trans_ao_norm_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/animation/others/celt_merchant_sail_folded_idle.dae b/binaries/data/mods/public/art/animation/others/celt_merchant_sail_folded_idle.dae
deleted file mode 100644
index dcb2801c45..0000000000
--- a/binaries/data/mods/public/art/animation/others/celt_merchant_sail_folded_idle.dae
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1da6e19623758acb3a6200218a8eabb87d138c530f5d77dfb116a688ea7d1f31
-size 237945
diff --git a/binaries/data/mods/public/art/meshes/props/celt_merchant_sail_folded.dae b/binaries/data/mods/public/art/meshes/props/celt_merchant_sail_folded.dae
deleted file mode 100644
index 8636549f91..0000000000
--- a/binaries/data/mods/public/art/meshes/props/celt_merchant_sail_folded.dae
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7760e0b7f566331914ed1f496b5b4a4e06037dc31d072ac18d175bdc27f73b9f
-size 41217
diff --git a/binaries/data/mods/public/art/meshes/props/rome_trireme_fore_sail.dae b/binaries/data/mods/public/art/meshes/props/rome_trireme_fore_sail.dae
index 93c48f15ef..047a24e3ac 100644
--- a/binaries/data/mods/public/art/meshes/props/rome_trireme_fore_sail.dae
+++ b/binaries/data/mods/public/art/meshes/props/rome_trireme_fore_sail.dae
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cee35678f9d837cc78cbe15ecbb357319630a27f7cc2ed53569b3abbb35a6704
-size 69322
+oid sha256:81c16379e3b1b88e00b9d9b7ec4ecb32995e0dc2ea6992bd8fc0e560c2143baa
+size 70905