mesh base

engine/inc/math/m4x4.hpp

@@ -12,6 +12,7 @@
 
 #include "math/vec4.hpp"
 #include "math/math.hpp"
+#include <string>
 
 namespace Tyra {
 

engine/inc/math/plane.hpp

@@ -10,6 +10,8 @@
 
 #pragma once
 
+#include "./vec4.hpp"
+#include <string>
 
 namespace Tyra {
 

engine/inc/math/vec2.hpp

@@ -15,7 +15,6 @@ extern "C" {
 #include <tamtypes.h>
 }
 
-#include <iomanip>
 #include <string>
 #include "math/math.hpp"
 

engine/inc/math/vec4.hpp

@@ -16,9 +16,6 @@ extern "C" {
 }
 
 #include <math3d.h>
-#include <iomanip>
-#include <cmath>
-#include <sstream>
 #include <string>
 #include "math/math.hpp"
 

engine/inc/renderer/3d/mesh/dynamic/dynamic_mesh.hpp

@@ -14,26 +14,16 @@
 #include "./dynamic_mesh_frame.hpp"
 #include "./dynamic_mesh_material_frame.hpp"
 #include "./dynamic_mesh_anim_state.hpp"
+#include "../mesh.hpp"
 
 namespace Tyra {
 
-class DynamicMesh {
+class DynamicMesh : public Mesh {
  public:
   explicit DynamicMesh(const MeshBuilderData& data);
   explicit DynamicMesh(const DynamicMesh& mesh);
   ~DynamicMesh();
 
-  /** Translation matrix */
-  M4x4 translation;
-
-  /** Rotation matrix */
-  M4x4 rotation;
-
-  /** Scale matrix */
-  M4x4 scale;
-
-  const u32& getId() const { return id; }
-
   const u8& isMother() const { return _isMother; }
 
   /** Get position from translation matrix */
@@ -113,7 +103,7 @@ class DynamicMesh {
   void initMesh();
   DynamicMeshAnimState animState;
   u8 _isMother;
-  u32 id, framesCount, materialsCount;
+  u32 framesCount, materialsCount;
   DynamicMeshFrame** frames;
   DynamicMeshMaterial** materials;
 };

engine/inc/renderer/3d/mesh/mesh.hpp

@@ -0,0 +1,38 @@
+/*
+# ______       ____   ___
+#   |     \/   ____| |___|
+#   |     |   |   \  |   |
+#-----------------------------------------------------------------------
+# Copyright 2022, tyra - https://github.com/h4570/tyra
+# Licenced under Apache License 2.0
+# Sandro Sobczyński <sandro.sobczynski@gmail.com>
+*/
+
+#pragma once
+
+#include "math/m4x4.hpp"
+#include <tamtypes.h>
+
+namespace Tyra {
+
+class Mesh {
+ public:
+  explicit Mesh();
+  ~Mesh();
+
+  /** Translation matrix */
+  M4x4 translation;
+
+  /** Rotation matrix */
+  M4x4 rotation;
+
+  /** Scale matrix */
+  M4x4 scale;
+
+  const u32& getId() const { return id; }
+
+ protected:
+  u32 id;
+};
+
+}  // namespace Tyra

engine/inc/renderer/3d/pipeline/static/core/stapip_qbuffer.hpp

@@ -12,7 +12,6 @@
 
 #include <math3d.h>
 #include <string>
-#include <sstream>
 #include "debug/debug.hpp"
 #include "./bag/packaging/stapip_bag_package.hpp"
 #include "./bag/stapip_bag.hpp"

engine/inc/renderer/core/3d/bbox/core_bbox.hpp

@@ -11,6 +11,7 @@
 #pragma once
 
 #include <vector>
+#include <string>
 #include "./core_bbox_frustum.hpp"
 #include "math/m4x4.hpp"
 #include "math/plane.hpp"

engine/inc/renderer/core/3d/renderer_3d_frustum_planes.hpp

@@ -10,7 +10,7 @@
 
 #pragma once
 
-#include <sstream>
+#include <string>
 #include "renderer/renderer_settings.hpp"
 #include "./camera_info_3d.hpp"
 #include "math/plane.hpp"

engine/src/math/m4x4.cpp

@@ -9,7 +9,7 @@
 */
 
 #include <stdio.h>
-#include <string>
+#include <iomanip>
 #include <sstream>
 #include "math/m4x4.hpp"
 

engine/src/math/plane.cpp

@@ -8,8 +8,9 @@
 # Sandro Sobczyński <sandro.sobczynski@gmail.com>
 */
 
-#include <string>
 #include "math/vec4.hpp"
+#include <iomanip>
+#include <sstream>
 #include "math/plane.hpp"
 
 namespace Tyra {

engine/src/math/vec2.cpp

@@ -9,6 +9,7 @@
 */
 
 #include "math/vec2.hpp"
+#include <iomanip>
 
 namespace Tyra {
 

engine/src/math/vec4.cpp

@@ -9,6 +9,9 @@
 */
 
 #include "math/vec4.hpp"
+#include <iomanip>
+#include <cmath>
+#include <sstream>
 
 namespace Tyra {
 

engine/src/renderer/3d/mesh/dynamic/dynamic_mesh.cpp

@@ -16,8 +16,6 @@
 namespace Tyra {
 
 DynamicMesh::DynamicMesh(const MeshBuilderData& data) {
-  id = rand() % 1000000;
-
   framesCount = data.framesCount;
   TYRA_ASSERT(framesCount > 0, "Frames count must be greater than 0");
 
@@ -42,8 +40,6 @@ DynamicMesh::DynamicMesh(const MeshBuilderData& data) {
 }
 
 DynamicMesh::DynamicMesh(const DynamicMesh& mesh) {
-  id = rand() % 1000000;
-
   framesCount = mesh.framesCount;
   materialsCount = mesh.materialsCount;
 

engine/src/renderer/3d/mesh/dynamic/dynamic_mesh_frame.cpp

@@ -11,6 +11,7 @@
 
 #include "debug/debug.hpp"
 #include <tamtypes.h>
+#include <iomanip>
 #include <string>
 #include "math/vec4.hpp"
 #include "renderer/models/color.hpp"

engine/src/renderer/3d/mesh/dynamic/dynamic_mesh_material.cpp

@@ -12,6 +12,7 @@
 #include <tamtypes.h>
 #include <string>
 #include <cstdlib>
+#include <iomanip>
 #include "renderer/3d/mesh/dynamic/dynamic_mesh_material.hpp"
 
 namespace Tyra {

engine/src/renderer/3d/mesh/mesh.cpp

@@ -0,0 +1,20 @@
+
+/*
+# ______       ____   ___
+#   |     \/   ____| |___|
+#   |     |   |   \  |   |
+#-----------------------------------------------------------------------
+# Copyright 2020, tyra - https://github.com/h4570/tyra
+# Licenced under Apache License 2.0
+# Sandro Sobczyński <sandro.sobczynski@gmail.com>
+*/
+
+#include "renderer/3d/mesh/mesh.hpp"
+
+namespace Tyra {
+
+Mesh::Mesh() { id = rand() % 1000000; }
+
+Mesh::~Mesh() {}
+
+}  // namespace Tyra

engine/src/renderer/3d/pipeline/static/core/bag/packaging/stapip_bag_package.cpp

@@ -11,6 +11,7 @@
 #include <tamtypes.h>
 #include <string>
 #include <sstream>
+#include <iomanip>
 #include "renderer/3d/pipeline/static/core/bag/packaging/stapip_bag_package.hpp"
 
 namespace Tyra {

engine/src/renderer/3d/pipeline/static/core/bag/packaging/stapip_bag_packages_bbox.cpp

@@ -11,6 +11,7 @@
 #include <tamtypes.h>
 #include <string>
 #include <sstream>
+#include <iomanip>
 #include <vector>
 #include "debug/debug.hpp"
 #include "renderer/3d/pipeline/static/core/bag/packaging/stapip_bag_packages_bbox.hpp"

engine/src/renderer/3d/pipeline/static/core/bag/stapip_bag.cpp

@@ -8,8 +8,9 @@
 # Sandro Sobczyński <sandro.sobczynski@gmail.com>
 */
 
-#include <string>
 #include "renderer/3d/pipeline/static/core/bag/stapip_bag.hpp"
+#include <sstream>
+#include <iomanip>
 
 namespace Tyra {
 

engine/src/renderer/3d/pipeline/static/core/stapip_qbuffer.cpp

@@ -9,6 +9,8 @@
 */
 
 #include "renderer/3d/pipeline/static/core/stapip_qbuffer.hpp"
+#include <sstream>
+#include <iomanip>
 
 namespace Tyra {
 

engine/src/renderer/core/3d/bbox/core_bbox.cpp

@@ -10,6 +10,7 @@
 
 #include <string>
 #include <sstream>
+#include <iomanip>
 #include "renderer/core/3d/bbox/core_bbox.hpp"
 
 namespace Tyra {

engine/src/renderer/core/3d/renderer_3d_frustum_planes.cpp

@@ -8,8 +8,9 @@
 # Sandro Sobczyński <sandro.sobczynski@gmail.com>
 */
 
-#include <string>
 #include "debug/debug.hpp"
+#include <iomanip>
+#include <sstream>
 #include "renderer/core/3d/renderer_3d_frustum_planes.hpp"
 
 namespace Tyra {

engine/src/renderer/models/color.cpp

@@ -9,6 +9,8 @@
 */
 
 #include "renderer/models/color.hpp"
+#include <sstream>
+#include <iomanip>
 
 namespace Tyra {