diff --git a/code/Shape/Editor/Spline/ControlPointComponent.h b/code/Shape/Editor/Spline/ControlPointComponent.h index 5f1925f642..c1626bdb40 100644 --- a/code/Shape/Editor/Spline/ControlPointComponent.h +++ b/code/Shape/Editor/Spline/ControlPointComponent.h @@ -1,6 +1,6 @@ /* * TRAKTOR - * Copyright (c) 2022 Anders Pistol. + * Copyright (c) 2022-2024 Anders Pistol. * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -18,12 +18,10 @@ # define T_DLLCLASS T_DLLIMPORT #endif -namespace traktor +namespace traktor::shape { - namespace shape - { -/*! \brief +/*! * \ingroup Shape */ class T_DLLCLASS ControlPointComponent : public world::IEntityComponent @@ -55,6 +53,4 @@ class T_DLLCLASS ControlPointComponent : public world::IEntityComponent float m_scale; }; - } } - diff --git a/code/Spray/EmitterInstance.h b/code/Spray/EmitterInstance.h index e547da3057..77330b6521 100644 --- a/code/Spray/EmitterInstance.h +++ b/code/Spray/EmitterInstance.h @@ -81,7 +81,7 @@ class T_DLLCLASS EmitterInstance : public Object Point* addPoints(uint32_t points) { - uint32_t offset = uint32_t(m_points.size()); + const uint32_t offset = uint32_t(m_points.size()); m_points.resize(offset + points); return &m_points[offset]; } diff --git a/code/World/Shared/Passes/GBufferPass.cpp b/code/World/Shared/Passes/GBufferPass.cpp index b791f251ba..525ab1737b 100644 --- a/code/World/Shared/Passes/GBufferPass.cpp +++ b/code/World/Shared/Passes/GBufferPass.cpp @@ -1,6 +1,6 @@ /* * TRAKTOR - * Copyright (c) 2023 Anders Pistol. + * Copyright (c) 2023-2024 Anders Pistol. * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -56,7 +56,7 @@ render::handle_t GBufferPass::setup( rgtd.targets[0].colorFormat = render::TfR16G16B16A16F; // (GBufferA) Depth (R), Normal (GBA) rgtd.targets[1].colorFormat = render::TfR8G8B8A8; // (GBufferB) Albedo (RGB) rgtd.targets[2].colorFormat = render::TfR8G8B8A8; // (GBufferC) Roughness (R), Metalness (G), Specular (B), Decal Response (A) - rgtd.targets[3].colorFormat = render::TfR10G10B10A2; // (GBufferD) Irradiance (RGB), Sky occlusion (A) + rgtd.targets[3].colorFormat = render::TfR10G10B10A2; // (GBufferD) Irradiance (RGB) auto gbufferTargetSetId = renderGraph.addTransientTargetSet(L"GBuffer", rgtd, outputTargetSetId, outputTargetSetId);