mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-07 04:00:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixing bug in model magnification

Browse Source
This commit is contained in:
Anton Arbring
2015-06-25 20:07:21 -04:00
parent c7a3048dda
commit 4e72e248c3
3 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/base/rendering/modelgeometry.cpp
View File

@@ -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) {

2
modules/base/rendering/modelgeometry.h
View File

@@ -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;

2
modules/base/rendering/wavefrontgeometry.cpp
View File

@@ -30,8 +30,6 @@
namespace {
const std::string _loggerCat = "WavefrontGeometry";
const std::string keyObjFile = "ObjFile";
// const int8_t CurrentCacheVersion = 3;
}
namespace openspace {