Apply coding styles

This commit is contained in:
Alexander Bock
2018-03-08 05:32:46 -05:00
parent c5c95a5640
commit 5a3ef0fda2
38 changed files with 141 additions and 121 deletions
@@ -56,7 +56,7 @@ namespace {
constexpr const char* KeyBoundsSimplification = "SimplifyBounds";
const int InterpolationSteps = 5;
const double Epsilon = 1e-4;
static const openspace::properties::Property::PropertyInfo LineWidthInfo = {
@@ -360,7 +360,7 @@ void RenderableFov::initializeGL() {
"RenderableFov"
);
}
if (_simplifyBounds) {
const size_t sizeBefore = res.bounds.size();
for (size_t i = 1; i < res.bounds.size() - 1; ++i) {
@@ -225,7 +225,9 @@ void RenderableModelProjection::initializeGL() {
_fboUniformCache.ProjectorMatrix = _fboProgramObject->uniformLocation(
"ProjectorMatrix"
);
_fboUniformCache.ModelTransform = _fboProgramObject->uniformLocation("ModelTransform");
_fboUniformCache.ModelTransform = _fboProgramObject->uniformLocation(
"ModelTransform"
);
_fboUniformCache.boresight = _fboProgramObject->uniformLocation("boresight");
@@ -604,7 +604,10 @@ void RenderablePlanetProjection::render(const RenderData& data, RendererTasks&)
glm::dmat4 modelViewTransform = data.camera.combinedViewMatrix() * modelTransform;
_programObject->setUniform(_mainUniformCache.modelTransform, glm::mat4(modelTransform));
_programObject->setUniform(
_mainUniformCache.modelTransform,
glm::mat4(modelTransform)
);
_programObject->setUniform(_mainUniformCache
.modelViewProjectionTransform,
data.camera.projectionMatrix() * glm::mat4(modelViewTransform)