Remove warnings

Update SGCT repository
Update Ghoul repository
This commit is contained in:
Alexander Bock
2017-07-26 11:59:48 -04:00
parent 53489b5302
commit dc79a94142
28 changed files with 94 additions and 31 deletions

View File

@@ -128,7 +128,7 @@ documentation::Documentation RenderableRings::Documentation() {
RenderableRings::RenderableRings(const ghoul::Dictionary& dictionary)
: Renderable(dictionary)
, _texturePath(TextureInfo)
, _size(SizeInfo, 1.f, 0.f, 1e25)
, _size(SizeInfo, 1.f, 0.f, 1e25f)
, _offset(OffsetInfo, glm::vec2(0.f, 1.f), glm::vec2(0.f), glm::vec2(1.f))
, _nightFactor(NightFactorInfo, 0.33f, 0.f, 1.f)
, _transparency(TransparencyInfo, 0.15f, 0.f, 1.f)