X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fvertexarray.cpp;h=a4dffbb7bae4876af7c9535a1f965e8431b64f7b;hp=395f217a97ecff6c9c76c3a6985fdfa97f163978;hb=HEAD;hpb=5a07a1fdfa420d257221228676a3c76a5eb4f44f diff --git a/source/vertexarray.cpp b/source/vertexarray.cpp deleted file mode 100644 index 395f217a..00000000 --- a/source/vertexarray.cpp +++ /dev/null @@ -1,256 +0,0 @@ -/* $Id$ - -This file is part of libmspgl -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" - -using namespace std; - -namespace Msp { -namespace GL { - -VertexArray::VertexArray(const VertexFormat &f): - vbuf(0), - own_vbuf(false) -{ - reset(f); -} - -VertexArray::~VertexArray() -{ - if(own_vbuf) - delete vbuf; -} - -void VertexArray::use_vertex_buffer() -{ - if(vbuf && own_vbuf) - return; - - vbuf = new Buffer(ARRAY_BUFFER); - own_vbuf = true; - - update_data(); -} - -void VertexArray::use_vertex_buffer(Buffer *b) -{ - 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(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=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.empty()) - throw InvalidState("Trying to apply a vertex array with no data"); - - if(vbuf) - vbuf->bind(); - - 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) - { - 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: - 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.set(t); - offset += sz; - } - - 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) - vbuf->unbind(); -} - -/** -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(); - } -} - -float *VertexArray::append() -{ - data.insert(data.end(), stride, 0.0f); - return &*data.end()-stride; -} - -VertexArray::ArrayMask VertexArray::enabled_arrays; - - -VertexArray::ArrayMask::ArrayMask() -{ - for(unsigned i=0; i(&Loader::vertex)); - add("vertex3", static_cast(&Loader::vertex)); - add("vertex4", static_cast(&Loader::vertex)); - add("normal3", static_cast(&Loader::normal)); - add("texcoord1", static_cast(&Loader::texcoord)); - add("texcoord2", static_cast(&Loader::texcoord)); - add("texcoord3", static_cast(&Loader::texcoord)); - 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, 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