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

Remove rotation and shift meridian from RenderablePlanetProjection

Browse Source 
Unify the property names in RenderablePlanet
Remove MainFrame from RenderableShadowCylinder
Clean up dictionary keys for RenderableModel, RenderableModelProjection, RenderablePlanetProjection
This commit is contained in:
Alexander Bock
2017-07-27 01:12:27 -04:00
parent 8c581fc7d9
commit e794f6ae01
49 changed files with 167 additions and 438 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
modules/base/rendering/renderablemodel.cpp
View File

@@ -44,11 +44,9 @@
namespace {
const char* KeyGeometry = "Geometry";
const char* KeyTexture = "Textures.Color";
const char* KeyModelTransform = "ModelTransform";
static const openspace::properties::Property::PropertyInfo TextureInfo = {
"ColorTexture", // @TODO replace with only "Texture"
"ColorTexture",
"Color Texture",
"This value points to a color texture file that is applied to the geometry "
"rendered in this object."
@@ -84,7 +82,7 @@ documentation::Documentation RenderableModel::Documentation() {
"This specifies the model that is rendered by the Renderable."
},
{
KeyTexture, // @TODO replace with TextureInfo.identifier
TextureInfo.identifier,
new StringVerifier,
Optional::Yes,
TextureInfo.description
@@ -132,12 +130,14 @@ RenderableModel::RenderableModel(const ghoul::Dictionary& dictionary)
_geometry = modelgeometry::ModelGeometry::createFromDictionary(dict);
}
if (dictionary.hasKey(KeyTexture)) {
_colorTexturePath = absPath(dictionary.value<std::string>(KeyTexture));
if (dictionary.hasKey(TextureInfo.identifier)) {
_colorTexturePath = absPath(dictionary.value<std::string>(
TextureInfo.identifier
));
}
if (dictionary.hasKey(KeyModelTransform)) {
_modelTransform = dictionary.value<glm::dmat3>(KeyModelTransform);
if (dictionary.hasKey(ModelTransformInfo.identifier)) {
_modelTransform = dictionary.value<glm::dmat3>(ModelTransformInfo.identifier);
}
if (dictionary.hasKey(ShadingInfo.identifier)) {