mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-24 22:09:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merged master into atm.

Browse Source
This commit is contained in:
Jonathas Costa
2017-08-16 12:00:28 -04:00
parent f95411b1cc 904ea5b447
commit 2d0da72a50
702 changed files with 6580 additions and 6798 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
modules/base/rendering/renderabletrail.cpp
View File

@@ -111,39 +111,39 @@ documentation::Documentation RenderableTrail::Documentation() {
{
KeyTranslation,
new ReferencingVerifier("core_transform_translation"),
Optional::No,
"This object is used to compute locations along the path. Any "
"Translation object can be used here.",
Optional::No
"Translation object can be used here."
},
{
LineColorInfo.identifier,
new DoubleVector3Verifier,
LineColorInfo.description,
Optional::No
Optional::No,
LineColorInfo.description
},
{
EnableFadeInfo.identifier,
new BoolVerifier,
EnableFadeInfo.description,
Optional::Yes
Optional::Yes,
EnableFadeInfo.description
},
{
FadeInfo.identifier,
new DoubleVerifier,
FadeInfo.description,
Optional::Yes
Optional::Yes,
FadeInfo.description
},
{
LineWidthInfo.identifier,
new DoubleVerifier,
LineWidthInfo.description,
Optional::Yes
Optional::Yes,
LineWidthInfo.description
},
{
PointSizeInfo.identifier,
new DoubleVerifier,
PointSizeInfo.description,
Optional::Yes
Optional::Yes,
PointSizeInfo.description
},
{
RenderingModeInfo.identifier,
@@ -151,11 +151,10 @@ documentation::Documentation RenderableTrail::Documentation() {
// Taken from the RenderingModeConversion map above
{ "Lines", "Points", "Lines+Points", "Points+Lines" }
),
RenderingModeInfo.description,
Optional::Yes
Optional::Yes,
RenderingModeInfo.description
}
},
Exhaustive::No
}
};
}
@@ -169,9 +168,9 @@ RenderableTrail::RenderableTrail(const ghoul::Dictionary& dictionary)
, _renderingModes(RenderingModeInfo, properties::OptionProperty::DisplayType::Dropdown
)
{
_translation = std::unique_ptr<Translation>(Translation::createFromDictionary(
_translation = Translation::createFromDictionary(
dictionary.value<ghoul::Dictionary>(KeyTranslation)
));
);
addPropertySubOwner(_translation.get());
_lineColor = dictionary.value<glm::vec3>(LineColorInfo.identifier);
@@ -218,7 +217,7 @@ RenderableTrail::RenderableTrail(const ghoul::Dictionary& dictionary)
addProperty(_renderingModes);
}
bool RenderableTrail::initialize() {
void RenderableTrail::initialize() {
RenderEngine& renderEngine = OsEng.renderEngine();
_programObject = renderEngine.buildRenderProgram(
"EphemerisProgram",
@@ -227,17 +226,14 @@ bool RenderableTrail::initialize() {
);
setRenderBin(Renderable::RenderBin::Overlay);
return true;
}
bool RenderableTrail::deinitialize() {
void RenderableTrail::deinitialize() {
RenderEngine& renderEngine = OsEng.renderEngine();
if (_programObject) {
renderEngine.removeRenderProgram(_programObject);
_programObject = nullptr;
}
return true;
}
bool RenderableTrail::isReady() const {
@@ -250,7 +246,7 @@ void RenderableTrail::render(const RenderData& data, RendererTasks&) {
glm::dmat4 modelTransform =
glm::translate(glm::dmat4(1.0), data.modelTransform.translation) *
glm::dmat4(data.modelTransform.rotation) *
glm::dmat4(glm::scale(glm::dmat4(1.0), glm::dvec3(data.modelTransform.scale)));
glm::scale(glm::dmat4(1.0), glm::dvec3(data.modelTransform.scale));
_programObject->setUniform("projectionTransform", data.camera.projectionMatrix());