From 81a3ba090e576efe52e794812cecdff790dccd32 Mon Sep 17 00:00:00 2001 From: Alexander Bock Date: Sun, 7 Sep 2025 16:57:05 +0200 Subject: [PATCH] Various coding style --- THIRD_PARTY_LICENSES.md | 29 ------------------- .../properties/matrix/mat4property.h | 14 ++++----- src/properties/matrix/mat4property.cpp | 7 ++--- 3 files changed, 10 insertions(+), 40 deletions(-) diff --git a/THIRD_PARTY_LICENSES.md b/THIRD_PARTY_LICENSES.md index 5761b146e4..9a687409bd 100644 --- a/THIRD_PARTY_LICENSES.md +++ b/THIRD_PARTY_LICENSES.md @@ -359,35 +359,6 @@ Project (www.freetype.org). All rights reserved. -### Stackwalker -https://github.com/JochenKalmbach/StackWalker - - -Copyright (c) 2005 - 2019, Jochen Kalmbach -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - - - ### stb_image https://github.com/nothings/stb diff --git a/include/openspace/properties/matrix/mat4property.h b/include/openspace/properties/matrix/mat4property.h index 790f48dc4c..0ba714173b 100644 --- a/include/openspace/properties/matrix/mat4property.h +++ b/include/openspace/properties/matrix/mat4property.h @@ -32,14 +32,14 @@ namespace openspace::properties { -class Mat4Property : public NumericalProperty { +class Mat4Property : public NumericalProperty { public: - Mat4Property(Property::PropertyInfo info, glm::mat4x4 value = glm::mat4x4(), - glm::mat4x4 minValue = + Mat4Property(Property::PropertyInfo info, glm::mat4 value = glm::mat4(), + glm::mat4 minValue = ghoul::createFillMat4x4(std::numeric_limits::lowest()), - glm::mat4x4 maxValue = + glm::mat4 maxValue = ghoul::createFillMat4x4(std::numeric_limits::max()), - glm::mat4x4 stepValue = ghoul::createFillMat4x4(0.01f)); + glm::mat4 stepValue = ghoul::createFillMat4x4(0.01f)); std::string_view className() const override final; ghoul::lua::LuaTypes typeLua() const override final; @@ -47,10 +47,10 @@ public: void getLuaValue(lua_State* state) const override final; std::string stringValue() const override final; - using TemplateProperty::operator=; + using TemplateProperty::operator=; private: - glm::mat4x4 toValue(lua_State* state) const override final; + glm::mat4 toValue(lua_State* state) const override final; }; } // namespace openspace::properties diff --git a/src/properties/matrix/mat4property.cpp b/src/properties/matrix/mat4property.cpp index d97708ed08..91e1887f4f 100644 --- a/src/properties/matrix/mat4property.cpp +++ b/src/properties/matrix/mat4property.cpp @@ -30,10 +30,9 @@ namespace openspace::properties { -Mat4Property::Mat4Property(Property::PropertyInfo info, glm::mat4x4 value, - glm::mat4x4 minValue, glm::mat4x4 maxValue, - glm::mat4x4 stepValue) - : NumericalProperty( +Mat4Property::Mat4Property(Property::PropertyInfo info, glm::mat4 value, + glm::mat4 minValue, glm::mat4 maxValue, glm::mat4 stepValue) + : NumericalProperty( std::move(info), std::move(value), std::move(minValue),