-#include "arb_multitexture.h"
-#include "arb_vertex_shader.h"
+#include <msp/gl/extensions/arb_multitexture.h>
+#include <msp/gl/extensions/arb_vertex_shader.h>
#include "buffer.h"
#include "error.h"
#include "gl.h"
+#include "mesh.h"
#include "vertexarray.h"
using namespace std;
namespace Msp {
namespace GL {
-VertexArray::ArrayMask VertexArray::enabled_arrays;
-
-VertexArray::VertexArray(const VertexFormat &f):
- defer_vbuf(true),
- dirty(false)
+VertexArray::VertexArray(const VertexFormat &f)
{
reset(f);
}
-VertexArray::~VertexArray()
-{ }
-
-void VertexArray::use_vertex_buffer()
-{
- if(vbuf)
- return;
-
- vbuf = new Buffer(ARRAY_BUFFER);
- defer_vbuf = false;
- dirty = true;
-}
-
-void VertexArray::use_vertex_buffer(Buffer *b)
-{
- vbuf = b;
- vbuf.keep();
- defer_vbuf = false;
- dirty = true;
-}
-
-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_multitex = true;
- if(*c>=ATTRIB1)
- has_gen_attrs = true;
- }
- if(has_multitex)
- static Require _req(ARB_multitexture);
- if(has_gen_attrs)
- static Require _req(ARB_vertex_shader);
}
-void VertexArray::apply() const
+void VertexArray::clear()
{
- if(format.empty())
- throw invalid_operation("VertexArray::apply");
-
- if(vbuf)
- {
- vbuf->bind_to(ARRAY_BUFFER);
- if(dirty)
- {
- vbuf->data(data.size()*sizeof(float), &data[0]);
- dirty = false;
- }
- }
-
- 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
- {
- glVertexAttribPointer(t-11, sz, GL_FLOAT, false, bpv, base+offset);
- if(!en)
- glEnableVertexAttribArray(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);
- active_tex = i-3;
- }
- else
- glDisableVertexAttribArray(i-11);
- }
-
- enabled_arrays = found;
-
- if(active_tex)
- glClientActiveTexture(GL_TEXTURE0);
+ data.clear();
+}
- if(vbuf)
- Buffer::unbind_from(ARRAY_BUFFER);
+void VertexArray::reserve(unsigned n)
+{
+ data.reserve(n*stride);
}
float *VertexArray::append()
{
data.insert(data.end(), stride, 0.0f);
- set_dirty();
+ update_offset();
+ dirty = true;
return &*(data.end()-stride);
}
float *VertexArray::modify(unsigned i)
-{
- set_dirty();
- return &data[0]+i*stride;
-}
-
-void VertexArray::set_dirty()
{
dirty = true;
- if(defer_vbuf)
- {
- vbuf = new Buffer(ARRAY_BUFFER);
- defer_vbuf = false;
- }
-}
-
-
-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);
+ return &data[0]+i*stride;
}
-bool VertexArray::ArrayMask::is_set(unsigned bit) const
+unsigned VertexArray::get_data_size() const
{
- return mask[bit/B]&(1<<(bit%B));
+ return data.size()*sizeof(float);
}
VertexArray::Loader::Loader(VertexArray &a):
VertexArrayBuilder(a)
{
+ add("vertex", static_cast<void (Loader::*)(float, float)>(&Loader::vertex));
+ add("vertex", static_cast<void (Loader::*)(float, float, float)>(&Loader::vertex));
+ add("vertex", static_cast<void (Loader::*)(float, float, float, float)>(&Loader::vertex));
+ add("normal", static_cast<void (Loader::*)(float, float, float)>(&Loader::normal));
+ add("texcoord", static_cast<void (Loader::*)(float)>(&Loader::texcoord));
+ add("texcoord", static_cast<void (Loader::*)(float, float)>(&Loader::texcoord));
+ add("texcoord", static_cast<void (Loader::*)(float, float, float)>(&Loader::texcoord));
+ add("texcoord", static_cast<void (Loader::*)(float, float, float, float)>(&Loader::texcoord));
+ add("multitexcoord", static_cast<void (Loader::*)(unsigned, float)>(&Loader::multitexcoord));
+ add("multitexcoord", static_cast<void (Loader::*)(unsigned, float, float)>(&Loader::multitexcoord));
+ add("multitexcoord", static_cast<void (Loader::*)(unsigned, float, float, float)>(&Loader::multitexcoord));
+ add("multitexcoord", static_cast<void (Loader::*)(unsigned, float, float, float, float)>(&Loader::multitexcoord));
+ add("color", static_cast<void (Loader::*)(float, float, float)>(&Loader::color));
+ add("color", static_cast<void (Loader::*)(float, float, float, float)>(&Loader::color));
+ add("attrib", static_cast<void (Loader::*)(unsigned, float)>(&Loader::attrib));
+ add("attrib", static_cast<void (Loader::*)(unsigned, float, float)>(&Loader::attrib));
+ add("attrib", static_cast<void (Loader::*)(unsigned, float, float, float)>(&Loader::attrib));
+ add("attrib", static_cast<void (Loader::*)(unsigned, float, float, float, float)>(&Loader::attrib));
+ add("tangent", static_cast<void (Loader::*)(float, float, float)>(&Loader::tangent));
+ add("binormal", static_cast<void (Loader::*)(float, float, float)>(&Loader::binormal));
+
add("vertex2", static_cast<void (Loader::*)(float, float)>(&Loader::vertex));
add("vertex3", static_cast<void (Loader::*)(float, float, float)>(&Loader::vertex));
add("vertex4", static_cast<void (Loader::*)(float, float, float, float)>(&Loader::vertex));
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));
+ 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