mesh patch 1

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

@@ -10,7 +10,6 @@
 
 #pragma once
 
-#include "loaders/3d/builder/mesh_builder_data.hpp"
 #include "../mesh_frame.hpp"
 #include "../mesh_material_frame.hpp"
 #include "./dynamic_mesh_anim_state.hpp"
@@ -20,7 +19,6 @@ namespace Tyra {
 
 class DynamicMesh : public Mesh {
  public:
-  explicit DynamicMesh(const MeshBuilderData& data);
   explicit DynamicMesh(const MeshBuilder2Data& data);
   explicit DynamicMesh(const DynamicMesh& mesh);
   ~DynamicMesh();

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

@@ -19,7 +19,6 @@ namespace Tyra {
 
 class Mesh {
  public:
-  explicit Mesh(const MeshBuilderData& data);
   explicit Mesh(const MeshBuilder2Data& data);
   explicit Mesh(const Mesh& mesh);
   ~Mesh();

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

@@ -11,7 +11,6 @@
 #pragma once
 
 #include "./mesh_material.hpp"
-#include "loaders/3d/builder/mesh_builder_data.hpp"
 #include "loaders/3d/builder2/mesh_builder2_data.hpp"
 #include "renderer/3d/bbox/bbox.hpp"
 
@@ -19,7 +18,6 @@ namespace Tyra {
 
 class MeshFrame {
  public:
-  explicit MeshFrame(const MeshBuilderData& data, const u32& index);
   explicit MeshFrame(const MeshBuilder2Data& data, const u32& index);
   explicit MeshFrame(const MeshFrame& frame);
   ~MeshFrame();

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

@@ -11,15 +11,13 @@
 #pragma once
 
 #include "debug/debug.hpp"
-#include "loaders/3d/builder/mesh_builder_data.hpp"
-#include "loaders/3d/builder2/mesh_builder2_data.hpp"
 #include "./mesh_material_frame.hpp"
+#include "loaders/3d/builder2/mesh_builder2_data.hpp"
 
 namespace Tyra {
 
 class MeshMaterial {
  public:
-  explicit MeshMaterial(const MeshBuilderData& data, const u32& materialIndex);
   explicit MeshMaterial(const MeshBuilder2Data& data, const u32& materialIndex);
   explicit MeshMaterial(const MeshMaterial& material);
   ~MeshMaterial();

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

@@ -10,7 +10,6 @@
 
 #pragma once
 
-#include "loaders/3d/builder/mesh_builder_data.hpp"
 #include "loaders/3d/builder2/mesh_builder2_data.hpp"
 #include "./renderer/3d/bbox/bbox.hpp"
 
@@ -18,8 +17,6 @@ namespace Tyra {
 
 class MeshMaterialFrame {
  public:
-  explicit MeshMaterialFrame(const MeshBuilderData& data, const u32& frameIndex,
-                             const u32& materialIndex);
   explicit MeshMaterialFrame(const MeshBuilder2Data& data,
                              const u32& frameIndex, const u32& materialIndex);
   explicit MeshMaterialFrame(const MeshMaterialFrame& frame);
@@ -41,15 +38,6 @@ class MeshMaterialFrame {
   std::string getPrint(const char* name = nullptr) const;
 
  private:
-  void allocateVertices(const MeshBuilderData& data, const u32& frameIndex,
-                        const u32& materialIndex);
-  void allocateTextureCoords(const MeshBuilderData& data, const u32& frameIndex,
-                             const u32& materialIndex);
-  void allocateNormals(const MeshBuilderData& data, const u32& frameIndex,
-                       const u32& materialIndex);
-  void allocateColors(const MeshBuilderData& data, const u32& frameIndex,
-                      const u32& materialIndex);
-
   BBox* bbox;
 
   u8 _isMother;

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

@@ -18,7 +18,6 @@ namespace Tyra {
 
 class StaticMesh : public Mesh {
  public:
-  StaticMesh(const MeshBuilderData& data);
   StaticMesh(const MeshBuilder2Data& data);
   StaticMesh(const StaticMesh& mesh);
   ~StaticMesh();

engine/inc/renderer/3d/pipeline/dynamic/core/dynpip_renderer.hpp

@@ -50,6 +50,7 @@ class DynPipRenderer {
 
   prim_t* prim;
   lod_t* lod;
+  u16 packetSize;
 
   packet2_t* packets[2];
   packet2_t* programsPacket;

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

@@ -85,7 +85,7 @@ class StaPipQBufferRenderer {
   static const u16 buffersCount;
 
   StaPipVU1Program* getProgramByName(const StaPipProgramName& name);
-  void addBufferDataToPacket(StaPipQBuffer** buffers, const u32& count);
+  void addBuffersDataToPacket(const u32& from, const u32& to);
   void sendPacket();
   StaPipVU1Program* getAsIsProgramByBag(const StaPipBag* bag);
   StaPipVU1Program* getCullProgramByType(const StaPipProgramType& programType);