UPBGE: Use RAS_VertexFormatType to specify format in RAS_VertexData template.

panzergame · panzergame · commit 091804c1eafc · 2017-12-14T22:45:10.000+01:00
Instead using two parameters to intanciate the RAS_VertexData template
class, one struct is used: RAS_VertexFormatType, this struct also include
the enum for the uv and color size.
diff --git a/source/gameengine/Rasterizer/CMakeLists.txt b/source/gameengine/Rasterizer/CMakeLists.txt
@@ -126,6 +126,7 @@ set(SRC
 	RAS_TextUser.h
 	RAS_Vertex.h
 	RAS_VertexData.h
+	RAS_VertexFormat.h
 )
 
 data_to_c_simple(RAS_OpenGLFilters/RAS_Blur2DFilter.glsl SRC)
diff --git a/source/gameengine/Rasterizer/RAS_IBatchDisplayArray.cpp b/source/gameengine/Rasterizer/RAS_IBatchDisplayArray.cpp
@@ -38,7 +38,7 @@ RAS_IBatchDisplayArray::~RAS_IBatchDisplayArray()
 
 #define NEW_DISPLAY_ARRAY_UV(vertformat, uv, color, primtype) \
 	if (vertformat.uvSize == uv && vertformat.colorSize == color) { \
-		return new RAS_BatchDisplayArray<RAS_VertexData<uv, color> >(primtype, vertformat); \
+		return new RAS_BatchDisplayArray<RAS_VertexData<RAS_VertexFormatType<uv, color> > >(primtype, vertformat); \
 	}
 
 #define NEW_DISPLAY_ARRAY_COLOR(vertformat, color, primtype) \
diff --git a/source/gameengine/Rasterizer/RAS_IDisplayArray.cpp b/source/gameengine/Rasterizer/RAS_IDisplayArray.cpp
@@ -84,7 +84,7 @@ RAS_IDisplayArray::~RAS_IDisplayArray()
 
 #define NEW_DISPLAY_ARRAY_UV(vertformat, uv, color, primtype) \
 	if (vertformat.uvSize == uv && vertformat.colorSize == color) { \
-		return new RAS_DisplayArray<RAS_VertexData<uv, color> >(primtype, vertformat); \
+		return new RAS_DisplayArray<RAS_VertexData<RAS_VertexFormatType<uv, color> > >(primtype, vertformat); \
 	}
 
 #define NEW_DISPLAY_ARRAY_COLOR(vertformat, color, primtype) \
diff --git a/source/gameengine/Rasterizer/RAS_Vertex.cpp b/source/gameengine/Rasterizer/RAS_Vertex.cpp
@@ -31,16 +31,6 @@
 
 #include "RAS_Vertex.h"
 
-bool operator== (const RAS_VertexFormat& format1, const RAS_VertexFormat& format2)
-{
-	return (format1.uvSize == format2.uvSize && format1.colorSize == format2.colorSize);
-}
-
-bool operator!= (const RAS_VertexFormat& format1, const RAS_VertexFormat& format2)
-{
-	return !(format1 == format2);
-}
-
 RAS_VertexInfo::RAS_VertexInfo(unsigned int origindex, bool flat)
 	:m_origindex(origindex)
 {
diff --git a/source/gameengine/Rasterizer/RAS_Vertex.h b/source/gameengine/Rasterizer/RAS_Vertex.h
@@ -33,17 +33,6 @@
 
 #include "BLI_math_vector.h"
 
-/// Struct used to pass the vertex format to functions.
-struct RAS_VertexFormat
-{
-	uint8_t uvSize;
-	uint8_t colorSize;
-};
-
-/// Operators used to compare the contents (uv size, color size, ...) of two vertex formats.
-bool operator== (const RAS_VertexFormat& format1, const RAS_VertexFormat& format2);
-bool operator!= (const RAS_VertexFormat& format1, const RAS_VertexFormat& format2);
-
 class RAS_VertexInfo
 {
 public:
diff --git a/source/gameengine/Rasterizer/RAS_VertexData.h b/source/gameengine/Rasterizer/RAS_VertexData.h
@@ -3,6 +3,8 @@
 
 #include "mathfu.h"
 
+#include "RAS_VertexFormat.h"
+
 #include "BLI_math_vector.h"
 
 struct RAS_VertexDataBasic
@@ -28,32 +30,32 @@ struct RAS_VertexDataBasic
 	}
 };
 
