X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fvertexformat.cpp;h=3db7542f4da68ab240ed17d7773299908dbcc7d9;hb=63458ee3bedacf4d498074fcec15600a4932ae7b;hp=8e358acd2d0394992925f05b26acd632b4427845;hpb=a4d83d3748cdde8cf30683d36a040d3dfacfd693;p=libs%2Fgl.git diff --git a/source/core/vertexformat.cpp b/source/core/vertexformat.cpp index 8e358acd..3db7542f 100644 --- a/source/core/vertexformat.cpp +++ b/source/core/vertexformat.cpp @@ -1,8 +1,4 @@ -#include -#include #include -#include -#include #include "error.h" #include "vertexformat.h" @@ -11,10 +7,6 @@ using namespace std; namespace Msp { namespace GL { -VertexFormat::VertexFormat(): - count(0) -{ } - VertexFormat::VertexFormat(VertexAttribute a): count(1) { @@ -196,7 +188,8 @@ void operator>>(const LexicalConverter &conv, VertexAttribute &a) convert_attribute(str, "GROUP", 1, 4, a, GROUP1) || convert_attribute(str, "WEIGHT", 1, 4, a, WEIGHT1) || convert_attribute(str, "TEXCOORD", 1, 4, a, TEXCOORD1) || - convert_attribute(str, "GENERIC", 1, 4, a, GENERIC1)) + convert_attribute(str, "GENERIC", 1, 4, a, GENERIC1) || + convert_attribute(str, "PADDING", 1, 4, a, PADDING1)) return; } catch(...)