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

mesh refactor 2

Browse Source
This commit is contained in:
h4570
2022-08-10 17:57:42 +02:00
parent 725c17f9d4
commit a0898e7b4c
23 changed files with 75 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/inc/loaders/3d/obj_loader/obj_loader.hpp
+8 -8
View File
@@ -11,7 +11,7 @@
#pragma once
#include "../../loader.hpp"
#include "../builder2/mesh_builder2_data.hpp"
#include "../builder/mesh_builder_data.hpp"
#include <string>
#include "renderer/models/color.hpp"
#include "loaders/3d/obj_loader/tiny_obj_loader.hpp"
@@ -25,27 +25,27 @@ class ObjLoader : public Loader {
~ObjLoader();
/** Load multiple obj files (dynamic) */
MeshBuilder2Data* load(const char* fullpath, const u16& count,
const float& scale, const bool& invertT);
MeshBuilderData* load(const char* fullpath, const u16& count,
const float& scale, const bool& invertT);
inline MeshBuilder2Data* load(const std::string& fullpath, const u16& count,
const float& scale, const bool& invertT) {
inline MeshBuilderData* load(const std::string& fullpath, const u16& count,
const float& scale, const bool& invertT) {
return load(fullpath.c_str(), count, scale, invertT);
}
private:
void addOutputMaterialsAndFrames(
MeshBuilder2Data* output, const tinyobj::attrib_t& attrib,
MeshBuilderData* output, const tinyobj::attrib_t& attrib,
const std::vector<tinyobj::shape_t>& shapes,
const std::vector<tinyobj::material_t>& materials,
const u16& framesCount);
void scan(MeshBuilder2Data* output, const tinyobj::attrib_t& attrib,
void scan(MeshBuilderData* output, const tinyobj::attrib_t& attrib,
const std::vector<tinyobj::shape_t>& shapes,
const std::vector<tinyobj::material_t>& materials,
const u16& frameIndex);
void importFrame(MeshBuilder2Data* output, const tinyobj::attrib_t& attrib,
void importFrame(MeshBuilderData* output, const tinyobj::attrib_t& attrib,
const std::vector<tinyobj::shape_t>& shapes,
const std::vector<tinyobj::material_t>& materials,
const u16& frameIndex, const float& scale,