]> git.tdb.fi Git - libs/gl.git/blobdiff - source/vertexarray.cpp
Check the flat qualifier from the correct member
[libs/gl.git] / source / vertexarray.cpp
diff --git a/source/vertexarray.cpp b/source/vertexarray.cpp
deleted file mode 100644 (file)
index 6c037f9..0000000
+++ /dev/null
@@ -1,238 +0,0 @@
-#include "arb_multitexture.h"
-#include "arb_vertex_shader.h"
-#include "buffer.h"
-#include "error.h"
-#include "gl.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)
-{
-       reset(f);
-}
-
-VertexArray::~VertexArray()
-{ }
-
-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::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::clear()
-{
-       data.clear();
-}
-
-void VertexArray::reserve(unsigned n)
-{
-       data.reserve(n*stride);
-}
-
-float *VertexArray::append()
-{
-       data.insert(data.end(), stride, 0.0f);
-       set_dirty();
-       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;
-       }
-}
-
-void VertexArray::apply() const
-{
-       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 = get_component_size(*c);
-               unsigned t = get_component_type(*c);
-               bool en = enabled_arrays.is_set(t);
-               if(t==get_component_type(VERTEX3))
-               {
-                       glVertexPointer(sz, GL_FLOAT, bpv, base+offset);
-                       if(!en)
-                               glEnableClientState(GL_VERTEX_ARRAY);
-               }
-               else if(t==get_component_type(NORMAL3))
-               {
-                       glNormalPointer(GL_FLOAT, bpv, base+offset);
-                       if(!en)
-                               glEnableClientState(GL_NORMAL_ARRAY);
-               }
-               else if(t==get_component_type(COLOR4_FLOAT))
-               {
-                       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);
-               }
-               else if(*c>=TEXCOORD1 && *c<=TEXCOORD4+28)
-               {
-                       t -= get_component_type(TEXCOORD1);
-                       if(t>0 || active_tex)
-                       {
-                               glClientActiveTexture(GL_TEXTURE0+t);
-                               active_tex = t;
-                       }
-                       glTexCoordPointer(sz, GL_FLOAT, bpv, base+offset);
-                       if(!en)
-                               glEnableClientState(GL_TEXTURE_COORD_ARRAY);
-               }
-               else
-               {
-                       t -= get_component_type(ATTRIB1);
-                       glVertexAttribPointer(t, sz, GL_FLOAT, false, bpv, base+offset);
-                       if(!en)
-                               glEnableVertexAttribArray(t);
-               }
-               found.set(t);
-               offset += sz;
-       }
-
-       for(unsigned i=0; i<64; ++i)
-               if(enabled_arrays.is_set(i) && !found.is_set(i))
-               {
-                       if(i==get_component_type(VERTEX3))
-                               glDisableClientState(GL_VERTEX_ARRAY);
-                       else if(i==get_component_type(NORMAL3))
-                               glDisableClientState(GL_NORMAL_ARRAY);
-                       else if(i==get_component_type(COLOR4_FLOAT))
-                               glDisableClientState(GL_COLOR_ARRAY);
-                       else if(i>=get_component_type(TEXCOORD1) && i<=get_component_type(TEXCOORD1)+7)
-                       {
-                               unsigned j = i-get_component_type(TEXCOORD1);
-                               if(j>0 || active_tex)
-                                       glClientActiveTexture(GL_TEXTURE0+j);
-                               glDisableClientState(GL_TEXTURE_COORD_ARRAY);
-                               active_tex = j;
-                       }
-                       else
-                               glDisableVertexAttribArray(i-get_component_type(ATTRIB1));
-               }
-
-       enabled_arrays = found;
-
-       if(active_tex)
-               glClientActiveTexture(GL_TEXTURE0);
-
-       if(vbuf)
-               Buffer::unbind_from(ARRAY_BUFFER);
-}
-
-
-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));
-}
-
-
-VertexArray::Loader::Loader(VertexArray &a):
-       VertexArrayBuilder(a)
-{
-       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("normal3",   static_cast<void (Loader::*)(float, float, float)>(&Loader::normal));
-       add("texcoord1", static_cast<void (Loader::*)(float)>(&Loader::texcoord));
-       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));
-}
-
-} // namespace GL
-} // namespace Msp