X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fbuilders%2Fvertexarraybuilder.cpp;h=c9a1f3bc8c5c5d8a751705fdfb3603ad196a7e6f;hp=ddec548f6d1bc8868a55e93155226a1f5efd91d6;hb=006bdb4f8660098fc524dcca80b24c943c65b249;hpb=7f03ee52e8af5f857e44702b6d1c2822a51c62ef

diff --git a/source/builders/vertexarraybuilder.cpp b/source/builders/vertexarraybuilder.cpp
index ddec548f..c9a1f3bc 100644
--- a/source/builders/vertexarraybuilder.cpp
+++ b/source/builders/vertexarraybuilder.cpp
@@ -1,6 +1,8 @@
 #include "vertexarray.h"
 #include "vertexarraybuilder.h"
 
+using namespace std;
+
 namespace Msp {
 namespace GL {
 
@@ -10,31 +12,49 @@ VertexArrayBuilder::VertexArrayBuilder(VertexArray &a):
 
 void VertexArrayBuilder::vertex_(const Vector4 &vtx)
 {
-	float *ptr = array.append();
-	const VertexFormat &format = array.get_format();
-	for(const unsigned char *c=format.begin(); c!=format.end(); ++c)
+	char *ptr = array.append();
+	for(VertexAttribute a: array.get_format())
 	{
-		unsigned sz = get_component_size(*c);
-		unsigned t = get_component_type(*c);
-		if(t>=attr.size())
-			ptr += sz;
-		else if(*c==COLOR4_UBYTE)
+		unsigned sem = get_attribute_semantic(a);
+		bool integer = is_integer_attribute(a);
+		DataType type = get_attribute_source_type(a);
+		unsigned cc = get_attribute_component_count(a);
+
+		if(sem<attr.size())
 		{
-			union { unsigned char c[4]; float f; } u;
-			u.c[0] = static_cast<unsigned char>(attr[t].x*255);
-			u.c[1] = static_cast<unsigned char>(attr[t].y*255);
-			u.c[2] = static_cast<unsigned char>(attr[t].z*255);
-			u.c[3] = static_cast<unsigned char>(attr[t].w*255);
-			*ptr++ = u.f;
+			const Vector4 &value = (sem==0 ? vtx : attr[sem]);
+			if(type==UNSIGNED_BYTE)
+				store_attribute<uint8_t>(ptr, value, !integer, cc);
+			else if(type==BYTE)
+				store_attribute<int8_t>(ptr, value, !integer, cc);
+			else if(type==UNSIGNED_SHORT)
+				store_attribute<uint16_t>(ptr, value, !integer, cc);
+			else if(type==SHORT)
+				store_attribute<int16_t>(ptr, value, !integer, cc);
+			else if(type==UNSIGNED_INT)
+				store_attribute<uint32_t>(ptr, value, !integer, cc);
+			else if(type==INT)
+				store_attribute<int32_t>(ptr, value, !integer, cc);
+			else if(type==FLOAT)
+				store_attribute<float>(ptr, value, false, cc);
 		}
+
+		ptr += get_attribute_size(a);
+	}
+}
+
+template<typename T>
+void VertexArrayBuilder::store_attribute(char *ptr, const Vector4 &value, bool normalize, unsigned count)
+{
+	T *tptr = reinterpret_cast<T *>(ptr);
+	for(unsigned i=0; i<count; ++i)
+	{
+		if(!numeric_limits<T>::is_integer || !normalize)
+			*tptr++ = value[i];
+		else if(numeric_limits<T>::is_signed)
+			*tptr++ = round(min(max(value[i], -1.0f), 1.0f)*numeric_limits<T>::max());
 		else
-		{
-			const Vector4 &v = (t==0 ? vtx : attr[t]);
-			*ptr++ = v.x;
-			if(sz>=2) *ptr++ = v.y;
-			if(sz>=3) *ptr++ = v.z;
-			if(sz>=4) *ptr++ = v.w;
-		}
+			*tptr++ = round(min(max(value[i], 0.0f), 1.0f)*numeric_limits<T>::max());
 	}
 }