-#include "arb_vertex_program.h"
+#include "arb_multitexture.h"
+#include "arb_vertex_shader.h"
#include "buffer.h"
#include "error.h"
-#include "extension.h"
#include "gl.h"
-#include "version_1_2.h"
-#include "version_1_3.h"
#include "vertexarray.h"
using namespace std;
VertexArray::~VertexArray()
{ }
+void VertexArray::reset(const VertexFormat &f)
+{
+ clear();
+ format = f;
+ stride = get_stride(format);
+
+ bool has_multitex = false;
+ bool has_gen_attrs = false;
+ for(const unsigned char *c=format.begin(); c!=format.end(); ++c)
+ {
+ if(*c>=TEXCOORD1+4 && *c<=TEXCOORD4+12)
+ has_multitex = true;
+ if(*c>=ATTRIB1)
+ has_gen_attrs = true;
+ }
+ if(has_multitex)
+ static Require _req(ARB_multitexture);
+ if(has_gen_attrs)
+ static Require _req(ARB_vertex_shader);
+}
+
void VertexArray::use_vertex_buffer()
{
if(vbuf)
dirty = true;
}
+void VertexArray::clear()
+{
+ data.clear();
+}
+
void VertexArray::reserve(unsigned n)
{
data.reserve(n*stride);
}
-void VertexArray::clear()
+float *VertexArray::append()
{
- data.clear();
+ data.insert(data.end(), stride, 0.0f);
+ set_dirty();
+ return &*(data.end()-stride);
}
-void VertexArray::reset(const VertexFormat &f)
+float *VertexArray::modify(unsigned i)
{
- clear();
- format = f;
- stride = get_stride(format);
+ set_dirty();
+ return &data[0]+i*stride;
+}
- bool has_multitex = false;
- bool has_gen_attrs = false;
- for(const unsigned char *c=format.begin(); c!=format.end(); ++c)
+void VertexArray::set_dirty()
+{
+ dirty = true;
+ if(defer_vbuf)
{
- if(*c>=TEXCOORD1+4 && *c<ATTRIB1)
- has_multitex = true;
- if(*c>=ATTRIB1)
- has_gen_attrs = true;
+ vbuf = new Buffer(ARRAY_BUFFER);
+ defer_vbuf = false;
}
- if(has_multitex)
- static RequireVersion _ver(1, 3);
- if(has_gen_attrs)
- static RequireExtension _ext("GL_ARB_vertex_program");
}
void VertexArray::apply() const
unsigned active_tex = 0;
for(const unsigned char *c=format.begin(); c!=format.end(); ++c)
{
- unsigned sz = (*c&3)+1;
- unsigned t = *c>>2;
+ unsigned sz = get_component_size(*c);
+ unsigned t = get_component_type(*c);
bool en = enabled_arrays.is_set(t);
- switch(t)
+ if(t==get_component_type(VERTEX3))
{
- case 0:
glVertexPointer(sz, GL_FLOAT, bpv, base+offset);
if(!en)
glEnableClientState(GL_VERTEX_ARRAY);
- break;
- case 1:
+ }
+ else if(t==get_component_type(NORMAL3))
+ {
glNormalPointer(GL_FLOAT, bpv, base+offset);
if(!en)
glEnableClientState(GL_NORMAL_ARRAY);
- break;
- case 2:
+ }
+ else if(t==get_component_type(COLOR4_FLOAT))
+ {
if(sz==1)
glColorPointer(4, GL_UNSIGNED_BYTE, bpv, base+offset);
else
glColorPointer(sz, GL_FLOAT, bpv, base+offset);
if(!en)
glEnableClientState(GL_COLOR_ARRAY);
- break;
- default:
- if(t<11)
- {
- if(t>3 || active_tex)
- {
- glClientActiveTexture(GL_TEXTURE0+(t-3));
- active_tex = t-3;
- }
- glTexCoordPointer(sz, GL_FLOAT, bpv, base+offset);
- if(!en)
- glEnableClientState(GL_TEXTURE_COORD_ARRAY);
- }
- else
+ }
+ else if(*c>=TEXCOORD1 && *c<=TEXCOORD4+12)
+ {
+ t -= get_component_type(TEXCOORD1);
+ if(t>0 || active_tex)
{
- glVertexAttribPointerARB(t-11, sz, GL_FLOAT, false, bpv, base+offset);
- if(!en)
- glEnableVertexAttribArrayARB(t-11);
+ glClientActiveTexture(GL_TEXTURE0+t);
+ active_tex = t;
}
- break;
+ glTexCoordPointer(sz, GL_FLOAT, bpv, base+offset);
+ if(!en)
+ glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+ }
+ else
+ {
+ if(t>=get_component_type(ATTRIB1))
+ t -= get_component_type(ATTRIB1);
+ glVertexAttribPointer(t, sz, GL_FLOAT, false, bpv, base+offset);
+ if(!en)
+ glEnableVertexAttribArray(t);
}
found.set(t);
offset += sz;
for(unsigned i=0; i<64; ++i)
if(enabled_arrays.is_set(i) && !found.is_set(i))
{
- if(i==0)
+ if(i==get_component_type(VERTEX3))
glDisableClientState(GL_VERTEX_ARRAY);
- else if(i==1)
+ else if(i==get_component_type(NORMAL3))
glDisableClientState(GL_NORMAL_ARRAY);
- else if(i==2)
+ else if(i==get_component_type(COLOR4_FLOAT))
glDisableClientState(GL_COLOR_ARRAY);
- else if(i>=3 && i<11)
+ else if(i>=get_component_type(TEXCOORD1) && i<=get_component_type(TEXCOORD1)+3)
{
- if(i>3 || active_tex)
- glClientActiveTexture(GL_TEXTURE0+(i-3));
+ unsigned j = i-get_component_type(TEXCOORD1);
+ if(j>0 || active_tex)
+ glClientActiveTexture(GL_TEXTURE0+j);
glDisableClientState(GL_TEXTURE_COORD_ARRAY);
- active_tex = i-3;
+ active_tex = j;
}
+ else if(i<get_component_type(ATTRIB1))
+ glDisableVertexAttribArray(i);
else
- glDisableVertexAttribArrayARB(i-11);
+ glDisableVertexAttribArray(i-get_component_type(ATTRIB1));
}
enabled_arrays = found;
Buffer::unbind_from(ARRAY_BUFFER);
}
-float *VertexArray::append()
-{
- data.insert(data.end(), stride, 0.0f);
- set_dirty();
- return &*(data.end()-stride);
-}
-
-float *VertexArray::modify(unsigned i)
-{
- set_dirty();
- return &data[0]+i*stride;
-}
-
-void VertexArray::set_dirty()
-{
- dirty = true;
- if(defer_vbuf)
- {
- vbuf = new Buffer(ARRAY_BUFFER);
- defer_vbuf = false;
- }
-}
-
VertexArray::ArrayMask::ArrayMask()
{
add("attrib4", static_cast<void (Loader::*)(unsigned, float, float, float, float)>(&Loader::attrib));
}
-
-void array_element(int i)
-{
- glArrayElement(i);
-}
-
-void draw_arrays(PrimitiveType mode, int first, unsigned count)
-{
- glDrawArrays(mode, first, count);
-}
-
-void draw_elements(PrimitiveType mode, unsigned count, DataType type, const void *indices)
-{
- glDrawElements(mode, count, type, indices);
-}
-
-void draw_range_elements(PrimitiveType mode, unsigned low, unsigned high, unsigned count, DataType type, const void *indices)
-{
- static RequireVersion _ver(1, 2);
- glDrawRangeElements(mode, low, high, count, type, indices);
-}
-
} // namespace GL
} // namespace Msp