mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-29 23:39:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

Use vec3 color representation for fixed color in RenderableStars

Browse Source
This commit is contained in:
Emma Broman
2020-07-16 09:57:37 +02:00
parent 41d5a6db5f
commit 8d5a56e6ef
4 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/space/rendering/renderablestars.cpp
+1 -1
View File
@@ -424,7 +424,7 @@ RenderableStars::RenderableStars(const ghoul::Dictionary& dictionary)
glm::vec2(-10.f, -10.f),
glm::vec2(10.f, 10.f)
)
, _fixedColor(FixedColorInfo, glm::vec4(1.f), glm::vec4(0.f), glm::vec4(1.f))
, _fixedColor(FixedColorInfo, glm::vec3(1.f), glm::vec3(0.f), glm::vec3(1.f))
, _filterOutOfRange(FilterOutOfRangeInfo, false)
, _pointSpreadFunctionTexturePath(PsfTextureInfo)
, _psfMethodOption(
modules/space/rendering/renderablestars.h
+2 -2
View File
@@ -33,7 +33,7 @@
#include <openspace/properties/optionproperty.h>
#include <openspace/properties/propertyowner.h>
#include <openspace/properties/vector/vec2property.h>
#include <openspace/properties/vector/vec4property.h>
#include <openspace/properties/vector/vec3property.h>
#include <ghoul/opengl/ghoul_gl.h>
#include <ghoul/opengl/uniformcache.h>
#include <optional>
@@ -98,7 +98,7 @@ private:
properties::StringProperty _otherDataColorMapPath;
properties::Vec2Property _otherDataRange;
std::unique_ptr<ghoul::opengl::Texture> _otherDataColorMapTexture;
properties::Vec4Property _fixedColor;
properties::Vec3Property _fixedColor;
properties::BoolProperty _filterOutOfRange;
properties::StringProperty _pointSpreadFunctionTexturePath;
std::unique_ptr<ghoul::opengl::Texture> _pointSpreadFunctionTexture;