-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007-2010 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
#include <cstring>
+#include <msp/strings/format.h>
#include <msp/strings/lexicalcast.h>
#include <msp/strings/utils.h>
-#include "except.h"
+#include "error.h"
#include "vertexformat.h"
using namespace std;
delete[] data;
}
-unsigned VertexFormat::stride() const
-{
- unsigned s = 0;
- for(const unsigned char *i=begin(); i!=end(); ++i)
- s += (*i&3)+1;
- return s;
-}
-
-VertexFormat operator,(const VertexFormat &f, VertexComponent c)
+VertexFormat VertexFormat::operator,(VertexComponent c) const
{
- VertexFormat r = f;
+ VertexFormat r = *this;
if(r.data)
{
const unsigned char n = ++r.data[0];
return r;
}
-VertexFormat operator,(const VertexFormat &f, unsigned i)
+VertexFormat VertexFormat::operator,(unsigned i) const
{
- if(!f.data)
- throw InvalidState("VertexFormat has no components");
- VertexFormat r = f;
+ if(!data)
+ throw invalid_operation("VertexFormat::operator,");
+ VertexFormat r = *this;
unsigned char *c = r.data+r.data[0];
if((*c<TEXCOORD1 && i>0) || (*c<ATTRIB1 && i>=8) || i>=53)
- throw InvalidParameterValue("Vertex component index out of range");
+ throw invalid_argument("VertexFormat::operator,");
*c += i*4;
return r;
}
+unsigned VertexFormat::stride() const
+{
+ unsigned s = 0;
+ for(const unsigned char *i=begin(); i!=end(); ++i)
+ s += get_component_size(*i);
+ return s;
+}
+
+int VertexFormat::offset(VertexComponent comp, unsigned index) const
+{
+ if((comp<TEXCOORD1 && index>0) || (comp<ATTRIB1 && index>=8) || index>=53)
+ throw out_of_range("VertexFormat::offset");
+
+ unsigned type = get_component_type(comp)+index;
+ unsigned size = get_component_size(comp);
+ unsigned offs = 0;
+ for(const unsigned char *i=begin(); i!=end(); ++i)
+ {
+ if(get_component_type(*i)==type)
+ {
+ if(get_component_size(*i)>=size)
+ return offs;
+ else
+ return -1;
+ }
+ else
+ offs += get_component_size(*i);
+ }
+
+ return -1;
+}
+
void operator>>(const LexicalConverter &conv, VertexComponent &c)
{
const string &str = conv.get();
else if(str.size()==11 && str[9]=='_' && str[10]>='0' && str[10]<='7')
c = static_cast<VertexComponent>(TEXCOORD1+(str[8]-'1')+(str[10]-'0')*4);
else
- throw LexicalError("Invalid texture unit in VertexComponent conversion");
+ throw lexical_error(format("conversion of '%s' to VertexComponent", str));
}
else if(str.size()>=9 && !str.compare(0, 6, "ATTRIB") && str[6]>='1' && str[6]<='4' && str[7]=='_')
{
{
n = lexical_cast<unsigned>(str.substr(8));
}
- catch(const LexicalError &)
+ catch(const lexical_error &)
{
- throw LexicalError("Invalid attribute in VertexComponent conversion");
+ throw lexical_error(format("conversion of '%s' to VertexComponent", str));
}
c = static_cast<VertexComponent>(ATTRIB1+(str[6]-'1')+n*4);
}
else
- throw LexicalError("Invalid input in VertexComponent conversion");
+ throw lexical_error(format("conversion of '%s' to VertexComponent", str));
}
// XXX This will go away eventually