diff --git a/modules/base/rendering/modelgeometry.cpp b/modules/base/rendering/modelgeometry.cpp index 0dd31dea6c..e29e3adaf8 100644 --- a/modules/base/rendering/modelgeometry.cpp +++ b/modules/base/rendering/modelgeometry.cpp @@ -76,7 +76,7 @@ ModelGeometry::ModelGeometry(const ghoul::Dictionary& dictionary) success = dictionary.getValue(keySize, _magnification); if (!success) - _magnification = 4; // if not set, models will be 1:1000, feel free to change @AA + _magnification = 0; // if not set, models will be 1:1 (earlier 1:1000) @AA success = dictionary.getValue(keyObjFile, _file); if (!success) { diff --git a/modules/base/rendering/modelgeometry.h b/modules/base/rendering/modelgeometry.h index 70450a8fef..c49b7b36f5 100644 --- a/modules/base/rendering/modelgeometry.h +++ b/modules/base/rendering/modelgeometry.h @@ -59,7 +59,7 @@ namespace openspace { bool loadObj(const std::string& filename); bool loadCachedFile(const std::string& filename); bool saveCachedFile(const std::string& filename); - int _magnification; + float _magnification; GLuint _vaoID; GLuint _vbo; diff --git a/modules/base/rendering/wavefrontgeometry.cpp b/modules/base/rendering/wavefrontgeometry.cpp index 4717d6615a..999e43bbbd 100644 --- a/modules/base/rendering/wavefrontgeometry.cpp +++ b/modules/base/rendering/wavefrontgeometry.cpp @@ -30,8 +30,6 @@ namespace { const std::string _loggerCat = "WavefrontGeometry"; - const std::string keyObjFile = "ObjFile"; -// const int8_t CurrentCacheVersion = 3; } namespace openspace {