#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;
int VertexFormat::offset(VertexComponent comp, unsigned index) const
{
if((comp<TEXCOORD1 && index>0) || (comp<ATTRIB1 && index>=8) || index>=53)
- throw InvalidParameterValue("Vertex component index out of range");
+ throw out_of_range("VertexFormat::offset");
unsigned type = (comp>>2)+index;
unsigned size = comp&3;
VertexFormat operator,(const VertexFormat &f, unsigned i)
{
if(!f.data)
- throw InvalidState("VertexFormat has no components");
+ throw invalid_operation("VertexFormat::operator,");
VertexFormat r = f;
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 out_of_range("VertexFormat::operator,");
*c += i*4;
return r;
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