mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2025-12-30 15:50:55 -06:00
Code Issues Packages Projects Releases Wiki Activity

Various coding style

Browse Source
This commit is contained in:
Alexander Bock
2025-09-07 16:57:05 +02:00
parent ff72e47f7b
commit 81a3ba090e
3 changed files with 10 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
THIRD_PARTY_LICENSES.md
View File

@@ -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

14
include/openspace/properties/matrix/mat4property.h
View File

@@ -32,14 +32,14 @@
namespace openspace::properties {
class Mat4Property : public NumericalProperty<glm::mat4x4> {
class Mat4Property : public NumericalProperty<glm::mat4> {
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<float>(std::numeric_limits<float>::lowest()),
glm::mat4x4 maxValue =
glm::mat4 maxValue =
ghoul::createFillMat4x4<float>(std::numeric_limits<float>::max()),
glm::mat4x4 stepValue = ghoul::createFillMat4x4<float>(0.01f));
glm::mat4 stepValue = ghoul::createFillMat4x4<float>(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<glm::mat4x4>::operator=;
using TemplateProperty<glm::mat4>::operator=;
private:
glm::mat4x4 toValue(lua_State* state) const override final;
glm::mat4 toValue(lua_State* state) const override final;
};
} // namespace openspace::properties

7
src/properties/matrix/mat4property.cpp
View File

@@ -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<glm::mat4x4>(
Mat4Property::Mat4Property(Property::PropertyInfo info, glm::mat4 value,
glm::mat4 minValue, glm::mat4 maxValue, glm::mat4 stepValue)
: NumericalProperty<glm::mat4>(
std::move(info),
std::move(value),
std::move(minValue),