-/* $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 "arb_multitexture.h"
+#include "arb_vertex_shader.h"
+#include "buffer.h"
+#include "error.h"
#include "gl.h"
-#include "version_1_2.h"
-#include "version_1_3.h"
#include "vertexarray.h"
-#include "vertexbuffer.h"
using namespace std;
namespace GL {
VertexArray::VertexArray(const VertexFormat &f):
- vbuf(0),
- own_vbuf(false)
+ defer_vbuf(true),
+ dirty(false)
{
reset(f);
}
VertexArray::~VertexArray()
+{ }
+
+void VertexArray::reset(const VertexFormat &f)
+{
+ clear();
+ format = f;
+ stride = get_stride(format);
+
+ arrays.clear();
+
+ for(const unsigned char *c=format.begin(); c!=format.end(); ++c)
+ {
+ unsigned slot = get_array_slot(*c);
+ if(slot>=arrays.size())
+ arrays.resize(slot+1);
+ arrays[slot] = *c;
+ }
+}
+
+unsigned VertexArray::get_array_slot(unsigned char comp)
{
- if(own_vbuf)
- delete vbuf;
+ unsigned t = get_component_type(comp);
+ if(t==get_component_type(VERTEX3))
+ return 0;
+ else if(t==get_component_type(NORMAL3))
+ return 1;
+ else if(t==get_component_type(COLOR4_FLOAT))
+ return 2;
+ else if(comp>=TEXCOORD1 && comp<=TEXCOORD4+12)
+ {
+ t -= get_component_type(TEXCOORD1);
+ if(t>0)
+ static Require _req(ARB_multitexture);
+ return 3+t;
+ }
+ else
+ {
+ static Require _req(ARB_vertex_shader);
+ if(comp>=ATTRIB1)
+ t -= get_component_type(ATTRIB1);
+ return 7+t;
+ }
}
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;
+ vbuf.keep();
+ defer_vbuf = false;
+ dirty = true;
+}
- update_data();
+void VertexArray::clear()
+{
+ data.clear();
}
void VertexArray::reserve(unsigned n)
data.reserve(n*stride);
}
-void VertexArray::clear()
+float *VertexArray::append()
{
- data.clear();
+ data.insert(data.end(), stride, 0.0f);
+ set_dirty();
+ return &*(data.end()-stride);
}
-void VertexArray::reset(const VertexFormat &f)
+float *VertexArray::modify(unsigned i)
{
- clear();
- format = f;
- stride = get_stride(format);
+ set_dirty();
+ return &data[0]+i*stride;
+}
- bool has_multitex = false;
- bool has_gen_attrs = false;
- for(const unsigned char *c=format.begin(); c!=format.end(); ++c)
+void VertexArray::set_dirty()
+{
+ dirty = true;
+ if(defer_vbuf)
{
- if(*c>=TEXCOORD1+4 && *c<ATTRIB1)
- has_multitex = true;
- if(*c>=ATTRIB1)
- has_gen_attrs = true;
+ vbuf = new Buffer(ARRAY_BUFFER);
+ defer_vbuf = false;
}
- 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");
+ throw invalid_operation("VertexArray::apply");
+
+ const VertexArray *old = current();
+ if(!set_current(this))
+ return;
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;
- ArrayMask found;
- unsigned bpv = stride*sizeof(float);
+ unsigned stride_bytes = stride*sizeof(float);
unsigned active_tex = 0;
- for(const unsigned char *c=format.begin(); c!=format.end(); ++c)
+ unsigned n_arrays = arrays.size();
+ if(old)
+ n_arrays = max(n_arrays, old->arrays.size());
+ for(unsigned i=0; i<n_arrays; ++i)
{
- unsigned sz = (*c&3)+1;
- unsigned t = *c>>2;
- bool en = enabled_arrays.is_set(t);
- switch(t)
+ unsigned char arr = (i<arrays.size() ? arrays[i] : 0);
+ unsigned char old_arr = (old && i<old->arrays.size() ? old->arrays[i] : 0);
+ if(!arr && !old_arr)
+ continue;
+
+ unsigned char comp = (arr ? arr : old_arr);
+ unsigned sz = get_component_size(comp);
+ unsigned t = get_component_type(comp);
+ GLenum array_type = 0;
+ if(t==get_component_type(VERTEX3))
{
- 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(arr)
+ glVertexPointer(sz, GL_FLOAT, stride_bytes, base+offset);
+ array_type = GL_VERTEX_ARRAY;
+ }
+ else if(t==get_component_type(NORMAL3))
+ {
+ if(arr)
+ glNormalPointer(GL_FLOAT, stride_bytes, base+offset);
+ array_type = GL_NORMAL_ARRAY;
+ }
+ else if(t==get_component_type(COLOR4_FLOAT))
+ {
+ if(arr)
{
- 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);
+ if(sz==1)
+ glColorPointer(4, GL_UNSIGNED_BYTE, stride_bytes, base+offset);
+ else
+ glColorPointer(sz, GL_FLOAT, stride_bytes, base+offset);
}
- else
+ array_type = GL_COLOR_ARRAY;
+ }
+ else if(comp>=TEXCOORD1 && comp<=TEXCOORD4+12)
+ {
+ t -= get_component_type(TEXCOORD1);
+ if(t>0 || active_tex)
{
- glVertexAttribPointerARB(t-11, sz, GL_FLOAT, false, bpv, base+offset);
- if(!en)
- glEnableVertexAttribArrayARB(t-11);
+ glClientActiveTexture(GL_TEXTURE0+t);
+ active_tex = t;
}
- break;
+ if(arr)
+ glTexCoordPointer(sz, GL_FLOAT, stride_bytes, base+offset);
+ array_type = GL_TEXTURE_COORD_ARRAY;
+ }
+ else
+ {
+ if(t>=get_component_type(ATTRIB1))
+ t -= get_component_type(ATTRIB1);
+ if(arr)
+ glVertexAttribPointer(t, sz, GL_FLOAT, false, stride_bytes, base+offset);
}
- found.set(t);
- offset += sz;
- }
- for(unsigned i=0; i<64; ++i)
- if(enabled_arrays.is_set(i) && !found.is_set(i))
+ // Only change enable state if needed
+ if(arr && !old_arr)
{
- 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);
- }
+ if(array_type)
+ glEnableClientState(array_type);
+ else
+ glEnableVertexAttribArray(t);
+ }
+ else if(old_arr && !arr)
+ {
+ if(array_type)
+ glDisableClientState(array_type);
else
- glDisableVertexAttribArrayARB(i-11);
+ glDisableVertexAttribArray(t);
}
- enabled_arrays = found;
+ if(arr)
+ offset += sz;
+ }
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<N; ++i)
- mask[i] = 0;
-}
-
-void VertexArray::ArrayMask::set(unsigned bit)
-{
- mask[bit/B] |= 1<<(bit%B);
-}
-
-bool VertexArray::ArrayMask::is_set(unsigned bit) const
-{
- return mask[bit/B]&(1<<(bit%B));
+ Buffer::unbind_from(ARRAY_BUFFER);
}
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("multitexcoord1", static_cast<void (Loader::*)(unsigned, float)>(&Loader::multitexcoord));
+ add("multitexcoord2", static_cast<void (Loader::*)(unsigned, float, float)>(&Loader::multitexcoord));
+ add("multitexcoord3", static_cast<void (Loader::*)(unsigned, float, float, float)>(&Loader::multitexcoord));
+ add("multitexcoord4", static_cast<void (Loader::*)(unsigned, float, float, float, float)>(&Loader::multitexcoord));
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);
+ add("tangent3", static_cast<void (Loader::*)(float, float, float)>(&Loader::tangent));
+ add("binormal3", static_cast<void (Loader::*)(float, float, float)>(&Loader::binormal));
}
} // namespace GL
projects / libs / gl.git / blobdiff