Remove apple clang warnings

This commit is contained in:
Alexander Bock
2021-03-30 22:12:53 +02:00
parent f7e53386fb
commit d9a1a0233b
11 changed files with 12 additions and 41 deletions

View File

@@ -123,14 +123,6 @@ private:
GLboolean _depthIsEnabled;
GLboolean _blendIsEnabled = false;
GLenum _faceToCull;
GLenum _depthFunction;
GLfloat _polygonOffSetFactor;
GLfloat _polygonOffSetUnits;
GLfloat _colorClearValue[4];
GLfloat _depthClearValue;
glm::vec3 _sunPosition = glm::vec3(0.f);
glm::dmat4 _shadowMatrix = glm::dmat4(1.0);

View File

@@ -90,13 +90,13 @@ RenderableSatellites::RenderableSatellites(const ghoul::Dictionary& dictionary)
_updateStartRenderIdxSelect = [this]() {
if ((_numObjects - _startRenderIdx) < _sizeRender) {
_sizeRender = _numObjects - _startRenderIdx;
_sizeRender = static_cast<unsigned int>(_numObjects - _startRenderIdx);
}
updateBuffers();
};
_updateRenderSizeSelect = [this]() {
if (_sizeRender > (_numObjects - _startRenderIdx)) {
_startRenderIdx = _numObjects - _sizeRender;
_startRenderIdx = static_cast<unsigned int>(_numObjects - _sizeRender);
}
updateBuffers();
};

View File

@@ -113,8 +113,8 @@ documentation::Documentation RenderableSmallBody::Documentation() {
RenderableSmallBody::RenderableSmallBody(const ghoul::Dictionary& dictionary)
: RenderableOrbitalKepler(dictionary)
, _upperLimit(UpperLimitInfo, 1000, 1, 1000000)
, _contiguousMode(ContiguousModeInfo, false)
, _upperLimit(UpperLimitInfo, 1000, 1, 1000000)
{
codegen::bake<Parameters>(dictionary);
@@ -142,7 +142,7 @@ RenderableSmallBody::RenderableSmallBody(const ghoul::Dictionary& dictionary)
_updateStartRenderIdxSelect = std::function<void()>([this] {
if (_contiguousMode) {
if ((_numObjects - _startRenderIdx) < _sizeRender) {
_sizeRender = _numObjects - _startRenderIdx;
_sizeRender = static_cast<unsigned int>(_numObjects - _startRenderIdx);
}
_updateDataBuffersAtNextRender = true;
}
@@ -150,7 +150,7 @@ RenderableSmallBody::RenderableSmallBody(const ghoul::Dictionary& dictionary)
_updateRenderSizeSelect = std::function<void()>([this] {
if (_contiguousMode) {
if (_sizeRender > (_numObjects - _startRenderIdx)) {
_startRenderIdx = _numObjects - _sizeRender;
_startRenderIdx = static_cast<unsigned int>(_numObjects - _sizeRender);
}
_updateDataBuffersAtNextRender = true;
}
@@ -221,7 +221,7 @@ void RenderableSmallBody::readDataFile(const std::string& filename) {
else {
lineSkipFraction = static_cast<float>(_upperLimit)
/ static_cast<float>(_numObjects);
endElement = _numObjects - 1;
endElement = static_cast<unsigned int>(_numObjects - 1);
}
if (line.compare(expectedHeaderLine) != 0) {

View File

@@ -59,7 +59,6 @@ private:
/// The index array that is potentially used in the draw call. If this is empty, no
/// element draw call is used.
std::vector<unsigned int> _indexBufferData;
bool contiguousMode = true;
properties::BoolProperty _contiguousMode;
properties::UIntProperty _upperLimit;
properties::Property::OnChangeHandle _contiguousModeCallbackhandle;

View File

@@ -771,8 +771,8 @@ void RenderableStars::loadPSFTexture() {
void RenderableStars::renderPSFToTexture() {
// Saves current FBO first
GLint defaultFBO;
defaultFBO = global::renderEngine->openglStateCache().defaultFramebuffer();
// GLint defaultFBO;
// defaultFBO = global::renderEngine->openglStateCache().defaultFramebuffer();
// GLint m_viewport[4];
// global::renderEngine.openglStateCache().viewPort(m_viewport);

View File

@@ -45,12 +45,6 @@
namespace {
constexpr const char* _loggerCat = "RenderablePlaneProjection";
constexpr const char* KeySpacecraft = "Spacecraft";
constexpr const char* KeyInstrument = "Instrument";
constexpr const char* KeyMoving = "Moving";
constexpr const char* KeyTexture = "Texture";
constexpr const char* KeyName = "Name";
constexpr const char* KeyTarget = "DefaultTarget";
constexpr const char* GalacticFrame = "GALACTIC";
struct [[codegen::Dictionary(RenderablePlaneProjection)]] Parameters {

View File

@@ -41,12 +41,6 @@
#include <variant>
namespace {
constexpr const char* KeyUrl = "Url";
constexpr const char* KeyIdentifier = "Identifier";
constexpr const char* KeyOverride = "Override";
constexpr const char* KeyUseHash = "UseHash";
constexpr const char* KeyFilename = "Filename";
constexpr const char* TempSuffix = ".tmp";
struct [[codegen::Dictionary(UrlSynchronization)]] Parameters {
@@ -130,7 +124,7 @@ UrlSynchronization::UrlSynchronization(const ghoul::Dictionary& dict,
documentation::TestResult res;
res.success = false;
documentation::TestResult::Offense o;
o.offender = std::string(KeyIdentifier) + "|" + KeyUseHash;
o.offender = "Identifier|UseHash";
o.reason = documentation::TestResult::Offense::Reason::MissingKey;
res.offenses.push_back(o);
throw documentation::SpecificationError(std::move(res), "UrlSynchronization");

View File

@@ -41,14 +41,6 @@
#include <fstream>
namespace {
constexpr const char* KeyRawVolumeOutput = "RawVolumeOutput";
constexpr const char* KeyDictionaryOutput = "DictionaryOutput";
constexpr const char* KeyDimensions = "Dimensions";
constexpr const char* KeyTime = "Time";
constexpr const char* KeyValueFunction = "ValueFunction";
constexpr const char* KeyLowerDomainBound = "LowerDomainBound";
constexpr const char* KeyUpperDomainBound = "UpperDomainBound";
struct [[codegen::Dictionary(GenerateRawVolumeTask)]] Parameters {
// The Lua function used to compute the cell values
std::string valueFunction [[codegen::annotation("A Lua expression that returns a "