mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-01-06 03:29:44 -06:00
Reducing compiler warnings (#3341)
This commit is contained in:
@@ -267,24 +267,6 @@ namespace {
|
||||
openspace::properties::Property::Visibility::AdvancedUser
|
||||
};
|
||||
|
||||
constexpr openspace::properties::Property::PropertyInfo SizeMappingEnabledInfo = {
|
||||
"Enabled",
|
||||
"Size Mapping Enabled",
|
||||
"Decides whether size mapping should be enabled. If true and at least one column "
|
||||
"was loaded as an option for size mapping, the chosen data column will be used "
|
||||
"to scale the size of the points.",
|
||||
openspace::properties::Property::Visibility::NoviceUser
|
||||
};
|
||||
|
||||
constexpr openspace::properties::Property::PropertyInfo SizeMappingOptionInfo = {
|
||||
"Parameter",
|
||||
"Parameter Option",
|
||||
"The name of a data parameter used for scaling of the points. The parameter "
|
||||
"value will be used as a multiplicative factor to scale the size of the points. "
|
||||
"Note that they may still be scaled by max size adjustment effects.",
|
||||
openspace::properties::Property::Visibility::AdvancedUser
|
||||
};
|
||||
|
||||
constexpr openspace::properties::Property::PropertyInfo EnableOutlineInfo = {
|
||||
"EnableOutline",
|
||||
"Enable Point Outline",
|
||||
@@ -653,8 +635,8 @@ RenderablePointCloud::RenderablePointCloud(const ghoul::Dictionary& dictionary)
|
||||
, _colorSettings(dictionary)
|
||||
, _fading(dictionary)
|
||||
, _useAdditiveBlending(UseAdditiveBlendingInfo, true)
|
||||
, _drawElements(DrawElementsInfo, true)
|
||||
, _useRotation(UseOrientationDataInfo, false)
|
||||
, _drawElements(DrawElementsInfo, true)
|
||||
, _renderOption(
|
||||
OrientationRenderOptionInfo,
|
||||
properties::OptionProperty::DisplayType::Dropdown
|
||||
|
||||
@@ -186,14 +186,14 @@ RenderableTrail::Appearance::Appearance()
|
||||
})
|
||||
, lineColor(LineColorInfo, glm::vec3(1.f), glm::vec3(0.f), glm::vec3(1.f))
|
||||
, useLineFade(EnableFadeInfo, true)
|
||||
, lineLength(LineLengthInfo, 1.f, 0.f, 1.f)
|
||||
, lineFadeAmount(LineFadeAmountInfo, 1.f, 0.f, 1.f)
|
||||
, lineWidth(LineWidthInfo, 10.f, 1.f, 20.f)
|
||||
, pointSize(PointSizeInfo, 1, 1, 64)
|
||||
, renderingModes(
|
||||
RenderingModeInfo,
|
||||
properties::OptionProperty::DisplayType::Dropdown
|
||||
)
|
||||
, lineLength(LineLengthInfo, 1.f, 0.f, 1.f)
|
||||
, lineFadeAmount(LineFadeAmountInfo, 1.f, 0.f, 1.f)
|
||||
{
|
||||
renderingModes.addOptions({
|
||||
{ RenderingModeLines, "Lines" },
|
||||
|
||||
@@ -156,16 +156,16 @@ documentation::Documentation RenderableTrailTrajectory::Documentation() {
|
||||
|
||||
RenderableTrailTrajectory::RenderableTrailTrajectory(const ghoul::Dictionary& dictionary)
|
||||
: RenderableTrail(dictionary)
|
||||
, _sweepChunkSize(SweepChunkSizeInfo, 200, 50, 5000)
|
||||
, _enableSweepChunking(EnableSweepChunkingInfo, false)
|
||||
, _startTime(StartTimeInfo)
|
||||
, _endTime(EndTimeInfo)
|
||||
, _sampleInterval(SampleIntervalInfo, 2.0, 2.0, 1e6)
|
||||
, _timeStampSubsamplingFactor(TimeSubSampleInfo, 1, 1, 1000000000)
|
||||
, _renderFullTrail(RenderFullPathInfo, false)
|
||||
, _numberOfReplacementPoints(AccurateTrailPositionsInfo, 100, 0, 1000)
|
||||
, _maxVertex(glm::vec3(-std::numeric_limits<float>::max()))
|
||||
, _minVertex(glm::vec3(std::numeric_limits<float>::max()))
|
||||
, _sweepChunkSize(SweepChunkSizeInfo, 200, 50, 5000)
|
||||
, _enableSweepChunking(EnableSweepChunkingInfo, false)
|
||||
, _numberOfReplacementPoints(AccurateTrailPositionsInfo, 100, 0, 1000)
|
||||
{
|
||||
const Parameters p = codegen::bake<Parameters>(dictionary);
|
||||
|
||||
|
||||
@@ -92,8 +92,6 @@ private:
|
||||
/// Dirty flag to determine whether the stride information needs to be changed
|
||||
bool _subsamplingIsDirty = true;
|
||||
|
||||
std::array<TrailVBOLayout<float>, 2> _auxiliaryVboData = {};
|
||||
|
||||
/// The conversion of the _startTime into the internal time format
|
||||
double _start = 0.0;
|
||||
/// The conversion of the _endTime into the internal time format
|
||||
|
||||
@@ -48,6 +48,7 @@ documentation::Documentation ScreenSpaceFramebuffer::Documentation() {
|
||||
return {
|
||||
"ScreenSpaceFramebuffer",
|
||||
"base_screenspace_framebuffer",
|
||||
"",
|
||||
{}
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user