RuiFPB/tyra-linux
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

static mesh finish

Browse Source
This commit is contained in:
h4570
2022-07-18 21:42:11 +02:00
parent f249936981
commit 34c553af04
15 changed files with 213 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/inc/renderer/3d/mesh/dynamic/dynamic_mesh.hpp
+7 -18
View File
@@ -11,8 +11,8 @@
#pragma once
#include "loaders/3d/builder/mesh_builder_data.hpp"
#include "./dynamic_mesh_frame.hpp"
#include "./dynamic_mesh_material_frame.hpp"
#include "../mesh_frame.hpp"
#include "../mesh_material_frame.hpp"
#include "./dynamic_mesh_anim_state.hpp"
#include "../mesh.hpp"
@@ -24,22 +24,12 @@ class DynamicMesh : public Mesh {
explicit DynamicMesh(const DynamicMesh& mesh);
~DynamicMesh();
/** Returns material, which is a mesh "subgroup". */
DynamicMeshMaterial* getMaterial(const u32& i) const { return materials[i]; }
DynamicMeshMaterial** getMaterials() { return materials; }
const u32& getMaterialsCount() const { return materialsCount; }
const DynamicMeshAnimState& getAnimState() const { return animState; }
/** Count of all vertices. */
inline u32 getVertexCount() { return frames[0]->getVertexCount(); }
/** Returns single frame. */
DynamicMeshFrame* getFrame(const u32& i) { return frames[i]; }
MeshFrame* getFrame(const u32& i) { return frames[i]; }
DynamicMeshFrame** getFrames() { return frames; }
MeshFrame** getFrames() { return frames; }
/** Count of frames. Static object (not animated) will have only 1 frame. */
const u32& getFramesCount() const { return framesCount; }
@@ -81,11 +71,10 @@ class DynamicMesh : public Mesh {
const u8& isStayAnimationSet() const { return animState.isStayFrameSet; }
private:
void initMesh();
void initAnimation();
DynamicMeshAnimState animState;
u32 framesCount, materialsCount;
DynamicMeshFrame** frames;
DynamicMeshMaterial** materials;
u32 framesCount;
MeshFrame** frames;
};
} // namespace Tyra
engine/inc/renderer/3d/mesh/dynamic/dynamic_mesh_frame.hpp
-51
View File
@@ -1,51 +0,0 @@
/*
# ______ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
#pragma once
#include "./dynamic_mesh_material.hpp"
#include "loaders/3d/builder/mesh_builder_data.hpp"
#include "renderer/3d/bbox/bbox.hpp"
namespace Tyra {
class DynamicMeshFrame {
public:
explicit DynamicMeshFrame(const MeshBuilderData& data, const u32& index);
explicit DynamicMeshFrame(const DynamicMeshFrame& frame);
~DynamicMeshFrame();
const u32& getId() const { return id; }
const u32& getVertexCount() const { return vertexCount; }
const u32& getTextureCoordsCount() const { return textureCoordsCount; }
const u32& getNormalsCount() const { return normalsCount; }
const u32& getColorsCount() const { return colorsCount; }
const u8& isMother() const { return _isMother; }
const BBox& getBBox() const { return *bbox; }
Vec4* getVertices() const { return vertices; }
Vec4* getNormals() const { return normals; }
Vec4* getTextureCoords() const { return textureCoords; }
Color* getColors() const { return colors; }
void print() const;
void print(const char* name) const;
void print(const std::string& name) const { print(name.c_str()); }
std::string getPrint(const char* name = nullptr) const;
private:
u8 _isMother;
BBox* bbox;
u32 id, vertexCount, textureCoordsCount, normalsCount, colorsCount;
Vec4 *vertices, *textureCoords, *normals;
Color* colors;
};
} // namespace Tyra
engine/inc/renderer/3d/mesh/dynamic/dynamic_mesh_material.hpp
-58
View File
@@ -1,58 +0,0 @@
/*
# ______ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
#pragma once
#include "debug/debug.hpp"
#include "loaders/3d/builder/mesh_builder_data.hpp"
#include "renderer/3d/mesh/dynamic/dynamic_mesh_material_frame.hpp"
namespace Tyra {
class DynamicMeshMaterial {
public:
explicit DynamicMeshMaterial(const MeshBuilderData& data,
const u32& materialIndex);
explicit DynamicMeshMaterial(const DynamicMeshMaterial& material);
~DynamicMeshMaterial();
Color singleColor;
const u32& getId() const { return id; }
const std::string& getName() const { return _name; }
const u32& getFacesCount() const { return facesCount; }
const u8& isMother() const { return _isMother; }
const u8& isSingleColorActivated() const { return singleColorFlag; }
u32* getVertexFaces() const { return vertexFaces; }
u32* getTextureCoordFaces() const { return textureCoordFaces; }
u32* getNormalFaces() const { return normalFaces; }
u32* getColorFaces() const { return normalFaces; }
DynamicMeshMaterialFrame* getFrames() const { return *frames; }
const BBox& getBBox(const u32& frame) const;
void setSingleColorFlag(const u8& flag);
void print() const;
void print(const char* name) const;
void print(const std::string& name) const { print(name.c_str()); }
std::string getPrint(const char* name = nullptr) const;
private:
DynamicMeshMaterialFrame** frames;
std::string _name;
u8 _isMother, singleColorFlag;
u32 id, facesCount, framesCount;
u32 *vertexFaces, *textureCoordFaces, *normalFaces, *colorFaces;
};
} // namespace Tyra
engine/inc/renderer/3d/mesh/dynamic/dynamic_mesh_material_frame.hpp
-36
View File
@@ -1,36 +0,0 @@
/*
# ______ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
#pragma once
#include "./renderer/3d/bbox/bbox.hpp"
namespace Tyra {
class DynamicMeshMaterialFrame {
public:
explicit DynamicMeshMaterialFrame(const MeshBuilderData& data,
const u32& frameIndex,
const u32& materialIndex);
explicit DynamicMeshMaterialFrame(const DynamicMeshMaterialFrame& frame);
~DynamicMeshMaterialFrame();
const u32& getId() const { return id; }
const u8& isMother() const { return _isMother; }
const BBox& getBBox() const { return *bbox; }
private:
BBox* bbox;
u8 _isMother;
u32 id;
};
} // namespace Tyra