/* $Id$
This file is part of libmspgl
-Copyright © 2007 Mikko Rasa, Mikkosoft Productions
+Copyright © 2007-2009 Mikko Rasa, Mikkosoft Productions
Distributed under the LGPL
*/
-#include <GL/gl.h>
+#include "arb_vertex_program.h"
+#include "extension.h"
+#include "gl.h"
+#include "version_1_2.h"
#include "vertexarray.h"
#include "vertexbuffer.h"
namespace Msp {
namespace GL {
-uint get_stride(VertexFormat f)
-{
- uint stride=0;
- for(uint fmt=f; fmt; fmt>>=4)
- stride+=(fmt&3)+1;
- return stride*sizeof(float);
-}
-
-
-VertexArrayBuilder::VertexArrayBuilder(VertexArray &a, vector<float> &d):
- data(d),
- array(a),
- format(array.get_format()),
- stride(get_stride(format)),
- cr(1), cg(1), cb(1), ca(1),
- ts(0), tt(0), tr(0), tq(0),
- nx(0), ny(0), nz(1)
-{ }
-
-void VertexArrayBuilder::vertex(float x, float y, float z, float w)
-{
- for(uint fmt=format; fmt; fmt>>=4)
- {
- uint size=(fmt&3)+1;
- switch(fmt&12)
- {
- case 0:
- data.push_back(x);
- data.push_back(y);
- if(size>=3) data.push_back(z);
- if(size>=4) data.push_back(w);
- break;
- case 4:
- data.push_back(nx);
- data.push_back(ny);
- data.push_back(nz);
- break;
- case 8:
- data.push_back(ts);
- if(size>=2) data.push_back(tt);
- if(size>=3) data.push_back(tr);
- if(size>=4) data.push_back(tq);
- break;
- case 12:
- if(size==1)
- {
- union { ubyte c[4]; float f; } u;
- u.c[0]=(ubyte)(cr*255);
- u.c[1]=(ubyte)(cg*255);
- u.c[2]=(ubyte)(cb*255);
- u.c[3]=(ubyte)(ca*255);
- data.push_back(u.f);
- }
- else
- {
- data.push_back(cr);
- data.push_back(cg);
- data.push_back(cb);
- if(size>=4) data.push_back(ca);
- }
- break;
- }
- }
- //cout<<"Added vertex with "<<data.size()-old_size<<" floats\n";
-}
-
-VertexArrayBuilder::~VertexArrayBuilder()
-{
- array.update_data();
-}
-
-
-VertexArray::VertexArray(VertexFormat f):
- format(NODATA),
- stride(get_stride(f)),
+VertexArray::VertexArray(const VertexFormat &f):
vbuf(0),
own_vbuf(false)
{
- // Reverse the format so the first item is in lowest bits
- for(uint fmt=f; fmt; fmt>>=4)
- format=(format, static_cast<VertexFormat>(fmt&15));
+ reset(f);
}
VertexArray::~VertexArray()
void VertexArray::use_vertex_buffer()
{
- if(vbuf) return;
+ if(vbuf && own_vbuf)
+ return;
+
+ vbuf = new Buffer(ARRAY_BUFFER);
+ own_vbuf = true;
- vbuf=new VertexBuffer();
- own_vbuf=true;
update_data();
}
-void VertexArray::use_vertex_buffer(VertexBuffer *b)
+void VertexArray::use_vertex_buffer(Buffer *b)
{
- if(vbuf) return;
+ if(own_vbuf)
+ delete vbuf;
+ vbuf = b;
+ own_vbuf = false;
- vbuf=b;
update_data();
}
+void VertexArray::reserve(unsigned n)
+{
+ data.reserve(n*stride);
+}
+
void VertexArray::clear()
{
data.clear();
}
+void VertexArray::reset(const VertexFormat &f)
+{
+ clear();
+ format = f;
+ stride = get_stride(format);
+
+ bool has_gen_attrs = false;
+ for(const unsigned char *c=format.begin(); (!has_gen_attrs && c!=format.end()); ++c)
+ has_gen_attrs = (*c>=ATTRIB1);
+ if(has_gen_attrs)
+ static RequireExtension _ext("GL_ARB_vertex_program");
+}
+
void VertexArray::apply() const
{
- if(vbuf) vbuf->bind();
+ if(format.empty())
+ throw InvalidState("Trying to apply a vertex array with no data");
- const float *base=vbuf?0:&data[0];
- uint offset=0;
- uint found=0;
- for(uint fmt=format; fmt; fmt>>=4)
+ if(vbuf)
+ vbuf->bind();
+
+ const float *base = vbuf?0:&data[0];
+ unsigned offset = 0;
+ unsigned found = 0;
+ unsigned bpv = stride*sizeof(float);
+ for(const unsigned char *c=format.begin(); c!=format.end(); ++c)
{
- uint size=(fmt&3)+1;
- switch(fmt&12)
+ unsigned sz = (*c&3)+1;
+ unsigned t = *c>>2;
+ switch(t)
{
case 0:
- glVertexPointer(size, GL_FLOAT, stride, base+offset);
+ glVertexPointer(sz, GL_FLOAT, bpv, base+offset);
break;
- case 4:
- glNormalPointer(GL_FLOAT, stride, base+offset);
+ case 1:
+ glNormalPointer(GL_FLOAT, bpv, base+offset);
break;
- case 8:
- glTexCoordPointer(size, GL_FLOAT, stride, base+offset);
+ case 2:
+ glTexCoordPointer(sz, GL_FLOAT, bpv, base+offset);
break;
- case 12:
- if(size==1)
- glColorPointer(4, GL_UNSIGNED_BYTE, stride, base+offset);
+ case 3:
+ if(sz==1)
+ glColorPointer(4, GL_UNSIGNED_BYTE, bpv, base+offset);
else
- glColorPointer(size, GL_FLOAT, stride, base+offset);
+ glColorPointer(sz, GL_FLOAT, bpv, base+offset);
+ break;
+ default:
+ glVertexAttribPointerARB(t-4, sz, GL_FLOAT, false, bpv, base+offset);
break;
}
- found|=1<<((fmt&12)>>2);
- offset+=size;
+ found |= 1<<t;
+ offset += sz;
}
set_array(GL_VERTEX_ARRAY, found&1, 1);
set_array(GL_NORMAL_ARRAY, found&2, 2);
set_array(GL_TEXTURE_COORD_ARRAY, found&4, 4);
set_array(GL_COLOR_ARRAY, found&8, 8);
+ for(unsigned i=4; i<32; ++i)
+ set_array(i-4, (found>>i)&1, 1<<i);
- VertexBuffer::unbind();
+ if(vbuf)
+ vbuf->unbind();
}
/**
void VertexArray::update_data()
{
if(vbuf)
+ {
vbuf->data(data.size()*sizeof(float), &data[0]);
+ vbuf->unbind();
+ }
}
-void VertexArray::set_array(unsigned array, unsigned bit, unsigned mask) const
+float *VertexArray::append()
{
- if((enabled_arrays&mask) && !bit)
+ data.insert(data.end(), stride, 0.0f);
+ return &*data.end()-stride;
+}
+
+void VertexArray::set_array(unsigned array, bool en, unsigned mask) const
+{
+ if((enabled_arrays&mask) && !en)
{
- glDisableClientState(array);
- enabled_arrays&=~mask;
+ if(mask<16)
+ glDisableClientState(array);
+ else
+ glDisableVertexAttribArrayARB(array);
+ enabled_arrays &= ~mask;
}
- else if(!(enabled_arrays&mask) && bit)
+ else if(!(enabled_arrays&mask) && en)
{
- glEnableClientState(array);
- enabled_arrays|=mask;
+ if(mask<16)
+ glEnableClientState(array);
+ else
+ glEnableVertexAttribArrayARB(array);
+ enabled_arrays |= mask;
}
}
-unsigned VertexArray::enabled_arrays=0;
+unsigned VertexArray::enabled_arrays = 0;
+
+
+VertexArray::Loader::Loader(VertexArray &a):
+ VertexArrayBuilder(a)
+{
+ add("vertex2", static_cast<void (Loader::*)(float, float)>(&Loader::vertex));
+ add("vertex3", static_cast<void (Loader::*)(float, float, float)>(&Loader::vertex));
+ add("vertex4", static_cast<void (Loader::*)(float, float, float, float)>(&Loader::vertex));
+ add("normal3", static_cast<void (Loader::*)(float, float, float)>(&Loader::normal));
+ add("texcoord1", static_cast<void (Loader::*)(float)>(&Loader::texcoord));
+ add("texcoord2", static_cast<void (Loader::*)(float, float)>(&Loader::texcoord));
+ add("texcoord3", static_cast<void (Loader::*)(float, float, float)>(&Loader::texcoord));
+ add("texcoord4", static_cast<void (Loader::*)(float, float, float, float)>(&Loader::texcoord));
+ add("color3", static_cast<void (Loader::*)(float, float, float)>(&Loader::color));
+ add("color4", static_cast<void (Loader::*)(float, float, float, float)>(&Loader::color));
+ add("attrib1", static_cast<void (Loader::*)(unsigned, float)>(&Loader::attrib));
+ add("attrib2", static_cast<void (Loader::*)(unsigned, float, float)>(&Loader::attrib));
+ add("attrib3", static_cast<void (Loader::*)(unsigned, float, float, float)>(&Loader::attrib));
+ 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
projects / libs / gl.git / blobdiff