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

Add strict test for whitespace at end of line

Browse Source 
More work on coding style
This commit is contained in:
Alexander Bock
2017-11-09 23:47:51 -05:00
parent 7b12a241ed
commit afa1d6d33e
223 changed files with 1402 additions and 961 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/digitaluniverse/rendering/renderablepoints.cpp
+6 -6
View File
@@ -62,7 +62,7 @@ namespace {
static const openspace::properties::Property::PropertyInfo SpriteTextureInfo = {
"Texture",
"Point Sprite Texture",
"The path to the texture that should be used as the point sprite."
"The path to the texture that should be used as the point sprite."
};
static const openspace::properties::Property::PropertyInfo TransparencyInfo = {
@@ -112,7 +112,7 @@ namespace openspace {
"The path to the SPECK file that contains information about the astronomical "
"object being rendered."
},
{
{
keyColor,
new Vector3Verifier<float>,
Optional::No,
@@ -184,7 +184,7 @@ namespace openspace {
}
else if (unit == KilometerUnit) {
_unit = Kilometer;
}
}
else if (unit == ParsecUnit) {
_unit = Parsec;
}
@@ -298,7 +298,7 @@ namespace openspace {
using IgnoreError = ghoul::opengl::ProgramObject::IgnoreError;
_program->setIgnoreUniformLocationError(IgnoreError::Yes);
_program->setUniform("modelViewProjectionTransform", glm::dmat4(data.camera.projectionMatrix()) *
_program->setUniform("modelViewProjectionTransform", glm::dmat4(data.camera.projectionMatrix()) *
data.camera.combinedViewMatrix() * modelMatrix);
_program->setUniform("color", _pointColor);
@@ -334,7 +334,7 @@ namespace openspace {
glDepthMask(true);
}
void RenderablePoints::update(const UpdateData&) {
void RenderablePoints::update(const UpdateData&) {
if (_dataIsDirty) {
LDEBUG("Regenerating data");
@@ -653,7 +653,7 @@ namespace openspace {
// Converting untis
if (_unit == Kilometer) {
p *= 1E3;
}
}
else if (_unit == Parsec) {
p *= PARSEC;
}