if (buf.tex_coords.size() < buf.vertices.size()) {
std::cerr << "EntityModel: not enough tex coords!" << std::endl;
}
- if (buf.colors.size() < buf.vertices.size()) {
- std::cerr << "EntityModel: not enough colors!" << std::endl;
+ if (buf.hsl_mods.size() < buf.vertices.size()) {
+ std::cerr << "BlockModel: not enough HSL modifiers!" << std::endl;
+ }
+ if (buf.rgb_mods.size() < buf.vertices.size()) {
+ std::cerr << "BlockModel: not enough RGB modifiers!" << std::endl;
}
if (buf.normals.size() < buf.vertices.size()) {
std::cerr << "EntityModel: not enough normals!" << std::endl;
vao.Bind();
vao.PushAttribute(ATTRIB_VERTEX, buf.vertices);
vao.PushAttribute(ATTRIB_TEXCOORD, buf.tex_coords);
- vao.PushAttribute(ATTRIB_COLOR, buf.colors);
+ vao.PushAttribute(ATTRIB_HSL, buf.hsl_mods);
+ vao.PushAttribute(ATTRIB_RGB, buf.rgb_mods);
vao.PushAttribute(ATTRIB_NORMAL, buf.normals);
vao.PushIndices(ATTRIB_INDEX, buf.indices);
}
if (buf.tex_coords.size() < buf.vertices.size()) {
std::cerr << "BlockModel: not enough tex coords!" << std::endl;
}
- if (buf.colors.size() < buf.vertices.size()) {
- std::cerr << "BlockModel: not enough colors!" << std::endl;
+ if (buf.hsl_mods.size() < buf.vertices.size()) {
+ std::cerr << "BlockModel: not enough HSL modifiers!" << std::endl;
+ }
+ if (buf.rgb_mods.size() < buf.vertices.size()) {
+ std::cerr << "BlockModel: not enough RGB modifiers!" << std::endl;
}
if (buf.lights.size() < buf.vertices.size()) {
std::cerr << "BlockModel: not enough lights!" << std::endl;
vao.Bind();
vao.PushAttribute(ATTRIB_VERTEX, buf.vertices);
vao.PushAttribute(ATTRIB_TEXCOORD, buf.tex_coords);
- vao.PushAttribute(ATTRIB_COLOR, buf.colors);
+ vao.PushAttribute(ATTRIB_HSL, buf.hsl_mods);
+ vao.PushAttribute(ATTRIB_RGB, buf.rgb_mods);
vao.PushAttribute(ATTRIB_LIGHT, buf.lights);
vao.PushIndices(ATTRIB_INDEX, buf.indices);
}