diff --git a/include/glumodel.h b/include/glumodel.h index 3b80dc3..a1f4971 100644 --- a/include/glumodel.h +++ b/include/glumodel.h @@ -13,7 +13,7 @@ Vec* pos; Vec* rot; Material* mat; - float scale; + float scalefactor; GenericModel(); GenericModel(Vec _pos, Material _mat); diff --git a/sources/glumodel.cpp b/sources/glumodel.cpp index 55318a8..8825884 100644 --- a/sources/glumodel.cpp +++ b/sources/glumodel.cpp @@ -16,7 +16,7 @@ void GenericModel::init(Vec _pos, Material _mat) { pos = _pos.clone(); rot = new Vec(0,0,0); - scale = 1; + scalefactor = 1; mat = _mat.clone(); pt = gluNewQuadric(); visible = true; @@ -31,7 +31,7 @@ } void GenericModel::scale ( float s ) { - scale = scale * s; + scalefactor = scalefactor * s; } void GenericModel::setColor(Color* c) {