* fix typedef's
* fix virtual dtor's
* make ctor's with one argument explicit
* util::noncopyable utility class  ( class my_object : private noncopyable {} )
* update kTileURL
This commit is contained in:
artemp
2014-02-06 10:25:36 +00:00
parent 61c69f5872
commit d6654ccaed
18 changed files with 78 additions and 97 deletions

View File

@@ -15,7 +15,7 @@ uint32_t LineBuffer::length() const {
return array.size() / 4;
}
void LineBuffer::add(int16_t x, int16_t y, float ex, float ey, int8_t tx, int8_t ty, int32_t linesofar) {
void LineBuffer::add(vertex_type x, vertex_type y, float ex, float ey, int8_t tx, int8_t ty, int32_t linesofar) {
array.push_back((x * 2) | tx);
array.push_back((y * 2) | ty);
array.push_back(linesofar);
@@ -40,7 +40,7 @@ void LineBuffer::bind() {
glBindBuffer(GL_ARRAY_BUFFER, buffer);
if (dirty) {
glBufferData(GL_ARRAY_BUFFER, array.size() * sizeof(int16_t), array.data(), GL_STATIC_DRAW);
glBufferData(GL_ARRAY_BUFFER, array.size() * sizeof(vertex_type), array.data(), GL_STATIC_DRAW);
dirty = false;
}
}