From: Mikko Rasa <tdb@tdb.fi>
Date: Sat, 11 Dec 2021 23:46:38 +0000 (+0200)
Subject: Re-export desertpillars data with new vertex formats
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=d80b15786883baee6a18d60ce1c67c456ec2eaa3;p=libs%2Fgl.git

Re-export desertpillars data with new vertex formats
---

diff --git a/demos/desertpillars/data/exported/Flare.mesh b/demos/desertpillars/data/exported/Flare.mesh
index b77a058e..27c05e6d 100644
--- a/demos/desertpillars/data/exported/Flare.mesh
+++ b/demos/desertpillars/data/exported/Flare.mesh
@@ -1,4 +1,4 @@
-vertices NORMAL3_BYTE TEXCOORD2_USHORT VERTEX3_FLOAT
+vertices VERTEX3_FLOAT TEXCOORD2_USHORT NORMAL3_BYTE PADDING1_UBYTE
 {
 	normal 0.00000 0.00000 1.00000;
 	texcoord 1.00000 0.00000;
diff --git a/demos/desertpillars/data/exported/Greek column short.mesh b/demos/desertpillars/data/exported/Greek column short.mesh
index 4d4c51f5..9f62a8f0 100644
--- a/demos/desertpillars/data/exported/Greek column short.mesh	
+++ b/demos/desertpillars/data/exported/Greek column short.mesh	
@@ -1,4 +1,4 @@
-vertices NORMAL3_BYTE TANGENT3_BYTE TEXCOORD2_USHORT VERTEX3_FLOAT
+vertices VERTEX3_FLOAT TEXCOORD2_USHORT NORMAL3_BYTE TANGENT3_BYTE PADDING2_UBYTE
 {
 	normal -0.577357 0.577342 0.577353;
 	texcoord 0.680973 0.468893;
diff --git a/demos/desertpillars/data/exported/Greek column.mesh b/demos/desertpillars/data/exported/Greek column.mesh
index cccd27f9..6f1c1e6a 100644
--- a/demos/desertpillars/data/exported/Greek column.mesh	
+++ b/demos/desertpillars/data/exported/Greek column.mesh	
@@ -1,4 +1,4 @@
-vertices NORMAL3_BYTE TANGENT3_BYTE TEXCOORD2_USHORT VERTEX3_FLOAT
+vertices VERTEX3_FLOAT TEXCOORD2_USHORT NORMAL3_BYTE TANGENT3_BYTE PADDING2_UBYTE
 {
 	normal -0.577357 0.577342 0.577353;
 	texcoord 0.680973 0.468893;
diff --git a/demos/desertpillars/data/exported/Sand.001.mesh b/demos/desertpillars/data/exported/Sand.001.mesh
index cce6823f..56e334c4 100644
--- a/demos/desertpillars/data/exported/Sand.001.mesh
+++ b/demos/desertpillars/data/exported/Sand.001.mesh
@@ -1,4 +1,4 @@
-vertices NORMAL3_BYTE TANGENT3_BYTE TEXCOORD2_FLOAT VERTEX3_FLOAT
+vertices VERTEX3_FLOAT TEXCOORD2_FLOAT NORMAL3_BYTE TANGENT3_BYTE PADDING2_UBYTE
 {
 	normal 0.00000 0.00000 1.00000;
 	texcoord -15.4968 -15.4968;
diff --git a/demos/desertpillars/data/exported/Sand.002.mesh b/demos/desertpillars/data/exported/Sand.002.mesh
index 35e2d3d0..a4515380 100644
--- a/demos/desertpillars/data/exported/Sand.002.mesh
+++ b/demos/desertpillars/data/exported/Sand.002.mesh
@@ -1,4 +1,4 @@
-vertices NORMAL3_BYTE TANGENT3_BYTE TEXCOORD2_FLOAT VERTEX3_FLOAT
+vertices VERTEX3_FLOAT TEXCOORD2_FLOAT NORMAL3_BYTE TANGENT3_BYTE PADDING2_UBYTE
 {
 	normal -0.0414999 -0.0423364 0.998241;
 	texcoord -15.4967 16.4968;
diff --git a/demos/desertpillars/data/exported/Sand.003.mesh b/demos/desertpillars/data/exported/Sand.003.mesh
index 94ecdca0..97ab123e 100644
--- a/demos/desertpillars/data/exported/Sand.003.mesh
+++ b/demos/desertpillars/data/exported/Sand.003.mesh
@@ -1,4 +1,4 @@
-vertices NORMAL3_BYTE TANGENT3_BYTE TEXCOORD2_FLOAT VERTEX3_FLOAT
+vertices VERTEX3_FLOAT TEXCOORD2_FLOAT NORMAL3_BYTE TANGENT3_BYTE PADDING2_UBYTE
 {
 	normal 0.000159889 0.00000 1.00000;
 	texcoord 16.4967 -15.4967;
diff --git a/demos/desertpillars/data/exported/Sand.004.mesh b/demos/desertpillars/data/exported/Sand.004.mesh
index 50a3b062..7b33f6c1 100644
--- a/demos/desertpillars/data/exported/Sand.004.mesh
+++ b/demos/desertpillars/data/exported/Sand.004.mesh
@@ -1,4 +1,4 @@
-vertices NORMAL3_BYTE TANGENT3_BYTE TEXCOORD2_FLOAT VERTEX3_FLOAT
+vertices VERTEX3_FLOAT TEXCOORD2_FLOAT NORMAL3_BYTE TANGENT3_BYTE PADDING2_UBYTE
 {
 	normal 0.112747 -0.0537524 0.992169;
 	texcoord 16.4967 -15.4968;
diff --git a/demos/desertpillars/data/exported/Sand.005.mesh b/demos/desertpillars/data/exported/Sand.005.mesh
index 730cee95..ea2ca77b 100644
--- a/demos/desertpillars/data/exported/Sand.005.mesh
+++ b/demos/desertpillars/data/exported/Sand.005.mesh
@@ -1,4 +1,4 @@
-vertices NORMAL3_BYTE TANGENT3_BYTE TEXCOORD2_FLOAT VERTEX3_FLOAT
+vertices VERTEX3_FLOAT TEXCOORD2_FLOAT NORMAL3_BYTE TANGENT3_BYTE PADDING2_UBYTE
 {
 	normal -0.0351209 -0.0744649 0.996605;
 	texcoord 16.4967 -15.4967;
diff --git a/demos/desertpillars/data/exported/Sand.006.mesh b/demos/desertpillars/data/exported/Sand.006.mesh
index 964971f6..98432f87 100644
--- a/demos/desertpillars/data/exported/Sand.006.mesh
+++ b/demos/desertpillars/data/exported/Sand.006.mesh
@@ -1,4 +1,4 @@
-vertices NORMAL3_BYTE TANGENT3_BYTE TEXCOORD2_FLOAT VERTEX3_FLOAT
+vertices VERTEX3_FLOAT TEXCOORD2_FLOAT NORMAL3_BYTE TANGENT3_BYTE PADDING2_UBYTE
 {
 	normal 1.48825e-05 0.00000 1.00000;
 	texcoord 16.4968 -15.4968;
diff --git a/demos/desertpillars/data/exported/Sand.007.mesh b/demos/desertpillars/data/exported/Sand.007.mesh
index db8363e0..e1f186db 100644
--- a/demos/desertpillars/data/exported/Sand.007.mesh
+++ b/demos/desertpillars/data/exported/Sand.007.mesh
@@ -1,4 +1,4 @@
-vertices NORMAL3_BYTE TANGENT3_BYTE TEXCOORD2_FLOAT VERTEX3_FLOAT
+vertices VERTEX3_FLOAT TEXCOORD2_FLOAT NORMAL3_BYTE TANGENT3_BYTE PADDING2_UBYTE
 {
 	normal 0.379343 0.383410 0.842078;
 	texcoord -15.4967 16.4967;
diff --git a/demos/desertpillars/data/exported/Sand.008.mesh b/demos/desertpillars/data/exported/Sand.008.mesh
index 05d258e7..9b6d9aac 100644
--- a/demos/desertpillars/data/exported/Sand.008.mesh
+++ b/demos/desertpillars/data/exported/Sand.008.mesh
@@ -1,4 +1,4 @@
-vertices NORMAL3_BYTE TANGENT3_BYTE TEXCOORD2_FLOAT VERTEX3_FLOAT
+vertices VERTEX3_FLOAT TEXCOORD2_FLOAT NORMAL3_BYTE TANGENT3_BYTE PADDING2_UBYTE
 {
 	normal 0.00000 0.00000 1.00000;
 	texcoord 16.4968 -15.4968;
diff --git a/demos/desertpillars/data/exported/Sand.mesh b/demos/desertpillars/data/exported/Sand.mesh
index ebaa73ab..39b4a4d1 100644
--- a/demos/desertpillars/data/exported/Sand.mesh
+++ b/demos/desertpillars/data/exported/Sand.mesh
@@ -1,4 +1,4 @@
-vertices NORMAL3_BYTE TANGENT3_BYTE TEXCOORD2_FLOAT VERTEX3_FLOAT
+vertices VERTEX3_FLOAT TEXCOORD2_FLOAT NORMAL3_BYTE TANGENT3_BYTE PADDING2_UBYTE
 {
 	normal 0.00000 0.00000 1.00000;
 	texcoord 16.4968 16.4968;
diff --git a/demos/desertpillars/data/exported/Sphere.mesh b/demos/desertpillars/data/exported/Sphere.mesh
index e89362c2..edc21a72 100644
--- a/demos/desertpillars/data/exported/Sphere.mesh
+++ b/demos/desertpillars/data/exported/Sphere.mesh
@@ -1,4 +1,4 @@
-vertices NORMAL3_BYTE TEXCOORD2_USHORT VERTEX3_FLOAT
+vertices VERTEX3_FLOAT TEXCOORD2_USHORT NORMAL3_BYTE PADDING1_UBYTE
 {
 	normal 1.38894e-06 -2.96530e-10 -1.00000;
 	texcoord 0.818181 0.00000;
diff --git a/demos/desertpillars/data/exported/Stone tiles.mesh b/demos/desertpillars/data/exported/Stone tiles.mesh
index fbf5519d..9f9ad89f 100644
--- a/demos/desertpillars/data/exported/Stone tiles.mesh	
+++ b/demos/desertpillars/data/exported/Stone tiles.mesh	
@@ -1,4 +1,4 @@
-vertices NORMAL3_BYTE TANGENT3_BYTE TEXCOORD2_FLOAT VERTEX3_FLOAT
+vertices VERTEX3_FLOAT TEXCOORD2_FLOAT NORMAL3_BYTE TANGENT3_BYTE PADDING2_UBYTE
 {
 	normal -1.00000 0.00000 0.00000;
 	texcoord 1.25948 0.749830;