Traktor: Minor cleanup in Mesh editor classes.

apistol78 · Apr 10, 2024 · 6150e29 · 6150e29
1 parent 77d582e
commit 6150e29
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 49 deletions.
diff --git a/code/Mesh/Editor/IndexRange.cpp b/code/Mesh/Editor/IndexRange.cpp
@@ -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
@@ -9,19 +9,8 @@
 #include <algorithm>
 #include "Mesh/Editor/IndexRange.h"
 
-namespace traktor
+namespace traktor::mesh
 {
-	namespace mesh
-	{
-
-IndexRange::IndexRange()
-:	offsetFirst(0)
-,	offsetLast(0)
-,	minIndex(0)
-,	maxIndex(0)
-,	opaque(true)
-{
-}
 
 void IndexRange::mergeInto(AlignedVector< IndexRange >& ranges) const
 {
@@ -53,5 +42,4 @@ bool IndexRange::operator < (const IndexRange& rh) const
 	return offsetFirst < rh.offsetFirst;
 }
 
-	}
 }
diff --git a/code/Mesh/Editor/IndexRange.h b/code/Mesh/Editor/IndexRange.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
@@ -11,26 +11,20 @@
 #include "Core/Config.h"
 #include "Core/Containers/AlignedVector.h"
 
-namespace traktor
+namespace traktor::mesh
 {
-	namespace mesh
-	{
 
 struct IndexRange
 {
-	int32_t offsetFirst;
-	int32_t offsetLast;
-	int32_t minIndex;
-	int32_t maxIndex;
-	bool opaque;
-
-	IndexRange();
+	int32_t offsetFirst = 0;
+	int32_t offsetLast = 0;
+	int32_t minIndex = 0;
+	int32_t maxIndex = 0;
+	bool opaque = true;
 
 	void mergeInto(AlignedVector< IndexRange >& ranges) const;
 
 	bool operator < (const IndexRange& rh) const;
 };
 
-	}
 }
-
diff --git a/code/Mesh/Editor/MeshBrowsePreview.cpp b/code/Mesh/Editor/MeshBrowsePreview.cpp
@@ -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
@@ -16,10 +16,8 @@
 #include "Ui/Application.h"
 #include "Ui/Bitmap.h"
 
-namespace traktor
+namespace traktor::mesh
 {
-	namespace mesh
-	{
 
 T_IMPLEMENT_RTTI_FACTORY_CLASS(L"traktor.render.MeshBrowsePreview", 0, MeshBrowsePreview, editor::IBrowsePreview)
 
@@ -54,5 +52,4 @@ Ref< ui::Bitmap > MeshBrowsePreview::generate(const editor::IEditor* editor, db:
 	return new ui::Bitmap(meshThumb);
 }
 
-	}
 }
diff --git a/code/Mesh/Editor/MeshBrowsePreview.h b/code/Mesh/Editor/MeshBrowsePreview.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,10 +18,8 @@
 #	define T_DLLCLASS T_DLLIMPORT
 #endif
 
-namespace traktor
+namespace traktor::mesh
 {
-	namespace mesh
-	{
 
 /*! Mesh preview generator.
  * \ingroup Mesh
@@ -36,6 +34,4 @@ class T_DLLCLASS MeshBrowsePreview : public editor::IBrowsePreview
 	virtual Ref< ui::Bitmap > generate(const editor::IEditor* editor, db::Instance* instance) const override final;
 };
 
-	}
 }
-
diff --git a/code/Mesh/Editor/MeshComponentPipeline.cpp b/code/Mesh/Editor/MeshComponentPipeline.cpp
@@ -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
@@ -12,10 +12,8 @@
 #include "Mesh/MeshComponentData.h"
 #include "Mesh/Editor/MeshComponentPipeline.h"
 
-namespace traktor
+namespace traktor::mesh
 {
-	namespace mesh
-	{
 
 T_IMPLEMENT_RTTI_FACTORY_CLASS(L"traktor.mesh.MeshComponentPipeline", 0, MeshComponentPipeline, editor::IPipeline)
 
@@ -82,5 +80,4 @@ Ref< ISerializable > MeshComponentPipeline::buildProduct(
 	return DeepClone(sourceAsset).create();
 }
 
-	}
 }
diff --git a/code/Mesh/Editor/MeshComponentPipeline.h b/code/Mesh/Editor/MeshComponentPipeline.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,10 +18,8 @@
 #	define T_DLLCLASS T_DLLIMPORT
 #endif
 
-namespace traktor
+namespace traktor::mesh
 {
-	namespace mesh
-	{
 
 class T_DLLCLASS MeshComponentPipeline : public editor::IPipeline
 {
@@ -66,6 +64,4 @@ class T_DLLCLASS MeshComponentPipeline : public editor::IPipeline
 	) const override final;
 };
 
-	}
 }
-