X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fvertexarray.cpp;h=ef11844466b9ff7833dcde88a53a69ff422f059d;hp=6da0f9c0d44812ad6294d769200af558d5532bf0;hb=bc3c82a86eeadde54be9fe32a8a8a76872ca99c3;hpb=a4ec5410595ddf37bfbc0e85ad87d31a9cbf94f1 diff --git a/source/vertexarray.cpp b/source/vertexarray.cpp index 6da0f9c0..ef118444 100644 --- a/source/vertexarray.cpp +++ b/source/vertexarray.cpp @@ -1,11 +1,14 @@ /* $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 "arb_vertex_program.h" +#include "extension.h" #include "gl.h" +#include "version_1_2.h" #include "vertexarray.h" #include "vertexbuffer.h" @@ -14,15 +17,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() @@ -33,44 +32,52 @@ VertexArray::~VertexArray() void VertexArray::use_vertex_buffer() { - if(vbuf) return; + if(vbuf && own_vbuf) + return; vbuf=new VertexBuffer(); own_vbuf=true; + update_data(); } void VertexArray::use_vertex_buffer(VertexBuffer *b) { - if(vbuf) return; - + if(own_vbuf) + delete vbuf; vbuf=b; + own_vbuf=false; + update_data(); } +void VertexArray::reserve(unsigned n) +{ + data.reserve(n*stride); +} + 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)); + format=f; stride=get_stride(format); -} -RefPtr VertexArray::modify() -{ - return new VertexArrayBuilder(*this, data); + 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(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(); @@ -78,37 +85,45 @@ void VertexArray::apply() const const float *base=vbuf?0:&data[0]; uint offset=0; uint found=0; - for(uint fmt=format; fmt; fmt>>=4) + uint bpv=stride*sizeof(float); + for(const unsigned char *c=format.begin(); c!=format.end(); ++c) { - uint size=(fmt&3)+1; - switch(fmt&12) + uint sz=(*c&3)+1; + uint 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<>i)&1, 1<data(data.size()*sizeof(float), &data[0]); + VertexBuffer::unbind(); + } +} + +float *VertexArray::append() +{ + data.insert(data.end(), stride, 0.0f); + return &*data.end()-stride; } -void VertexArray::set_array(unsigned array, unsigned bit, unsigned mask) const +void VertexArray::set_array(unsigned array, bool en, unsigned mask) const { - if((enabled_arrays&mask) && !bit) + if((enabled_arrays&mask) && !en) { - glDisableClientState(array); + 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); + if(mask<16) + glEnableClientState(array); + else + glEnableVertexAttribArrayARB(array); enabled_arrays|=mask; } } @@ -138,7 +168,7 @@ unsigned VertexArray::enabled_arrays=0; VertexArray::Loader::Loader(VertexArray &a): - VertexArrayBuilder(a, a.data) + VertexArrayBuilder(a) { add("vertex2", static_cast(&Loader::vertex)); add("vertex3", static_cast(&Loader::vertex)); @@ -150,6 +180,32 @@ VertexArray::Loader::Loader(VertexArray &a): add("texcoord4", static_cast(&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)); +} + + +void array_element(int i) +{ + glArrayElement(i); +} + +void draw_arrays(PrimitiveType mode, int first, sizei count) +{ + glDrawArrays(mode, first, count); +} + +void draw_elements(PrimitiveType mode, sizei 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) +{ + static RequireVersion _ver(1, 2); + glDrawRangeElements(mode, low, high, count, type, indices); } } // namespace GL