mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-01-06 11:39:49 -06:00
Remove warnings in Clang
This commit is contained in:
@@ -41,6 +41,8 @@
|
||||
#include <cstdint>
|
||||
#include <fstream>
|
||||
|
||||
#include <type_traits>
|
||||
|
||||
namespace {
|
||||
constexpr const char* _loggerCat = "RenderableStars";
|
||||
|
||||
@@ -56,27 +58,39 @@ namespace {
|
||||
|
||||
constexpr int8_t CurrentCacheVersion = 2;
|
||||
|
||||
struct CommonDataLayout {
|
||||
struct ColorVBOLayout {
|
||||
std::array<float, 4> position; // (x,y,z,e)
|
||||
float value;
|
||||
float luminance;
|
||||
float absoluteMagnitude;
|
||||
};
|
||||
|
||||
struct VelocityVBOLayout {
|
||||
std::array<float, 4> position; // (x,y,z,e)
|
||||
float value;
|
||||
float luminance;
|
||||
float absoluteMagnitude;
|
||||
|
||||
};
|
||||
|
||||
struct ColorVBOLayout : public CommonDataLayout {};
|
||||
|
||||
struct VelocityVBOLayout : public CommonDataLayout {
|
||||
float vx; // v_x
|
||||
float vy; // v_y
|
||||
float vz; // v_z
|
||||
};
|
||||
|
||||
struct SpeedVBOLayout : public CommonDataLayout {
|
||||
struct SpeedVBOLayout {
|
||||
std::array<float, 4> position; // (x,y,z,e)
|
||||
float value;
|
||||
float luminance;
|
||||
float absoluteMagnitude;
|
||||
|
||||
float speed;
|
||||
};
|
||||
|
||||
struct OtherDataLayout : public CommonDataLayout {};
|
||||
struct OtherDataLayout {
|
||||
std::array<float, 4> position; // (x,y,z,e)
|
||||
float value;
|
||||
float luminance;
|
||||
float absoluteMagnitude;
|
||||
};
|
||||
|
||||
constexpr openspace::properties::Property::PropertyInfo SpeckFileInfo = {
|
||||
"SpeckFile",
|
||||
@@ -407,7 +421,7 @@ void RenderableStars::initializeGL() {
|
||||
LERROR(fmt::format("Could not find other data column {}", _queuedOtherData));
|
||||
}
|
||||
else {
|
||||
_otherDataOption = std::distance(_dataNames.begin(), it);
|
||||
_otherDataOption = static_cast<int>(std::distance(_dataNames.begin(), it));
|
||||
_queuedOtherData.clear();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user