mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-24 04:58:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix the scaling of renderablemodel by making the magnification a floatproperty

Browse Source
This commit is contained in:
Alexander Bock
2015-07-01 17:56:51 +02:00
parent 8f88ead113
commit 40c42ff772
8 changed files with 80 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/base/rendering/wavefrontgeometry.h
+12 -12
View File
@@ -29,23 +29,23 @@
namespace openspace {
class RenderableModel;
class RenderableModelProjection;
class RenderableModel;
class RenderableModelProjection;
namespace modelgeometry {
namespace modelgeometry {
class WavefrontGeometry : public ModelGeometry {
public:
WavefrontGeometry(const ghoul::Dictionary& dictionary);
class WavefrontGeometry : public ModelGeometry {
public:
WavefrontGeometry(const ghoul::Dictionary& dictionary);
bool initialize(Renderable* parent) override;
void deinitialize() override;
bool initialize(Renderable* parent) override;
void deinitialize() override;
private:
bool loadModel(const std::string& filename);
};
private:
bool loadModel(const std::string& filename);
};
} // namespace modelgeometry
} // namespace modelgeometry
} // namespace openspace
#endif // __WAVEFRONTOBJECT_H__