mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-26 09:35:28 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'fix_clang_format' into 'master'

Browse Source 
Fix clang format

See merge request OpenMW/openmw!2456
This commit is contained in:
AnyOldName3 2022-10-06 21:30:44 +00:00
commit ec1929c0fd
6 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.clang-format
View File

@ -102,3 +102,4 @@ UseTab: Never
StatementMacros:
- META_Object
- META_StateAttribute
- META_Node

2
apps/openmw/mwrender/skyutil.hpp
View File

@ -187,7 +187,7 @@ namespace MWRender
META_Node(MWRender, CameraRelativeTransform)
const osg::Vec3f& getLastViewPoint() const;
const osg::Vec3f& getLastViewPoint() const;
bool computeLocalToWorldMatrix(osg::Matrix& matrix, osg::NodeVisitor* nv) const override;

12
components/nifosg/matrixtransform.hpp
View File

@ -17,12 +17,12 @@ namespace NifOsg
META_Node(NifOsg, MatrixTransform)
// Hack: account for Transform differences between OSG and NIFs.
// OSG uses a 4x4 matrix, NIF's use a 3x3 rotationScale, float scale, and vec3 position.
// Decomposing the original components from the 4x4 matrix isn't possible, which causes
// problems when a KeyframeController wants to change only one of these components. So
// we store the scale and rotation components separately here.
float mScale{ 0.f };
// Hack: account for Transform differences between OSG and NIFs.
// OSG uses a 4x4 matrix, NIF's use a 3x3 rotationScale, float scale, and vec3 position.
// Decomposing the original components from the 4x4 matrix isn't possible, which causes
// problems when a KeyframeController wants to change only one of these components. So
// we store the scale and rotation components separately here.
float mScale{ 0.f };
Nif::Matrix3 mRotationScale;
// Utility methods to transform the node and keep these components up-to-date.

4
components/sceneutil/lightmanager.hpp
View File

@ -126,7 +126,7 @@ namespace SceneUtil
public:
META_Node(SceneUtil, LightSource)
LightSource();
LightSource();
LightSource(const LightSource& copy, const osg::CopyOp& copyop);
@ -219,7 +219,7 @@ namespace SceneUtil
META_Node(SceneUtil, LightManager)
LightManager(bool ffp = true);
LightManager(bool ffp = true);
LightManager(const LightManager& copy, const osg::CopyOp& copyop);

2
components/sceneutil/positionattitudetransform.hpp
View File

@ -24,7 +24,7 @@ namespace SceneUtil
META_Node(SceneUtil, PositionAttitudeTransform)
inline void setPosition(const osg::Vec3f& pos)
inline void setPosition(const osg::Vec3f& pos)
{
_position = pos;
dirtyBound();

4
components/sceneutil/skeleton.hpp
View File

@ -37,8 +37,8 @@ namespace SceneUtil
META_Node(SceneUtil, Skeleton)
/// Retrieve a bone by name.
Bone* getBone(const std::string& name);
/// Retrieve a bone by name.
Bone* getBone(const std::string& name);
/// Request an update of bone matrices. May be a no-op if already updated in this frame.
void updateBoneMatrices(unsigned int traversalNumber);