-template <unsigned short uvSize, unsigned short colorSize>
+template <class Format>
 struct RAS_VertexDataExtra
 {
-	float uvs[uvSize][2];
-	unsigned int colors[colorSize];
+	float uvs[Format::UvSize][2];
+	unsigned int colors[Format::ColorSize];
 
 	inline RAS_VertexDataExtra() = default;
 
-	inline RAS_VertexDataExtra(const mt::vec2 _uvs[uvSize], const unsigned int _colors[colorSize])
+	inline RAS_VertexDataExtra(const mt::vec2 _uvs[Format::UvSize], const unsigned int _colors[Format::ColorSize])
 	{
-		for (unsigned short i = 0; i < uvSize; ++i) {
+		for (unsigned short i = 0; i < Format::UvSize; ++i) {
 			_uvs[i].Pack(uvs[i]);
 		}
 
-		for (unsigned short i = 0; i < colorSize; ++i) {
+		for (unsigned short i = 0; i < Format::ColorSize; ++i) {
 			colors[i] = _colors[i];
 		}
 	}
 
-	inline RAS_VertexDataExtra(const float _uvs[uvSize][2], const unsigned int _colors[colorSize])
+	inline RAS_VertexDataExtra(const float _uvs[Format::UvSize][2], const unsigned int _colors[Format::ColorSize])
 	{
-		for (unsigned short i = 0; i < uvSize; ++i) {
+		for (unsigned short i = 0; i < Format::UvSize; ++i) {
 			copy_v2_v2(uvs[i], _uvs[i]);
 		}
 
-		for (unsigned short i = 0; i < colorSize; ++i) {
+		for (unsigned short i = 0; i < Format::ColorSize; ++i) {
 			colors[i] = _colors[i];
 		}
 	}
@@ -86,33 +88,28 @@ struct RAS_VertexDataMemoryFormat
 	uint8_t size;
 };
 
-template <unsigned short uvSize, unsigned short colorSize>
-struct RAS_VertexData : RAS_IVertexData, RAS_VertexDataExtra<uvSize, colorSize>
+template <class Format>
+struct RAS_VertexData : RAS_IVertexData, RAS_VertexDataExtra<Format>
 {
-	enum {
-		UvSize = uvSize,
-		ColorSize = colorSize
-	};
-
 	inline RAS_VertexData() = default;
 
 	inline RAS_VertexData(const mt::vec3& _position,
-						  const mt::vec2 _uvs[uvSize],
+						  const mt::vec2 _uvs[Format::UvSize],
 						  const mt::vec4& _tangent,
-						  const unsigned int _colors[colorSize],
+						  const unsigned int _colors[Format::ColorSize],
 						  const mt::vec3& _normal)
 		:RAS_IVertexData(_position, _normal, _tangent),
-		RAS_VertexDataExtra<uvSize, colorSize>(_uvs, _colors)
+		RAS_VertexDataExtra<Format>(_uvs, _colors)
 	{
 	}
 
 	inline RAS_VertexData(const float _position[3],
-						  const float _uvs[uvSize][2],
+						  const float _uvs[Format::UvSize][2],
 						  const float _tangent[4],
-						  const unsigned int _colors[colorSize],
+						  const unsigned int _colors[Format::ColorSize],
 						  const float _normal[3])
 		:RAS_IVertexData(_position, _normal, _tangent),
-		RAS_VertexDataExtra<uvSize, colorSize>(_uvs, _colors)
+		RAS_VertexDataExtra<Format>(_uvs, _colors)
 	{
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -126,6 +126,7 @@ set(SRC`
`126`	`126`	`RAS_TextUser.h`
`127`	`127`	`RAS_Vertex.h`
`128`	`128`	`RAS_VertexData.h`
	`129`	`+ RAS_VertexFormat.h`
`129`	`130`	`)`
`130`	`131`
`131`	`132`	`data_to_c_simple(RAS_OpenGLFilters/RAS_Blur2DFilter.glsl SRC)`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ RAS_IBatchDisplayArray::~RAS_IBatchDisplayArray()`
`38`	`38`
`39`	`39`	`#define NEW_DISPLAY_ARRAY_UV(vertformat, uv, color, primtype) \`
`40`	`40`	`if (vertformat.uvSize == uv && vertformat.colorSize == color) { \`
`41`		`- return new RAS_BatchDisplayArray<RAS_VertexData<uv, color> >(primtype, vertformat); \`
	`41`	`+ return new RAS_BatchDisplayArray<RAS_VertexData<RAS_VertexFormatType<uv, color> > >(primtype, vertformat); \`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`#define NEW_DISPLAY_ARRAY_COLOR(vertformat, color, primtype) \`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ RAS_IDisplayArray::~RAS_IDisplayArray()`
`84`	`84`
`85`	`85`	`#define NEW_DISPLAY_ARRAY_UV(vertformat, uv, color, primtype) \`
`86`	`86`	`if (vertformat.uvSize == uv && vertformat.colorSize == color) { \`
`87`		`- return new RAS_DisplayArray<RAS_VertexData<uv, color> >(primtype, vertformat); \`
	`87`	`+ return new RAS_DisplayArray<RAS_VertexData<RAS_VertexFormatType<uv, color> > >(primtype, vertformat); \`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`#define NEW_DISPLAY_ARRAY_COLOR(vertformat, color, primtype) \`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,8 @@`
`3`	`3`
`4`	`4`	`#include "mathfu.h"`
`5`	`5`
	`6`	`+#include "RAS_VertexFormat.h"`
	`7`	`+`
`6`	`8`	`#include "BLI_math_vector.h"`
`7`	`9`
`8`	`10`	`struct RAS_VertexDataBasic`
`@@ -28,32 +30,32 @@ struct RAS_VertexDataBasic`
`28`	`30`	`}`
`29`	`31`	`};`
`30`	`32`
`31`		`-template <unsigned short uvSize, unsigned short colorSize>`
	`33`	`+template <class Format>`
`32`	`34`	`struct RAS_VertexDataExtra`
`33`	`35`	`{`
`34`		`- float uvs[uvSize][2];`
`35`		`- unsigned int colors[colorSize];`
	`36`	`+ float uvs[Format::UvSize][2];`
	`37`	`+ unsigned int colors[Format::ColorSize];`
`36`	`38`
`37`	`39`	`inline RAS_VertexDataExtra() = default;`
`38`	`40`
`39`		`- inline RAS_VertexDataExtra(const mt::vec2 _uvs[uvSize], const unsigned int _colors[colorSize])`
	`41`	`+ inline RAS_VertexDataExtra(const mt::vec2 _uvs[Format::UvSize], const unsigned int _colors[Format::ColorSize])`
`40`	`42`	`{`
`41`		`- for (unsigned short i = 0; i < uvSize; ++i) {`
	`43`	`+ for (unsigned short i = 0; i < Format::UvSize; ++i) {`
`42`	`44`	`_uvs[i].Pack(uvs[i]);`
`43`	`45`	`}`
`44`	`46`
`45`		`- for (unsigned short i = 0; i < colorSize; ++i) {`
	`47`	`+ for (unsigned short i = 0; i < Format::ColorSize; ++i) {`
`46`	`48`	`colors[i] = _colors[i];`
`47`	`49`	`}`
`48`	`50`	`}`
`49`	`51`
`50`		`- inline RAS_VertexDataExtra(const float _uvs[uvSize][2], const unsigned int _colors[colorSize])`
	`52`	`+ inline RAS_VertexDataExtra(const float _uvs[Format::UvSize][2], const unsigned int _colors[Format::ColorSize])`
`51`	`53`	`{`
`52`		`- for (unsigned short i = 0; i < uvSize; ++i) {`
	`54`	`+ for (unsigned short i = 0; i < Format::UvSize; ++i) {`
`53`	`55`	`copy_v2_v2(uvs[i], _uvs[i]);`
`54`	`56`	`}`
`55`	`57`
`56`		`- for (unsigned short i = 0; i < colorSize; ++i) {`
	`58`	`+ for (unsigned short i = 0; i < Format::ColorSize; ++i) {`
`57`	`59`	`colors[i] = _colors[i];`
`58`	`60`	`}`
`59`	`61`	`}`
`@@ -86,33 +88,28 @@ struct RAS_VertexDataMemoryFormat`
`86`	`88`	`uint8_t size;`
`87`	`89`	`};`
`88`	`90`
`89`		`-template <unsigned short uvSize, unsigned short colorSize>`
`90`		`-struct RAS_VertexData : RAS_IVertexData, RAS_VertexDataExtra<uvSize, colorSize>`
	`91`	`+template <class Format>`
	`92`	`+struct RAS_VertexData : RAS_IVertexData, RAS_VertexDataExtra<Format>`
`91`	`93`	`{`
`92`		`- enum {`
`93`		`- UvSize = uvSize,`
`94`		`- ColorSize = colorSize`
`95`		`- };`
`96`		`-`
`97`	`94`	`inline RAS_VertexData() = default;`
`98`	`95`
`99`	`96`	`inline RAS_VertexData(const mt::vec3& _position,`
`100`		`- const mt::vec2 _uvs[uvSize],`
	`97`	`+ const mt::vec2 _uvs[Format::UvSize],`
`101`	`98`	`const mt::vec4& _tangent,`
`102`		`- const unsigned int _colors[colorSize],`
	`99`	`+ const unsigned int _colors[Format::ColorSize],`
`103`	`100`	`const mt::vec3& _normal)`
`104`	`101`	`:RAS_IVertexData(_position, _normal, _tangent),`
`105`		`- RAS_VertexDataExtra<uvSize, colorSize>(_uvs, _colors)`
	`102`	`+ RAS_VertexDataExtra<Format>(_uvs, _colors)`
`106`	`103`	`{`
`107`	`104`	`}`
`108`	`105`
`109`	`106`	`inline RAS_VertexData(const float _position[3],`
`110`		`- const float _uvs[uvSize][2],`
	`107`	`+ const float _uvs[Format::UvSize][2],`
`111`	`108`	`const float _tangent[4],`
`112`		`- const unsigned int _colors[colorSize],`
	`109`	`+ const unsigned int _colors[Format::ColorSize],`
`113`	`110`	`const float _normal[3])`
`114`	`111`	`:RAS_IVertexData(_position, _normal, _tangent),`
`115`		`- RAS_VertexDataExtra<uvSize, colorSize>(_uvs, _colors)`
	`112`	`+ RAS_VertexDataExtra<Format>(_uvs, _colors)`
`116`	`113`	`{`
`117`	`114`	`}`
`118`	`115`