diff --git a/ext/ghoul b/ext/ghoul index d2aa3d3616..d490fbaf59 160000 --- a/ext/ghoul +++ b/ext/ghoul @@ -1 +1 @@ -Subproject commit d2aa3d3616f0a3698d38639acf5b7caa5924da64 +Subproject commit d490fbaf595954515e7fa3c2ba7ed91e6e20cc02 diff --git a/include/openspace/util/spicemanager.h b/include/openspace/util/spicemanager.h index 5327b8004a..68e057dd25 100644 --- a/include/openspace/util/spicemanager.h +++ b/include/openspace/util/spicemanager.h @@ -74,7 +74,7 @@ public: /** * Default constructor initializing the AberrationCorrection to Type::None with a - * Drection::Reception + * Direction::Reception */ AberrationCorrection() = default; diff --git a/modules/base/rendering/renderablepath.cpp b/modules/base/rendering/renderablepath.cpp index ebea0891cb..081abb3b9f 100644 --- a/modules/base/rendering/renderablepath.cpp +++ b/modules/base/rendering/renderablepath.cpp @@ -76,7 +76,7 @@ RenderablePath::RenderablePath(const ghoul::Dictionary& dictionary) float fPointSteps; // Dictionary can not pick out ints... if (!dictionary.getValue(keyPointSteps, fPointSteps)) fPointSteps = 4; - _pointSteps = fPointSteps; + _pointSteps = static_cast(fPointSteps); glm::vec3 color(0.f); if (dictionary.hasKeyAndValue(keyColor)) @@ -145,7 +145,7 @@ void RenderablePath::render(const RenderData& data) { return; - int nPointsToDraw = _vertexArray.size();// (time - _start) / (_stop - _start) * (_vertexArray.size()) + 1 + 0.5; + size_t nPointsToDraw = _vertexArray.size();// (time - _start) / (_stop - _start) * (_vertexArray.size()) + 1 + 0.5; _programObject->activate(); diff --git a/modules/newhorizons/rendering/renderableplanetprojection.cpp b/modules/newhorizons/rendering/renderableplanetprojection.cpp index f8036785c0..6c803ef74e 100644 --- a/modules/newhorizons/rendering/renderableplanetprojection.cpp +++ b/modules/newhorizons/rendering/renderableplanetprojection.cpp @@ -486,7 +486,9 @@ bool RenderablePlanetProjection::loadTextures() { using ghoul::opengl::Texture; _baseTexture = nullptr; if (_colorTexturePath.value() != "") { - _baseTexture = ghoul::io::TextureReader::ref().loadTexture(_colorTexturePath); + _baseTexture = ghoul::io::TextureReader::ref().loadTexture( + absPath(_colorTexturePath) + ); if (_baseTexture) { ghoul::opengl::convertTextureFormat(*_baseTexture, Texture::Format::RGB); _baseTexture->uploadTexture(); @@ -496,7 +498,9 @@ bool RenderablePlanetProjection::loadTextures() { _heightMapTexture = nullptr; if (_heightMapTexturePath.value() != "") { - _heightMapTexture = ghoul::io::TextureReader::ref().loadTexture(_heightMapTexturePath); + _heightMapTexture = ghoul::io::TextureReader::ref().loadTexture( + absPath(_heightMapTexturePath) + ); if (_heightMapTexture) { ghoul::opengl::convertTextureFormat(*_heightMapTexture, Texture::Format::RGB); _heightMapTexture->uploadTexture(); diff --git a/modules/newhorizons/shaders/renderablePlanetProjection_fs.glsl b/modules/newhorizons/shaders/renderablePlanetProjection_fs.glsl index b0aa7dc9be..34020b7eef 100644 --- a/modules/newhorizons/shaders/renderablePlanetProjection_fs.glsl +++ b/modules/newhorizons/shaders/renderablePlanetProjection_fs.glsl @@ -65,9 +65,7 @@ bool inRange(float x, float a, float b){ void main() { vec2 uv = (vs_position.xy + vec2(1.0)) / vec2(2.0); - vec4 radius = vec4(1.1883, 1.1883, 1.1883, 6); - vec4 vertex = uvToModel(uv, radius, _segments); - // vec4 vertex = uvToModel(uv, _radius, _segments); + vec4 vertex = uvToModel(uv, _radius, _segments); vec4 raw_pos = psc_to_meter(vertex, _scaling); vec4 projected = ProjectorMatrix * ModelTransform * raw_pos; diff --git a/modules/onscreengui/src/renderproperties.cpp b/modules/onscreengui/src/renderproperties.cpp index 5a8b4dab1b..49ca0ec4a8 100644 --- a/modules/onscreengui/src/renderproperties.cpp +++ b/modules/onscreengui/src/renderproperties.cpp @@ -432,8 +432,7 @@ void renderDVec3Property(Property* prop, const std::string& ownerName) { float min = std::min(std::min(p->minValue().x, p->minValue().y), p->minValue().z); float max = std::max(std::max(p->maxValue().x, p->maxValue().y), p->maxValue().z); - - ImGui::SliderFloat3( + bool changed = ImGui::SliderFloat3( name.c_str(), glm::value_ptr(value), min, @@ -441,7 +440,7 @@ void renderDVec3Property(Property* prop, const std::string& ownerName) { ); renderTooltip(prop); - if (glm::dvec3(value) != p->value()) { + if (changed) { executeScript( p->fullyQualifiedIdentifier(), "{" + std::to_string(value.x) + "," + diff --git a/support/cmake/support_macros.cmake b/support/cmake/support_macros.cmake index c97971b989..eb06abe3cb 100644 --- a/support/cmake/support_macros.cmake +++ b/support/cmake/support_macros.cmake @@ -317,6 +317,10 @@ function (handle_option_tests) "${OPENSPACE_BASE_DIR}/tests" "${OPENSPACE_EXT_DIR}/ghoul/ext/googletest/googletest/include" ) + target_compile_definitions(OpenSpaceTest PUBLIC + "GHL_THROW_ON_ASSERT" + "GTEST_HAS_TR1_TUPLE=0" + ) target_link_libraries(OpenSpaceTest gtest libOpenSpace) if (MSVC)