X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fvertexarray.cpp;h=13816a13fc04caf572559d592cd91ad2fe3ccdd0;hp=8381d8adb1d9663b742db5a88af857f988b6bfd0;hb=6afbace895a7bbcf216ab8e48280ea0303ab5892;hpb=b617c5d7b5283ad260a77f01e42e6170cabbc03d diff --git a/source/vertexarray.cpp b/source/vertexarray.cpp index 8381d8ad..13816a13 100644 --- a/source/vertexarray.cpp +++ b/source/vertexarray.cpp @@ -1,54 +1,43 @@ -/* $Id$ - -This file is part of libmspgl -Copyright © 2007-2009 Mikko Rasa, Mikkosoft Productions -Distributed under the LGPL -*/ - -#include "arb_vertex_program.h" -#include "extension.h" +#include "arb_multitexture.h" +#include "arb_vertex_shader.h" +#include "buffer.h" +#include "error.h" #include "gl.h" -#include "version_1_2.h" #include "vertexarray.h" -#include "vertexbuffer.h" using namespace std; namespace Msp { namespace GL { +VertexArray::ArrayMask VertexArray::enabled_arrays; + VertexArray::VertexArray(const VertexFormat &f): - vbuf(0), - own_vbuf(false) + defer_vbuf(true), + dirty(false) { reset(f); } VertexArray::~VertexArray() -{ - if(own_vbuf) - delete vbuf; -} +{ } void VertexArray::use_vertex_buffer() { - if(vbuf && own_vbuf) + if(vbuf) return; vbuf = new Buffer(ARRAY_BUFFER); - own_vbuf = true; - - update_data(); + defer_vbuf = false; + dirty = true; } void VertexArray::use_vertex_buffer(Buffer *b) { - if(own_vbuf) - delete vbuf; vbuf = b; - own_vbuf = false; - - update_data(); + vbuf.keep(); + defer_vbuf = false; + dirty = true; } void VertexArray::reserve(unsigned n) @@ -67,104 +56,158 @@ void VertexArray::reset(const VertexFormat &f) format = f; stride = get_stride(format); + bool has_multitex = false; bool has_gen_attrs = false; - for(const unsigned char *c=format.begin(); (!has_gen_attrs && c!=format.end()); ++c) - has_gen_attrs = (*c>=ATTRIB1); + 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 Require _req(ARB_multitexture); if(has_gen_attrs) - static RequireExtension _ext("GL_ARB_vertex_program"); + static Require _req(ARB_vertex_shader); } void VertexArray::apply() const { if(format.empty()) - throw InvalidState("Trying to apply a vertex array with no data"); + throw invalid_operation("VertexArray::apply"); if(vbuf) - vbuf->bind(); + { + vbuf->bind_to(ARRAY_BUFFER); + if(dirty) + { + vbuf->data(data.size()*sizeof(float), &data[0]); + dirty = false; + } + } - const float *base = vbuf?0:&data[0]; + const float *base = (vbuf ? 0 : &data[0]); unsigned offset = 0; - unsigned found = 0; + ArrayMask found; unsigned bpv = stride*sizeof(float); + unsigned active_tex = 0; for(const unsigned char *c=format.begin(); c!=format.end(); ++c) { 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 1: glNormalPointer(GL_FLOAT, bpv, base+offset); + if(!en) + glEnableClientState(GL_NORMAL_ARRAY); break; case 2: - glTexCoordPointer(sz, GL_FLOAT, bpv, base+offset); - break; - case 3: 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: - glVertexAttribPointerARB(t-4, sz, GL_FLOAT, false, bpv, base+offset); + 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 + { + glVertexAttribPointer(t-11, sz, GL_FLOAT, false, bpv, base+offset); + if(!en) + glEnableVertexAttribArray(t-11); + } break; } - found |= 1<>i)&1, 1<=3 && i<11) + { + if(i>3 || active_tex) + glClientActiveTexture(GL_TEXTURE0+(i-3)); + glDisableClientState(GL_TEXTURE_COORD_ARRAY); + active_tex = i-3; + } + else + glDisableVertexAttribArray(i-11); + } - if(vbuf) - vbuf->unbind(); -} + enabled_arrays = found; + + if(active_tex) + glClientActiveTexture(GL_TEXTURE0); -/** -Updates the VertexArray data to the VertexBuffer tied to the array, if any. -*/ -void VertexArray::update_data() -{ if(vbuf) - { - vbuf->data(data.size()*sizeof(float), &data[0]); - vbuf->unbind(); - } + Buffer::unbind_from(ARRAY_BUFFER); } float *VertexArray::append() { data.insert(data.end(), stride, 0.0f); - return &*data.end()-stride; + set_dirty(); + return &*(data.end()-stride); } -void VertexArray::set_array(unsigned array, bool en, unsigned mask) const +float *VertexArray::modify(unsigned i) { - if((enabled_arrays&mask) && !en) - { - if(mask<16) - glDisableClientState(array); - else - glDisableVertexAttribArrayARB(array); - enabled_arrays &= ~mask; - } - else if(!(enabled_arrays&mask) && en) + set_dirty(); + return &data[0]+i*stride; +} + +void VertexArray::set_dirty() +{ + dirty = true; + if(defer_vbuf) { - if(mask<16) - glEnableClientState(array); - else - glEnableVertexAttribArrayARB(array); - enabled_arrays |= mask; + vbuf = new Buffer(ARRAY_BUFFER); + defer_vbuf = false; } } -unsigned VertexArray::enabled_arrays = 0; + +VertexArray::ArrayMask::ArrayMask() +{ + for(unsigned i=0; i(&Loader::texcoord)); add("texcoord3", static_cast(&Loader::texcoord)); add("texcoord4", static_cast(&Loader::texcoord)); + add("multitexcoord1", static_cast(&Loader::multitexcoord)); + add("multitexcoord2", static_cast(&Loader::multitexcoord)); + add("multitexcoord3", static_cast(&Loader::multitexcoord)); + add("multitexcoord4", static_cast(&Loader::multitexcoord)); add("color3", static_cast(&Loader::color)); add("color4", static_cast(&Loader::color)); add("attrib1", static_cast(&Loader::attrib)); @@ -186,27 +233,5 @@ VertexArray::Loader::Loader(VertexArray &a): add("attrib4", static_cast(&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