X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgraphic.cpp;h=fb3f8893d2460112b88d0b71a6ce6c9790c92b61;hb=103ceeace366c6d80fce323438b31b9bbc167915;hp=75e10888ecde2eebef7202659aaf21320520fba8;hpb=b3234ca0277c5e282a2a0a2558b58edb25750653;p=libs%2Fgltk.git diff --git a/source/graphic.cpp b/source/graphic.cpp index 75e1088..fb3f889 100644 --- a/source/graphic.cpp +++ b/source/graphic.cpp @@ -6,11 +6,6 @@ using namespace std; namespace Msp { namespace GLtk { -Graphic::Graphic(): - texture(0), - repeat(false) -{ } - void Graphic::build(unsigned wd, unsigned ht, GL::PrimitiveBuilder &bld) const { vector x, y; @@ -21,18 +16,18 @@ void Graphic::build(unsigned wd, unsigned ht, GL::PrimitiveBuilder &bld) const create_texcoords(slice.x, slice.x+slice.w, border.left, border.right, texture->get_width(), u); create_texcoords(slice.y, slice.y+slice.h, border.bottom, border.top, texture->get_height(), v); - unsigned xmin = border.left ? 0 : 1; - unsigned xmax = x.size()-(border.right ? 2 : 3); - unsigned ymin = border.bottom ? 0 : 1; - unsigned ymax = y.size()-(border.top ? 2 : 3); + size_t xmin = border.left ? 0 : 1; + size_t xmax = x.size()-(border.right ? 2 : 3); + size_t ymin = border.bottom ? 0 : 1; + size_t ymax = y.size()-(border.top ? 2 : 3); bld.color(1.0f, 1.0f, 1.0f); - for(unsigned i=ymin; i<=ymax; ++i) + for(size_t i=ymin; i<=ymax; ++i) { - unsigned i2 = (i==0 ? 0 : i==y.size()-2 ? 2 : 1); - for(unsigned j=xmin; j<=xmax; ++j) + size_t i2 = (i==0 ? 0 : i==y.size()-2 ? 2 : 1); + for(size_t j=xmin; j<=xmax; ++j) { - unsigned j2 = (j==0 ? 0 : j==x.size()-2 ? 2 : 1); + size_t j2 = (j==0 ? 0 : j==x.size()-2 ? 2 : 1); if(j==xmin || (j>1 && jxmin)