birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Legacy cleanup, part 2 (#3659)

Browse Source 
* Legacy cleanup, part 2

There are still things that can be removed, those will be likely done in part three:
`The Return of the Cleanup` :)

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Fix windows build

Somehow there were some unfixed errors from enabled warnings?
I'm unsure if I've pulled repo in unstable state, or those were somehow
missed.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
This commit is contained in:
Artur K
2021-08-30 22:40:02 +02:00
committed by GitHub
parent fa0f2a1007
commit 96a5f06ca3
116 changed files with 189 additions and 18706 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Legacy/CryCommon/VertexFormats.h
+2 -839
View File
@@ -7,12 +7,9 @@
*/
#ifndef CRYINCLUDE_CRYCOMMON_VERTEXFORMATS_H
#define CRYINCLUDE_CRYCOMMON_VERTEXFORMATS_H
#pragma once
#include <CryArray.h>
#include <CryCommon/Cry_Math.h>
// Stream Configuration options
#define ENABLE_NORMALSTREAM_SUPPORT 1
@@ -22,94 +19,16 @@ enum EVertexFormat : uint8
// Base stream
eVF_P3F_C4B_T2F,
eVF_P3F_C4B_T2F_T2F,
eVF_P3S_C4B_T2S,
eVF_P3S_C4B_T2S_T2S, // For UV2 support
eVF_P3S_N4B_C4B_T2S,
eVF_P3F_C4B_T4B_N3F2, // Particles.
eVF_TP3F_C4B_T2F, // Fonts (28 bytes).
eVF_TP3F_T2F_T3F, // Miscellaneus.
eVF_P3F_T3F, // Miscellaneus. (AuxGeom)
eVF_P3F_T2F_T3F, // Miscellaneus.
// Additional streams
eVF_T2F, // Light maps TC (8 bytes).
eVF_W4B_I4S, // Skinned weights/indices stream.
eVF_C4B_C4B, // SH coefficients.
eVF_P3F_P3F_I4B, // Shape deformation stream.
eVF_P3F, // Velocity stream.
eVF_C4B_T2S, // General (Position is merged with Tangent stream)
// Lens effects simulation
eVF_P2F_T4F_C4F, // primary
eVF_P2F_T4F_T4F_C4F,
eVF_P2S_N4B_C4B_T1F,
eVF_P3F_C4B_T2S,
eVF_P2F_C4B_T2F_F4B, // UI
eVF_P3F_C4B,// Auxiliary geometry
eVF_P3F_C4F_T2F, //numbering for tracking the new vertex formats and for comparison with testing 23
eVF_P3F_C4F_T2F_T3F,
eVF_P3F_C4F_T2F_T3F_T3F,
eVF_P3F_C4F_T2F_T1F,
eVF_P3F_C4F_T2F_T1F_T3F,
eVF_P3F_C4F_T2F_T1F_T3F_T3F,
eVF_P3F_C4F_T4F_T2F,
eVF_P3F_C4F_T4F_T2F_T3F, //30
eVF_P3F_C4F_T4F_T2F_T3F_T3F,
eVF_P3F_C4F_T4F_T2F_T1F,
eVF_P3F_C4F_T4F_T2F_T1F_T3F,
eVF_P3F_C4F_T4F_T2F_T1F_T3F_T3F,
eVF_P3F_C4F_T2F_T2F_T1F, //35
eVF_P3F_C4F_T2F_T2F_T1F_T3F,
eVF_P3F_C4F_T2F_T2F_T1F_T3F_T3F,
eVF_P3F_C4F_T2F_T2F_T1F_T1F,
eVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F,
eVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F_T3F, //40
eVF_P4F_T2F_C4F_T4F_T4F,
eVF_P3F_C4F_T2F_T4F,
eVF_P3F_C4F_T2F_T3F_T4F,
eVF_P3F_C4F_T2F_T3F_T3F_T4F,
eVF_P3F_C4F_T2F_T1F_T4F, //45
eVF_P3F_C4F_T2F_T1F_T3F_T4F,
eVF_P3F_C4F_T2F_T1F_T3F_T3F_T4F,
eVF_P3F_C4F_T4F_T2F_T4F,
eVF_P3F_C4F_T4F_T2F_T3F_T4F,
eVF_P3F_C4F_T4F_T2F_T3F_T3F_T4F, //50
eVF_P3F_C4F_T4F_T2F_T1F_T4F,
eVF_P3F_C4F_T4F_T2F_T1F_T3F_T4F,
eVF_P3F_C4F_T4F_T2F_T1F_T3F_T3F_T4F,
eVF_P3F_C4F_T2F_T2F_T1F_T4F,
eVF_P3F_C4F_T2F_T2F_T1F_T3F_T4F, //55
eVF_P3F_C4F_T2F_T2F_T1F_T3F_T3F_T4F,
eVF_P3F_C4F_T2F_T2F_T1F_T1F_T4F,
eVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F_T4F,
eVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F_T3F_T4F,
eVF_P4F_T2F_C4F_T4F_T4F_T4F, //60
eVF_P3F_C4F_T2F_T4F_T4F,
eVF_P3F_C4F_T2F_T3F_T4F_T4F,
eVF_P3F_C4F_T2F_T3F_T3F_T4F_T4F,
eVF_P3F_C4F_T2F_T1F_T4F_T4F,
eVF_P3F_C4F_T2F_T1F_T3F_T4F_T4F, //65
eVF_P3F_C4F_T2F_T1F_T3F_T3F_T4F_T4F,
eVF_P3F_C4F_T4F_T2F_T4F_T4F,
eVF_P3F_C4F_T4F_T2F_T3F_T4F_T4F,
eVF_P3F_C4F_T4F_T2F_T3F_T3F_T4F_T4F,
eVF_P3F_C4F_T4F_T2F_T1F_T4F_T4F, //70
eVF_P3F_C4F_T4F_T2F_T1F_T3F_T4F_T4F,
eVF_P3F_C4F_T4F_T2F_T1F_T3F_T3F_T4F_T4F,
eVF_P3F_C4F_T2F_T2F_T1F_T4F_T4F,
eVF_P3F_C4F_T2F_T2F_T1F_T3F_T4F_T4F,
eVF_P3F_C4F_T2F_T2F_T1F_T3F_T3F_T4F_T4F, //75
eVF_P3F_C4F_T2F_T2F_T1F_T1F_T4F_T4F,
eVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F_T4F_T4F,
eVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F_T3F_T4F_T4F,
eVF_P4F_T2F_C4F_T4F_T4F_T4F_T4F,
eVF_Max,
};
@@ -143,8 +62,6 @@ struct UCol
(bcolor[2] - 128.0f) / 127.5f
);
}
AUTO_STRUCT_INFO
};
struct Vec3f16
@@ -242,14 +159,6 @@ struct SVF_P3F_C4B_T2F
Vec2 st;
};
struct SVF_P3F_C4B_T2F_T2F
{
Vec3 xyz;
UCol color;
Vec2 st;
Vec2 st2;
};
struct SVF_P2F_C4B_T2F_F4B
{
Vec2 xy;
@@ -261,743 +170,23 @@ struct SVF_P2F_C4B_T2F_F4B
uint8 pad;
};
struct SVF_TP3F_C4B_T2F //Fonts
{
Vec4 pos;
UCol color;
Vec2 st;
};
struct SVF_P3S_C4B_T2S
{
Vec3f16 xyz;
UCol color;
Vec2f16 st;
AUTO_STRUCT_INFO
};
struct SVF_P3S_C4B_T2S_T2S
{
Vec3f16 xyz;
UCol color;
Vec2f16 st;
Vec2f16 st2;
AUTO_STRUCT_INFO
};
struct SVF_P3F_C4B_T2S
{
Vec3 xyz;
UCol color;
Vec2f16 st;
};
struct SVF_P3S_N4B_C4B_T2S
{
Vec3f16 xyz;
UCol normal;
UCol color;
Vec2f16 st;
};
struct SVF_P2S_N4B_C4B_T1F
{
CryHalf2 xy;
UCol normal;
UCol color;
float z;
};
struct SVF_T2F
{
Vec2 st;
};
struct SVF_W4B_I4S
{
UCol weights;
uint16 indices[4];
};
struct SVF_C4B_C4B
{
UCol coef0;
UCol coef1;
};
struct SVF_P3F_P3F_I4B
{
Vec3 thin;
Vec3 fat;
UCol index;
};
struct SVF_P3F
{
Vec3 xyz;
};
struct SVF_P3F_T3F
{
Vec3 p;
Vec3 st;
};
struct SVF_P3F_T2F_T3F
{
Vec3 p;
Vec2 st0;
Vec3 st1;
};
struct SVF_TP3F_T2F_T3F
{
Vec4 p;
Vec2 st0;
Vec3 st1;
};
struct SVF_P2F_T4F_C4F
{
Vec2 p;
Vec4 st;
Vec4 color;
};
struct SVF_P2F_T4F_T4F_C4F
{
Vec2 p;
Vec4 st;
Vec4 st2;
Vec4 color;
};
struct SVF_P3F_C4B_I4B_PS4F
{
Vec3 xyz;
Vec2 prevXaxis;
Vec2 prevYaxis;
UCol color;
Vec3 prevPos;
struct SpriteInfo
{
uint8 tex_x, tex_y, tex_z, backlight; // xyzw
} info;
Vec2 xaxis;
Vec2 yaxis;
};
struct SVF_P3F_C4B_T4B_N3F2
{
Vec3 xyz;
UCol color;
UCol st; // st is used as a color, even though st usually refers to a TexCoord
Vec3 xaxis;
Vec3 yaxis;
#ifdef PARTICLE_MOTION_BLUR
Vec3 prevPos;
Vec3 prevXTan;
Vec3 prevYTan;
#endif
};
struct SVF_C4B_T2S
{
UCol color;
Vec2f16 st;
};
struct SVF_P3F_C4F_T2F
{
Vec3 xyz;
Vec4 color;
Vec2 st;
};
struct SVF_P3F_C4F_T2F_T3F
{
Vec3 xyz;
Vec4 color;
Vec2 st0;
Vec3 st1;
};
struct SVF_P3F_C4F_T2F_T3F_T3F
{
Vec3 xyz;
Vec4 color;
Vec2 st0;
Vec3 st1;
Vec3 st2;
};
struct SVF_P3F_C4F_T2F_T1F
{
Vec3 xyz;
Vec4 color;
Vec2 st;
float z;
};
struct SVF_P3F_C4F_T2F_T1F_T3F
{
Vec3 xyz;
Vec4 color;
Vec2 st0;
float z;
Vec3 st1;
};
struct SVF_P3F_C4F_T2F_T1F_T3F_T3F
{
Vec3 xyz;
Vec4 color;
Vec2 st0;
float z;
Vec3 st1;
Vec3 st2;
};
struct SVF_P3F_C4F_T4F_T2F
{
Vec3 xyz;
Vec4 color;
Vec4 st0;
Vec2 st1;
};
struct SVF_P3F_C4F_T4F_T2F_T3F
{
Vec3 xyz;
Vec4 color;
Vec4 st0;
Vec2 st1;
Vec3 st2;
};
struct SVF_P3F_C4F_T4F_T2F_T3F_T3F
{
Vec3 xyz;
Vec4 color;
Vec4 st0;
Vec2 st1;
Vec3 st2;
Vec3 st3;
};
struct SVF_P3F_C4F_T4F_T2F_T1F
{
Vec3 xyz;
Vec4 color;
Vec4 st0;
Vec2 st1;
float z;
};
struct SVF_P3F_C4F_T4F_T2F_T1F_T3F
{
Vec3 xyz;
Vec4 color;
Vec4 st0;
Vec2 st1;
float z;
Vec3 st2;
};
struct SVF_P3F_C4F_T4F_T2F_T1F_T3F_T3F
{
Vec3 xyz;
Vec4 color;
Vec4 st0;
Vec2 st1;
float z;
Vec3 st2;
Vec3 st3;
};
struct SVF_P3F_C4F_T2F_T2F_T1F
{
Vec3 xyz;
Vec4 color;
Vec2 st0;
Vec2 st1;
float z;
};
struct SVF_P3F_C4F_T2F_T2F_T1F_T3F
{
Vec3 xyz;
Vec4 color;
Vec2 st0;
Vec2 st1;
float z;
Vec3 st2;
};
struct SVF_P3F_C4F_T2F_T2F_T1F_T3F_T3F
{
Vec3 xyz;
Vec4 color;
Vec2 st0;
Vec2 st1;
float z;
Vec3 st2;
Vec3 st3;
};
struct SVF_P3F_C4F_T2F_T2F_T1F_T1F
{
Vec3 xyz;
Vec4 color;
Vec2 st0;
Vec2 st1;
float z0;
float z1;
};
struct SVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F
{
Vec3 xyz;
Vec4 color;
Vec2 st0;
Vec2 st1;
float z0;
float z1;
Vec3 st2;
};
struct SVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F_T3F
{
Vec3 xyz;
Vec4 color;
Vec2 st0;
Vec2 st1;
float z0;
float z1;
Vec3 st2;
Vec3 st3;
};
struct SVF_P4F_T2F_C4F_T4F_T4F
{
Vec4 xyzw;
Vec2 st0;
Vec4 color;
Vec4 st1;
Vec4 st2;
};
struct SVF_P3F_C4F_T2F_T4F
{
Vec3 xyz;
Vec4 color;
Vec2 st0;
Vec4 st1;
};
struct SVF_P3F_C4F_T2F_T3F_T4F
{
Vec3 xyz;
Vec4 color;
Vec2 st0;
Vec3 st1;
Vec4 st2;
};
struct SVF_P3F_C4F_T2F_T3F_T3F_T4F
{
Vec3 xyz;
Vec4 color;
Vec2 st0;
Vec3 st1;
Vec3 st2;
Vec4 st3;
};
struct SVF_P3F_C4F_T2F_T1F_T4F
{
Vec3 xyz;
Vec4 color;
Vec2 st0;
float z;
Vec4 st1;
};
struct SVF_P3F_C4F_T2F_T1F_T3F_T4F
{
Vec3 xyz;
Vec4 color;
Vec2 st0;
float z;
Vec3 st1;
Vec4 st2;
};
struct SVF_P3F_C4F_T2F_T1F_T3F_T3F_T4F
{
Vec3 xyz;
Vec4 color;
Vec2 st0;
float z;
Vec3 st1;
Vec3 st2;
Vec4 st3;
};
struct SVF_P3F_C4F_T4F_T2F_T4F
{
Vec3 xyz;
Vec4 color;
Vec4 st0;
Vec2 st1;
Vec4 st2;
};
struct SVF_P3F_C4F_T4F_T2F_T3F_T4F
{
Vec3 xyz;
Vec4 color;
Vec4 st0;
Vec2 st1;
Vec3 st2;
Vec4 st3;
};
struct SVF_P3F_C4F_T4F_T2F_T3F_T3F_T4F
{
Vec3 xyz;
Vec4 color;
Vec4 st0;
Vec2 st1;
Vec3 st2;
Vec3 st3;
Vec4 st4;
};
struct SVF_P3F_C4F_T4F_T2F_T1F_T4F
{
Vec3 xyz;
Vec4 color;
Vec4 st0;
Vec2 st1;
float z;
Vec4 st2;
};
struct SVF_P3F_C4F_T4F_T2F_T1F_T3F_T4F
{
Vec3 xyz;
Vec4 color;
Vec4 st0;
Vec2 st1;
float z;
Vec3 st2;
Vec4 st3;
};
struct SVF_P3F_C4F_T4F_T2F_T1F_T3F_T3F_T4F
{
Vec3 xyz;
Vec4 color;
Vec4 st0;
Vec2 st1;
float z;
Vec3 st2;
Vec3 st3;
Vec4 st4;
};
struct SVF_P3F_C4F_T2F_T2F_T1F_T4F
{
Vec3 xyz;
Vec4 color;
Vec2 st0;
Vec2 st1;
float z;
Vec4 st2;
};
struct SVF_P3F_C4F_T2F_T2F_T1F_T3F_T4F
{
Vec3 xyz;
Vec4 color;
Vec2 st0;
Vec2 st1;
float z;
Vec3 st2;
Vec4 st3;
};
struct SVF_P3F_C4F_T2F_T2F_T1F_T3F_T3F_T4F
{
Vec3 xyz;
Vec4 color;
Vec2 st0;
Vec2 st1;
float z;
Vec3 st2;
Vec3 st3;
Vec4 st4;
};
struct SVF_P3F_C4F_T2F_T2F_T1F_T1F_T4F
{
Vec3 xyz;
Vec4 color;
Vec2 st0;
Vec2 st1;
float z0;
float z1;
Vec4 st2;
};
struct SVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F_T4F
{
Vec3 xyz;
Vec4 color;
Vec2 st0;
Vec2 st1;
float z0;
float z1;
Vec3 st2;
Vec4 st3;
};
struct SVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F_T3F_T4F
{
Vec3 xyz;
Vec4 color;
Vec2 st0;
Vec2 st1;
float z0;
float z1;
Vec3 st2;
Vec3 st3;
Vec4 st4;
};
struct SVF_P4F_T2F_C4F_T4F_T4F_T4F
{
Vec4 xyzw;
Vec2 st0;
Vec4 color;
Vec4 st1;
Vec4 st2;
Vec4 st3;
};
struct SVF_P3F_C4F_T2F_T4F_T4F
{
Vec3 xyz;
Vec4 color;
Vec2 st0;
Vec4 st1;
Vec4 st2;
};
struct SVF_P3F_C4F_T2F_T3F_T4F_T4F
{
Vec3 xyz;
Vec4 color;
Vec2 st0;
Vec3 st1;
Vec4 st2;
Vec4 st3;
};
struct SVF_P3F_C4F_T2F_T3F_T3F_T4F_T4F
{
Vec3 xyz;
Vec4 color;
Vec2 st0;
Vec3 st1;
Vec3 st2;
Vec4 st3;
Vec4 st4;
};
struct SVF_P3F_C4F_T2F_T1F_T4F_T4F
{
Vec3 xyz;
Vec4 color;
Vec2 st0;
float z;
Vec4 st1;
Vec4 st2;
};
struct SVF_P3F_C4F_T2F_T1F_T3F_T4F_T4F
{
Vec3 xyz;
Vec4 color;
Vec2 st0;
float z;
Vec3 st1;
Vec4 st2;
Vec4 st3;
};
struct SVF_P3F_C4F_T2F_T1F_T3F_T3F_T4F_T4F
{
Vec3 xyz;
Vec4 color;
Vec2 st0;
float z;
Vec3 st1;
Vec3 st2;
Vec4 st3;
Vec4 st4;
};
struct SVF_P3F_C4F_T4F_T2F_T4F_T4F
{
Vec3 xyz;
Vec4 color;
Vec4 st0;
Vec2 st1;
Vec4 st2;
Vec4 st3;
};
struct SVF_P3F_C4F_T4F_T2F_T3F_T4F_T4F
{
Vec3 xyz;
Vec4 color;
Vec4 st0;
Vec2 st1;
Vec3 st2;
Vec4 st3;
Vec4 st4;
};
struct SVF_P3F_C4F_T4F_T2F_T3F_T3F_T4F_T4F
{
Vec3 xyz;
Vec4 color;
Vec4 st0;
Vec2 st1;
Vec3 st2;
Vec3 st3;
Vec4 st4;
Vec4 st5;
};
struct SVF_P3F_C4F_T4F_T2F_T1F_T4F_T4F
{
Vec3 xyz;
Vec4 color;
Vec4 st0;
Vec2 st1;
float z;
Vec4 st2;
Vec4 st3;
};
struct SVF_P3F_C4F_T4F_T2F_T1F_T3F_T4F_T4F
{
Vec3 xyz;
Vec4 color;
Vec4 st0;
Vec2 st1;
float z;
Vec3 st2;
Vec4 st3;
Vec4 st4;
};
struct SVF_P3F_C4F_T4F_T2F_T1F_T3F_T3F_T4F_T4F
{
Vec3 xyz;
Vec4 color;
Vec4 st0;
Vec2 st1;
float z;
Vec3 st2;
Vec3 st3;
Vec4 st4;
Vec4 st5;
};
struct SVF_P3F_C4F_T2F_T2F_T1F_T4F_T4F
{
Vec3 xyz;
Vec4 color;
Vec2 st0;
Vec2 st1;
float z;
Vec4 st2;
Vec4 st3;
};
struct SVF_P3F_C4F_T2F_T2F_T1F_T3F_T4F_T4F
{
Vec3 xyz;
Vec4 color;
Vec2 st0;
Vec2 st1;
float z;
Vec3 st2;
Vec4 st3;
Vec4 st4;
};
struct SVF_P3F_C4F_T2F_T2F_T1F_T3F_T3F_T4F_T4F
{
Vec3 xyz;
Vec4 color;
Vec2 st0;
Vec2 st1;
float z;
Vec3 st2;
Vec3 st3;
Vec4 st4;
Vec4 st5;
};
struct SVF_P3F_C4F_T2F_T2F_T1F_T1F_T4F_T4F
{
Vec3 xyz;
Vec4 color;
Vec2 st0;
Vec2 st1;
float z0;
float z1;
Vec4 st2;
Vec4 st3;
};
struct SVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F_T4F_T4F
{
Vec3 xyz;
Vec4 color;
Vec2 st0;
Vec2 st1;
float z0;
float z1;
Vec3 st2;
Vec4 st3;
Vec4 st4;
};
struct SVF_P3F_C4F_T2F_T2F_T1F_T1F_T3F_T3F_T4F_T4F
{
Vec3 xyz;
Vec4 color;
Vec2 st0;
Vec2 st1;
float z0;
float z1;
Vec3 st2;
Vec3 st3;
Vec4 st4;
Vec4 st5;
};
struct SVF_P4F_T2F_C4F_T4F_T4F_T4F_T4F
{
Vec4 xyzw;
Vec2 st0;
Vec4 color;
Vec4 st1;
Vec4 st2;
Vec4 st3;
Vec4 st4;
};
//=============================================================
// Signed norm value packing [-1,+1]
@@ -1240,8 +429,6 @@ public:
*this = SPipTangents(tng3, btg3, PackingSNorm::tPackB2S(Tangent.w));
}
friend struct SMeshTangents;
};
struct SPipQTangents
@@ -1290,8 +477,6 @@ public:
const Quat q = GetQ();
return q.GetColumn2() * (q.w < 0.0f ? -1.0f : +1.0f);
}
friend struct SMeshQTangents;
};
struct SPipNormal
@@ -1328,8 +513,6 @@ struct SPipNormal
// normalize in case "trn" wasn't length-preserving
*this = SPipNormal(trn.TransformVector(*this).normalize());
}
friend struct SMeshNormal;
};
//==================================================================================================
@@ -1364,24 +547,4 @@ enum EStreamIDs
VSF_MORPHBUDDY_WEIGHTS = 15, // Morphing weights
};
// Stream Masks (Used during updating)
enum EStreamMasks
{
VSM_GENERAL = 1 << VSF_GENERAL,
VSM_TANGENTS = ((1 << VSF_TANGENTS) | (1 << VSF_QTANGENTS)),
VSM_HWSKIN = 1 << VSF_HWSKIN_INFO,
VSM_VERTEX_VELOCITY = 1 << VSF_VERTEX_VELOCITY,
# if ENABLE_NORMALSTREAM_SUPPORT
VSM_NORMALS = 1 << VSF_NORMALS,
#endif
VSM_MORPHBUDDY = 1 << VSF_MORPHBUDDY,
VSM_INSTANCED = 1 << VSF_INSTANCED,
VSM_MASK = ((1 << VSF_NUM) - 1),
};
//==================================================================================================================
#endif // CRYINCLUDE_CRYCOMMON_VERTEXFORMATS_H