mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-05-02 16:59:37 -05:00
Address clang tidy complaints
Update Ghoul repository Update SGCT repository
This commit is contained in:
@@ -61,8 +61,7 @@ documentation::Documentation CameraLightSource::Documentation() {
|
||||
}
|
||||
|
||||
CameraLightSource::CameraLightSource()
|
||||
: LightSource()
|
||||
, _intensity(IntensityInfo, 1.f, 0.f, 1.f)
|
||||
: _intensity(IntensityInfo, 1.f, 0.f, 1.f)
|
||||
{
|
||||
addProperty(_intensity);
|
||||
}
|
||||
|
||||
@@ -76,8 +76,7 @@ documentation::Documentation SceneGraphLightSource::Documentation() {
|
||||
}
|
||||
|
||||
SceneGraphLightSource::SceneGraphLightSource()
|
||||
: LightSource()
|
||||
, _intensity(IntensityInfo, 1.f, 0.f, 1.f)
|
||||
: _intensity(IntensityInfo, 1.f, 0.f, 1.f)
|
||||
, _sceneGraphNodeReference(NodeInfo, "")
|
||||
{
|
||||
addProperty(_intensity);
|
||||
|
||||
@@ -240,8 +240,6 @@ RenderableModel::RenderableModel(const ghoul::Dictionary& dictionary)
|
||||
addProperty(_performShading);
|
||||
}
|
||||
|
||||
RenderableModel::~RenderableModel() {}
|
||||
|
||||
bool RenderableModel::isReady() const {
|
||||
return _program && _texture;
|
||||
}
|
||||
|
||||
@@ -51,7 +51,7 @@ namespace modelgeometry { class ModelGeometry; }
|
||||
class RenderableModel : public Renderable {
|
||||
public:
|
||||
RenderableModel(const ghoul::Dictionary& dictionary);
|
||||
~RenderableModel();
|
||||
~RenderableModel() = default;
|
||||
|
||||
void initialize() override;
|
||||
void initializeGL() override;
|
||||
|
||||
@@ -57,7 +57,7 @@ private:
|
||||
void loadTexture();
|
||||
|
||||
properties::StringProperty _texturePath;
|
||||
ghoul::opengl::Texture* _texture;
|
||||
ghoul::opengl::Texture* _texture = nullptr;
|
||||
std::unique_ptr<ghoul::filesystem::File> _textureFile;
|
||||
|
||||
bool _textureIsDirty = false;
|
||||
|
||||
@@ -114,8 +114,7 @@ TimeFrameInterval::TimeFrameInterval()
|
||||
}
|
||||
|
||||
TimeFrameInterval::TimeFrameInterval(const ghoul::Dictionary& dictionary)
|
||||
: TimeFrame()
|
||||
, _hasStart(HasStartInfo, false)
|
||||
: _hasStart(HasStartInfo, false)
|
||||
, _start(StartInfo, 0, 0, 1E9)
|
||||
, _hasEnd(HasEndInfo, false)
|
||||
, _end(EndInfo, 0, 0, 1E9)
|
||||
|
||||
@@ -73,8 +73,6 @@ bool TimeFrameUnion::isActive(const Time& time) const {
|
||||
return false;
|
||||
}
|
||||
|
||||
TimeFrameUnion::TimeFrameUnion() {}
|
||||
|
||||
TimeFrameUnion::TimeFrameUnion(const ghoul::Dictionary& dictionary)
|
||||
: TimeFrame()
|
||||
{
|
||||
|
||||
@@ -35,7 +35,7 @@ namespace documentation { struct Documentation; }
|
||||
|
||||
class TimeFrameUnion : public TimeFrame {
|
||||
public:
|
||||
TimeFrameUnion();
|
||||
TimeFrameUnion() = default;
|
||||
TimeFrameUnion(const ghoul::Dictionary& dictionary);
|
||||
bool isActive(const Time&) const override;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user