+#include <limits>
#include "vertexarray.h"
#include "vertexarraybuilder.h"
void VertexArrayBuilder::vertex_(const Vector4 &vtx)
{
char *ptr = array.append();
- const VertexFormat &format = array.get_format();
- for(const UInt16 *a=format.begin(); a!=format.end(); ++a)
+ for(VertexAttribute a: array.get_format())
{
- unsigned sem = get_attribute_semantic(*a);
- DataType type = get_attribute_source_type(*a);
- unsigned cc = get_attribute_component_count(*a);
-
- if(sem<attr.size())
+ unsigned sem = get_attribute_semantic(a);
+ if(!is_padding(a) && sem<attr.size())
{
+ bool integer = is_integer_attribute(a);
+ DataType type = get_attribute_source_type(a);
+ unsigned cc = get_attribute_component_count(a);
+
const Vector4 &value = (sem==0 ? vtx : attr[sem]);
if(type==UNSIGNED_BYTE)
- store_attribute<UInt8>(ptr, value, cc);
+ store_attribute<uint8_t>(ptr, value, !integer, cc);
else if(type==BYTE)
- store_attribute<Int8>(ptr, value, cc);
+ store_attribute<int8_t>(ptr, value, !integer, cc);
else if(type==UNSIGNED_SHORT)
- store_attribute<UInt16>(ptr, value, cc);
+ store_attribute<uint16_t>(ptr, value, !integer, cc);
else if(type==SHORT)
- store_attribute<Int16>(ptr, value, cc);
+ store_attribute<int16_t>(ptr, value, !integer, cc);
else if(type==UNSIGNED_INT)
- store_attribute<UInt32>(ptr, value, cc);
+ store_attribute<uint32_t>(ptr, value, !integer, cc);
else if(type==INT)
- store_attribute<Int32>(ptr, value, cc);
+ store_attribute<int32_t>(ptr, value, !integer, cc);
else if(type==FLOAT)
- store_attribute<float>(ptr, value, cc);
+ store_attribute<float>(ptr, value, false, cc);
}
- ptr += get_attribute_size(*a);
+ ptr += get_attribute_size(a);
}
}
template<typename T>
-void VertexArrayBuilder::store_attribute(char *ptr, const Vector4 &value, unsigned count)
+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)
+ 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());