mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-01-05 19:19:39 -06:00
Remove warning on Jenkins
This commit is contained in:
@@ -32,11 +32,11 @@
|
||||
SettingsWidget::SettingsWidget(sgct::quat orientation, QWidget* parent)
|
||||
: QWidget(parent)
|
||||
, _orientationValue(std::move(orientation))
|
||||
, _firstWindowGraphicsSelection(new QComboBox)
|
||||
, _firstWindowSelectionLayout(new QHBoxLayout)
|
||||
,_showUiOnFirstWindow(new QCheckBox(
|
||||
, _showUiOnFirstWindow(new QCheckBox(
|
||||
"Show user interface only on first window using graphics:"
|
||||
))
|
||||
, _firstWindowGraphicsSelection(new QComboBox)
|
||||
, _firstWindowSelectionLayout(new QHBoxLayout)
|
||||
{
|
||||
QBoxLayout* layout = new QVBoxLayout(this);
|
||||
layout->setContentsMargins(0, 0, 0, 0);
|
||||
|
||||
@@ -994,34 +994,6 @@ void setSgctDelegateFunctions() {
|
||||
};
|
||||
}
|
||||
|
||||
void checkCommandLineForSettings(int& argc, char** argv, bool& hasSGCT, bool& hasProfile,
|
||||
std::string& sgctFunctionName)
|
||||
{
|
||||
for (int i = 1; i < argc; i++) {
|
||||
const std::string arg = argv[i];
|
||||
if (arg == "-c" || arg == "--config") {
|
||||
std::string p = ((i + 1) < argc) ? argv[i + 1] : "";
|
||||
p.erase(std::remove_if(p.begin(), p.end(), ::isspace), p.end());
|
||||
|
||||
const std::string sgctAssignment = "SGCTConfig=";
|
||||
const size_t findSgct = p.find(sgctAssignment);
|
||||
const size_t findBracket = p.find('}');
|
||||
if (findSgct != std::string::npos) {
|
||||
if (findBracket != std::string::npos) {
|
||||
sgctFunctionName = arg.substr(
|
||||
findSgct + sgctAssignment.length(),
|
||||
findBracket - findSgct
|
||||
);
|
||||
}
|
||||
hasSGCT = true;
|
||||
}
|
||||
if (p.find("Profile=") != std::string::npos) {
|
||||
hasProfile = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
std::string setWindowConfigPresetForGui(const std::string& labelFromCfgFile,
|
||||
bool haveCliSGCTConfig)
|
||||
{
|
||||
|
||||
Submodule ext/ghoul updated: 6d7fcb22d1...689b1cec8b
@@ -548,13 +548,13 @@ RenderablePointCloud::Texture::Texture()
|
||||
|
||||
RenderablePointCloud::Fading::Fading(const ghoul::Dictionary& dictionary)
|
||||
: properties::PropertyOwner({ "Fading", "Fading", "" })
|
||||
, enabled(EnableDistanceFadeInfo, false)
|
||||
, fadeInDistances(
|
||||
FadeInDistancesInfo,
|
||||
glm::vec2(0.f),
|
||||
glm::vec2(0.f),
|
||||
glm::vec2(100.f)
|
||||
)
|
||||
, enabled(EnableDistanceFadeInfo, false)
|
||||
, invert(InvertFadeInfo, false)
|
||||
{
|
||||
const Parameters p = codegen::bake<Parameters>(dictionary);
|
||||
@@ -581,13 +581,13 @@ RenderablePointCloud::Fading::Fading(const ghoul::Dictionary& dictionary)
|
||||
|
||||
RenderablePointCloud::RenderablePointCloud(const ghoul::Dictionary& dictionary)
|
||||
: Renderable(dictionary)
|
||||
, _drawElements(DrawElementsInfo, true)
|
||||
, _sizeSettings(dictionary)
|
||||
, _colorSettings(dictionary)
|
||||
, _fading(dictionary)
|
||||
, _useAdditiveBlending(UseAdditiveBlendingInfo, true)
|
||||
, _drawElements(DrawElementsInfo, true)
|
||||
, _renderOption(RenderOptionInfo, properties::OptionProperty::DisplayType::Dropdown)
|
||||
, _nDataPoints(NumShownDataPointsInfo, 0)
|
||||
, _fading(dictionary)
|
||||
, _colorSettings(dictionary)
|
||||
, _sizeSettings(dictionary)
|
||||
{
|
||||
ZoneScoped;
|
||||
|
||||
@@ -1015,7 +1015,7 @@ void RenderablePointCloud::fillAndUploadTextureLayer(unsigned int arrayIndex,
|
||||
}
|
||||
|
||||
void RenderablePointCloud::generateArrayTextures() {
|
||||
using Entry = std::pair<TextureFormat, std::vector<size_t>>;
|
||||
using Entry = std::pair<const TextureFormat, std::vector<size_t>>;
|
||||
unsigned int arrayIndex = 0;
|
||||
for (const Entry& e : _textureMapByFormat) {
|
||||
glm::uvec2 res = e.first.resolution;
|
||||
@@ -1571,8 +1571,8 @@ gl::GLenum RenderablePointCloud::internalGlFormat(bool useAlpha) const {
|
||||
}
|
||||
|
||||
ghoul::opengl::Texture::Format RenderablePointCloud::glFormat(bool useAlpha) const {
|
||||
using Texture = ghoul::opengl::Texture;
|
||||
return useAlpha ? Texture::Format::RGBA : Texture::Format::RGB;
|
||||
using Tex = ghoul::opengl::Texture;
|
||||
return useAlpha ? Tex::Format::RGBA : Tex::Format::RGB;
|
||||
}
|
||||
|
||||
bool operator==(const TextureFormat& l, const TextureFormat& r) {
|
||||
|
||||
@@ -553,13 +553,7 @@ glm::dvec3 directionToLightSource(const glm::dvec3& pos, SceneGraphNode* lightSo
|
||||
SceneGraphNode* node =
|
||||
lightSource ? lightSource : sceneGraph()->sceneGraphNode("Sun");
|
||||
|
||||
if (lightSource) {
|
||||
return lightSource->worldPosition() - pos;
|
||||
}
|
||||
else {
|
||||
const glm::dvec3 dir = length(pos) > 0.0 ? glm::normalize(-pos) : glm::dvec3(0.0);
|
||||
return dir;
|
||||
}
|
||||
return glm::normalize(node->worldPosition() - pos);
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
||||
@@ -333,9 +333,9 @@ void DateTime::setSecond(int s) {
|
||||
|
||||
TimeQuantizer::TimeQuantizer(std::string start, std::string end,
|
||||
const std::string& resolution)
|
||||
: _start(start)
|
||||
: _resolution(parseTimeResolutionStr(resolution))
|
||||
, _start(start)
|
||||
, _timerange(std::move(start), std::move(end))
|
||||
, _resolution(parseTimeResolutionStr(resolution))
|
||||
{
|
||||
verifyStartTimeRestrictions();
|
||||
}
|
||||
|
||||
@@ -26,9 +26,9 @@
|
||||
|
||||
namespace openspace::volume {
|
||||
|
||||
InvalidGridTypeError::InvalidGridTypeError(std::string gridType)
|
||||
: RuntimeError("Invalid grid type: '" + gridType + "'")
|
||||
, gridType(std::move(gridType))
|
||||
InvalidGridTypeError::InvalidGridTypeError(std::string gridType_)
|
||||
: RuntimeError("Invalid grid type: '" + gridType_ + "'")
|
||||
, gridType(std::move(gridType_))
|
||||
{}
|
||||
|
||||
VolumeGridType parseGridType(const std::string& gridType) {
|
||||
|
||||
@@ -36,7 +36,7 @@ enum class VolumeGridType : int {
|
||||
};
|
||||
|
||||
struct InvalidGridTypeError : public ghoul::RuntimeError {
|
||||
explicit InvalidGridTypeError(std::string gridType);
|
||||
explicit InvalidGridTypeError(std::string gridType_);
|
||||
|
||||
std::string gridType;
|
||||
};
|
||||
|
||||
@@ -83,9 +83,9 @@ ScreenSpaceBrowser::ScreenSpaceBrowser(const ghoul::Dictionary& dictionary)
|
||||
: ScreenSpaceRenderable(dictionary)
|
||||
, _dimensions(DimensionsInfo, glm::vec2(0.f), glm::vec2(0.f), glm::vec2(3000.f))
|
||||
, _renderHandler(new ScreenSpaceRenderHandler)
|
||||
, _keyboardHandler(new WebKeyboardHandler)
|
||||
, _url(UrlInfo)
|
||||
, _reload(ReloadInfo)
|
||||
, _keyboardHandler(new WebKeyboardHandler)
|
||||
{
|
||||
const Parameters p = codegen::bake<Parameters>(dictionary);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user