#include <msp/gl/extensions/msp_primitive_restart.h>
#include "batch.h"
-#include "buffer.h"
#include "error.h"
-#include "mesh.h"
-#include "vertexarray.h"
using namespace std;
namespace {
template<typename T>
-void append(vector<Msp::UInt8> &data, T i)
+void append(vector<uint8_t> &data, T i)
{
data.insert(data.end(), sizeof(T), 0);
*(T *)(&data[data.size()-sizeof(T)]) = i;
}
template<typename T, typename U>
-void expand(vector<Msp::UInt8> &data)
+void expand(vector<uint8_t> &data)
{
unsigned count = data.size()/sizeof(T);
data.resize(count*sizeof(U));
}
template<typename T, typename U>
-void shrink(vector<Msp::UInt8> &data)
+void shrink(vector<uint8_t> &data)
{
unsigned count = data.size()/sizeof(T);
for(unsigned i=0; i<count; ++i)
throw invalid_operation("Batch::set_data_type");
if(index_type==UNSIGNED_SHORT && t==UNSIGNED_INT)
- expand<UInt16, UInt32>(data);
+ expand<uint16_t, uint32_t>(data);
else if(index_type==UNSIGNED_INT && t==UNSIGNED_SHORT)
- shrink<UInt32, UInt16>(data);
+ shrink<uint32_t, uint16_t>(data);
index_type = t;
gl_index_type = get_gl_type(t);
else if(MSP_primitive_restart)
{
if(index_type==UNSIGNED_INT)
- ::append<UInt32>(data, 0xFFFFFFFF);
+ ::append<uint32_t>(data, 0xFFFFFFFF);
else
- ::append<UInt16>(data, 0xFFFF);
+ ::append<uint16_t>(data, 0xFFFF);
}
else if(prim_type==TRIANGLE_STRIP)
{
set_index_type(UNSIGNED_INT);
if(index_type==UNSIGNED_INT)
- ::append<UInt32>(data, i);
+ ::append<uint32_t>(data, i);
else
- ::append<UInt16>(data, i);
+ ::append<uint16_t>(data, i);
}
unsigned Batch::get_index_size() const
{
- return (index_type==UNSIGNED_INT ? sizeof(UInt32) : sizeof(UInt16));
+ return (index_type==UNSIGNED_INT ? sizeof(uint32_t) : sizeof(uint16_t));
}
unsigned Batch::get_index(unsigned i) const
{
if(index_type==UNSIGNED_INT)
- return *(UInt32 *)&data[i*sizeof(UInt32)];
+ return *(uint32_t *)&data[i*sizeof(uint32_t)];
else
- return *(UInt16 *)&data[i*sizeof(UInt16)];
+ return *(uint16_t *)&data[i*sizeof(uint16_t)];
}