From 49438a606bd0ef7aa6e93cb04252083d048de13d Mon Sep 17 00:00:00 2001
From: aloucks <aloucks@cofront.net>
Date: Wed, 14 Apr 2021 23:21:53 +0000
Subject: [PATCH] Add additional vertex formats (#1878)

- `Short2`
- `Short2Norm`
- `Ushort2`
- `Ushort2Norm`
- `Short4`
- `Short4Norm`
- `Ushort4`
- `Ushort4Norm`
- `Char2`
- `Char2Norm`
- `Uchar2`
- `Uchar2Norm`
- `Char4`
- `Char4Norm`
- `Uchar4`
---
 crates/bevy_render/src/mesh/mesh.rs | 60 +++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)

diff --git a/crates/bevy_render/src/mesh/mesh.rs b/crates/bevy_render/src/mesh/mesh.rs
index 0258d6b51115f..9cab04b854374 100644
--- a/crates/bevy_render/src/mesh/mesh.rs
+++ b/crates/bevy_render/src/mesh/mesh.rs
@@ -38,6 +38,21 @@ pub enum VertexAttributeValues {
     Float4(Vec<[f32; 4]>),
     Int4(Vec<[i32; 4]>),
     Uint4(Vec<[u32; 4]>),
+    Short2(Vec<[i16; 2]>),
+    Short2Norm(Vec<[i16; 2]>),
+    Ushort2(Vec<[u16; 2]>),
+    Ushort2Norm(Vec<[u16; 2]>),
+    Short4(Vec<[i16; 4]>),
+    Short4Norm(Vec<[i16; 4]>),
+    Ushort4(Vec<[u16; 4]>),
+    Ushort4Norm(Vec<[u16; 4]>),
+    Char2(Vec<[i8; 2]>),
+    Char2Norm(Vec<[i8; 2]>),
+    Uchar2(Vec<[u8; 2]>),
+    Uchar2Norm(Vec<[u8; 2]>),
+    Char4(Vec<[i8; 4]>),
+    Char4Norm(Vec<[i8; 4]>),
+    Uchar4(Vec<[u8; 4]>),
     Uchar4Norm(Vec<[u8; 4]>),
 }
 
@@ -58,6 +73,21 @@ impl VertexAttributeValues {
             VertexAttributeValues::Float4(ref values) => values.len(),
             VertexAttributeValues::Int4(ref values) => values.len(),
             VertexAttributeValues::Uint4(ref values) => values.len(),
+            VertexAttributeValues::Short2(ref values) => values.len(),
+            VertexAttributeValues::Short2Norm(ref values) => values.len(),
+            VertexAttributeValues::Ushort2(ref values) => values.len(),
+            VertexAttributeValues::Ushort2Norm(ref values) => values.len(),
+            VertexAttributeValues::Short4(ref values) => values.len(),
+            VertexAttributeValues::Short4Norm(ref values) => values.len(),
+            VertexAttributeValues::Ushort4(ref values) => values.len(),
+            VertexAttributeValues::Ushort4Norm(ref values) => values.len(),
+            VertexAttributeValues::Char2(ref values) => values.len(),
+            VertexAttributeValues::Char2Norm(ref values) => values.len(),
+            VertexAttributeValues::Uchar2(ref values) => values.len(),
+            VertexAttributeValues::Uchar2Norm(ref values) => values.len(),
+            VertexAttributeValues::Char4(ref values) => values.len(),
+            VertexAttributeValues::Char4Norm(ref values) => values.len(),
+            VertexAttributeValues::Uchar4(ref values) => values.len(),
             VertexAttributeValues::Uchar4Norm(ref values) => values.len(),
         }
     }
@@ -84,6 +114,21 @@ impl VertexAttributeValues {
             VertexAttributeValues::Float4(values) => values.as_slice().as_bytes(),
             VertexAttributeValues::Int4(values) => values.as_slice().as_bytes(),
             VertexAttributeValues::Uint4(values) => values.as_slice().as_bytes(),
+            VertexAttributeValues::Short2(values) => values.as_slice().as_bytes(),
+            VertexAttributeValues::Short2Norm(values) => values.as_slice().as_bytes(),
+            VertexAttributeValues::Ushort2(values) => values.as_slice().as_bytes(),
+            VertexAttributeValues::Ushort2Norm(values) => values.as_slice().as_bytes(),
+            VertexAttributeValues::Short4(values) => values.as_slice().as_bytes(),
+            VertexAttributeValues::Short4Norm(values) => values.as_slice().as_bytes(),
+            VertexAttributeValues::Ushort4(values) => values.as_slice().as_bytes(),
+            VertexAttributeValues::Ushort4Norm(values) => values.as_slice().as_bytes(),
+            VertexAttributeValues::Char2(values) => values.as_slice().as_bytes(),
+            VertexAttributeValues::Char2Norm(values) => values.as_slice().as_bytes(),
+            VertexAttributeValues::Uchar2(values) => values.as_slice().as_bytes(),
+            VertexAttributeValues::Uchar2Norm(values) => values.as_slice().as_bytes(),
+            VertexAttributeValues::Char4(values) => values.as_slice().as_bytes(),
+            VertexAttributeValues::Char4Norm(values) => values.as_slice().as_bytes(),
+            VertexAttributeValues::Uchar4(values) => values.as_slice().as_bytes(),
             VertexAttributeValues::Uchar4Norm(values) => values.as_slice().as_bytes(),
         }
     }
@@ -104,6 +149,21 @@ impl From<&VertexAttributeValues> for VertexFormat {
             VertexAttributeValues::Float4(_) => VertexFormat::Float4,
             VertexAttributeValues::Int4(_) => VertexFormat::Int4,
             VertexAttributeValues::Uint4(_) => VertexFormat::Uint4,
+            VertexAttributeValues::Short2(_) => VertexFormat::Short2,
+            VertexAttributeValues::Short2Norm(_) => VertexFormat::Short2Norm,
+            VertexAttributeValues::Ushort2(_) => VertexFormat::Ushort2,
+            VertexAttributeValues::Ushort2Norm(_) => VertexFormat::Ushort2Norm,
+            VertexAttributeValues::Short4(_) => VertexFormat::Short4,
+            VertexAttributeValues::Short4Norm(_) => VertexFormat::Short4Norm,
+            VertexAttributeValues::Ushort4(_) => VertexFormat::Ushort4,
+            VertexAttributeValues::Ushort4Norm(_) => VertexFormat::Ushort4Norm,
+            VertexAttributeValues::Char2(_) => VertexFormat::Char2,
+            VertexAttributeValues::Char2Norm(_) => VertexFormat::Char2Norm,
+            VertexAttributeValues::Uchar2(_) => VertexFormat::Uchar2,
+            VertexAttributeValues::Uchar2Norm(_) => VertexFormat::Uchar2Norm,
+            VertexAttributeValues::Char4(_) => VertexFormat::Char4,
+            VertexAttributeValues::Char4Norm(_) => VertexFormat::Char4Norm,
+            VertexAttributeValues::Uchar4(_) => VertexFormat::Uchar4,
             VertexAttributeValues::Uchar4Norm(_) => VertexFormat::Uchar4Norm,
         }
     }