X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fvertexarray.cpp;h=395f217a97ecff6c9c76c3a6985fdfa97f163978;hb=5a07a1fdfa420d257221228676a3c76a5eb4f44f;hp=3c17141cfb59a592264505c7c67956cc5a9fd355;hpb=dc1d1159a61f378bda11e5989ad694a86b9a3c77;p=libs%2Fgl.git diff --git a/source/vertexarray.cpp b/source/vertexarray.cpp index 3c17141c..395f217a 100644 --- a/source/vertexarray.cpp +++ b/source/vertexarray.cpp @@ -1,13 +1,15 @@ /* $Id$ This file is part of libmspgl -Copyright © 2007 Mikko Rasa, Mikkosoft Productions +Copyright © 2007-2010 Mikko Rasa, Mikkosoft Productions Distributed under the LGPL */ +#include "arb_vertex_program.h" #include "extension.h" #include "gl.h" #include "version_1_2.h" +#include "version_1_3.h" #include "vertexarray.h" #include "vertexbuffer.h" @@ -16,15 +18,11 @@ using namespace std; namespace Msp { namespace GL { -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. This makes handling in bind() easier. - for(uint fmt=f; fmt; fmt>>=4) - format=(format, static_cast(fmt&15)); + reset(f); } VertexArray::~VertexArray() @@ -38,18 +36,18 @@ void VertexArray::use_vertex_buffer() if(vbuf && own_vbuf) return; - vbuf=new VertexBuffer(); - own_vbuf=true; + vbuf = new Buffer(ARRAY_BUFFER); + own_vbuf = true; update_data(); } -void VertexArray::use_vertex_buffer(VertexBuffer *b) +void VertexArray::use_vertex_buffer(Buffer *b) { if(own_vbuf) delete vbuf; - vbuf=b; - own_vbuf=false; + vbuf = b; + own_vbuf = false; update_data(); } @@ -64,59 +62,115 @@ void VertexArray::clear() data.clear(); } -void VertexArray::reset(VertexFormat f) +void VertexArray::reset(const VertexFormat &f) { clear(); - format=NODATA; - for(uint fmt=f; fmt; fmt>>=4) - format=(format, static_cast(fmt&15)); - stride=get_stride(format); + 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=ATTRIB1) + has_gen_attrs = true; + } + if(has_multitex) + static RequireVersion _ver(1, 3); + if(has_gen_attrs) + static RequireExtension _ext("GL_ARB_vertex_program"); } void VertexArray::apply() const { - if(format==NODATA) - throw InvalidState("Trying to apply a vertex apply of format NODATA"); + if(format.empty()) + throw InvalidState("Trying to apply a vertex array with no data"); if(vbuf) vbuf->bind(); - const float *base=vbuf?0:&data[0]; - uint offset=0; - uint found=0; - uint bpv=stride*sizeof(float); - for(uint fmt=format; fmt; fmt>>=4) + const float *base = vbuf?0:&data[0]; + unsigned offset = 0; + ArrayMask found; + unsigned bpv = stride*sizeof(float); + unsigned active_tex = 0; + for(const unsigned char *c=format.begin(); c!=format.end(); ++c) { - uint sz=(fmt&3)+1; - switch(fmt&12) + unsigned sz = (*c&3)+1; + unsigned t = *c>>2; + bool en = enabled_arrays.is_set(t); + switch(t) { case 0: glVertexPointer(sz, GL_FLOAT, bpv, base+offset); + if(!en) + glEnableClientState(GL_VERTEX_ARRAY); break; - case 4: + case 1: glNormalPointer(GL_FLOAT, bpv, base+offset); + if(!en) + glEnableClientState(GL_NORMAL_ARRAY); break; - case 8: - glTexCoordPointer(sz, GL_FLOAT, bpv, base+offset); - break; - case 12: + case 2: 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 + { + glVertexAttribPointerARB(t-11, sz, GL_FLOAT, false, bpv, base+offset); + if(!en) + glEnableVertexAttribArrayARB(t-11); + } break; } - found|=1<<((fmt&12)>>2); - offset+=sz; + found.set(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=0; i<64; ++i) + if(enabled_arrays.is_set(i) && !found.is_set(i)) + { + if(i==0) + glDisableClientState(GL_VERTEX_ARRAY); + else if(i==1) + glDisableClientState(GL_NORMAL_ARRAY); + else if(i==2) + glDisableClientState(GL_COLOR_ARRAY); + else if(i>=3 && i<11) + { + if(i>3 || active_tex) + glClientActiveTexture(GL_TEXTURE0+(i-3)); + glDisableClientState(GL_TEXTURE_COORD_ARRAY); + } + else + glDisableVertexAttribArrayARB(i-11); + } + + enabled_arrays = found; + + if(active_tex) + glClientActiveTexture(GL_TEXTURE0); if(vbuf) - VertexBuffer::unbind(); + vbuf->unbind(); } /** @@ -127,7 +181,7 @@ void VertexArray::update_data() if(vbuf) { vbuf->data(data.size()*sizeof(float), &data[0]); - VertexBuffer::unbind(); + vbuf->unbind(); } } @@ -137,21 +191,24 @@ float *VertexArray::append() return &*data.end()-stride; } -void VertexArray::set_array(unsigned array, unsigned bit, unsigned mask) const +VertexArray::ArrayMask VertexArray::enabled_arrays; + + +VertexArray::ArrayMask::ArrayMask() { - if((enabled_arrays&mask) && !bit) - { - glDisableClientState(array); - enabled_arrays&=~mask; - } - else if(!(enabled_arrays&mask) && bit) - { - glEnableClientState(array); - enabled_arrays|=mask; - } + for(unsigned i=0; i(&Loader::texcoord)); add("color3", static_cast(&Loader::color)); add("color4", static_cast(&Loader::color)); + add("attrib1", static_cast(&Loader::attrib)); + add("attrib2", static_cast(&Loader::attrib)); + add("attrib3", static_cast(&Loader::attrib)); + add("attrib4", static_cast(&Loader::attrib)); } @@ -175,17 +236,17 @@ void array_element(int i) glArrayElement(i); } -void draw_arrays(PrimitiveType mode, int first, sizei count) +void draw_arrays(PrimitiveType mode, int first, unsigned count) { glDrawArrays(mode, first, count); } -void draw_elements(PrimitiveType mode, sizei count, DataType type, const void *indices) +void draw_elements(PrimitiveType mode, unsigned count, DataType type, const void *indices) { glDrawElements(mode, count, type, indices); } -void draw_range_elements(PrimitiveType mode, uint low, uint high, sizei count, DataType type, const void *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);