Merge branch 'feature/NewAtmosphere' of https://github.com/OpenSpace/OpenSpace into feature/NewAtmosphere

This commit is contained in:
Jonathas Costa
2017-12-07 10:16:29 -05:00
2 changed files with 2 additions and 2 deletions

View File

@@ -15,7 +15,7 @@ return {
-- Fade in value in the same unit as "Unit"
FadeInThreshould = 1000.0,
BillboardMaxSize = 200.0,
BillboardMinSize = 1.5,
BillboardMinSize = 0.5,
},
GuiPath = "/Universe/Quasars"
}

View File

@@ -421,7 +421,7 @@ void ChunkRenderer::renderChunkLocally(const Chunk& chunk, const RenderData& dat
cornersModelSpace[Quad::NORTH_EAST] -
cornersModelSpace[Quad::SOUTH_WEST]));
programObject->setUniform("patchNormalModelSpace", patchNormalModelSpace);
programObject->setUniform("patchNormalCameraSpace", patchNormalCameraSpace);
programObject->setUniform(
"projectionTransform",