X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmesh.cpp;h=508054a521346ac45e394848fb0c7ec11f0fe799;hb=43c6495ff3d14a85ee5de169a80fdacf13b7147e;hp=c111817d4240ff543cd50a7342067c12c0f19b26;hpb=ccbcce1d5c7fae8ec644e465ac936f5c39000e57;p=libs%2Fgl.git diff --git a/source/mesh.cpp b/source/mesh.cpp index c111817d..508054a5 100644 --- a/source/mesh.cpp +++ b/source/mesh.cpp @@ -1,13 +1,6 @@ -/* $Id$ - -This file is part of libmspgl -Copyright © 2007-2011 Mikko Rasa, Mikkosoft Productions -Distributed under the LGPL -*/ - #include "buffer.h" -#include "extension.h" #include "mesh.h" +#include "nv_primitive_restart.h" #include "renderer.h" using namespace std; @@ -76,7 +69,7 @@ void Mesh::add_batch(const Batch &b) PrimitiveType type = b.get_type(); can_append = (type==batches.back().get_type() && type!=LINE_STRIP && type!=LINE_LOOP && type!=POLYGON && - (type!=TRIANGLE_FAN || is_supported("GL_NV_primitive_restart"))); + (type!=TRIANGLE_FAN || NV_primitive_restart)); } if(defer_ibuf) @@ -92,7 +85,7 @@ void Mesh::add_batch(const Batch &b) Batch *prev = (batches.empty() ? 0 : &batches.back()); batches.push_back(b); if(ibuf) - batches.back().use_index_buffer(ibuf, prev); + batches.back().use_buffer(ibuf, prev); } } @@ -137,9 +130,15 @@ Mesh::Loader::Loader(Mesh &m): add("winding", &Loader::winding); } -void Mesh::Loader::vertices(VertexFormat f) +void Mesh::Loader::vertices(const vector &c) { - obj.vertices.reset(f); + if(c.empty()) + throw invalid_argument("No vertex components"); + + VertexFormat fmt; + for(vector::const_iterator i=c.begin(); i!=c.end(); ++i) + fmt = (fmt, *i); + obj.vertices.reset(fmt); load_sub(obj.vertices); }