-#include <msp/gl/extensions/msp_primitive_restart.h>
#include "batch.h"
#include "error.h"
namespace GL {
Batch::Batch(PrimitiveType t):
+ BatchBackend(t),
prim_type(t),
- gl_prim_type(GL::get_gl_primitive_type(prim_type)),
- index_type(UNSIGNED_SHORT),
- gl_index_type(get_gl_type(index_type)),
- max_index(0)
-{ }
-
-Batch::~Batch()
+ index_type(VOID)
{
+ set_index_type(UNSIGNED_SHORT);
}
void Batch::set_index_type(DataType t)
shrink<uint32_t, uint16_t>(data);
index_type = t;
- gl_index_type = get_gl_type(t);
+ BatchBackend::set_index_type(t);
update_offset();
- dirty = true;
+ mark_dirty();
+}
+
+void Batch::set_patch_size(unsigned s)
+{
+ if(prim_type!=PATCHES)
+ throw invalid_operation("Batch::set_patch_size");
+ if(s<1)
+ throw invalid_argument("Batch::set_patch_size");
+
+ patch_size = s;
}
Batch &Batch::append(unsigned i)
append_index(i);
update_offset();
- dirty = true;
+ mark_dirty();
return *this;
}
append_index(i);
update_offset();
- dirty = true;
+ mark_dirty();
return *this;
}
{
if(other_type!=prim_type)
return false;
- else if(prim_type==LINE_STRIP || prim_type==LINE_LOOP || prim_type==TRIANGLE_FAN)
- return MSP_primitive_restart;
+ else if(prim_type==LINE_STRIP || prim_type==TRIANGLE_FAN)
+ return check_restart(false);
else
return true;
}
{
if(other.prim_type!=prim_type)
throw invalid_argument("Batch::append");
- if(prim_type==LINE_STRIP || prim_type==LINE_LOOP || prim_type==TRIANGLE_FAN)
- static Require _req(MSP_primitive_restart);
+ if(prim_type==LINE_STRIP || prim_type==TRIANGLE_FAN)
+ check_restart(true);
if(other.data.empty())
return *this;
if(prim_type==POINTS || prim_type==LINES || prim_type==TRIANGLES)
;
- else if(MSP_primitive_restart)
+ else if(check_restart(false))
{
if(index_type==UNSIGNED_INT)
::append<uint32_t>(data, 0xFFFFFFFF);
append_index(other.get_index(i));
update_offset();
- dirty = true;
+ mark_dirty();
return *this;
}
::append<uint16_t>(data, i);
}
-unsigned Batch::get_index_size() const
-{
- return (index_type==UNSIGNED_INT ? sizeof(uint32_t) : sizeof(uint16_t));
-}
-
-unsigned Batch::get_index(unsigned i) const
+unsigned Batch::get_index(size_t i) const
{
if(index_type==UNSIGNED_INT)
return *(uint32_t *)&data[i*sizeof(uint32_t)];
DataFile::ObjectLoader<Batch>(b)
{
add("indices", &Loader::indices);
+ add("patch_size", &Loader::patch_size);
}
void Batch::Loader::indices(const vector<unsigned> &ind)
obj.append(ind);
}
+void Batch::Loader::patch_size(unsigned s)
+{
+ obj.set_patch_size(s);
+}
+
} // namespace GL
} // namespace Msp