tri11paragon
/
BLT-With-Graphics-Template
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

reorder

main
Brett 2024-01-09 12:01:23 -05:00
parent 1817c50b4b
commit 18cbbca2a0
2 changed files with 35 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/blt/gfx/loader/obj_loader.h
View File

@ -103,8 +103,9 @@ namespace blt::gfx
};
std::vector<object_data> data;
private:
bool handle_vertex_and_normals(float x, float y, float z, char type);
void parse_extra_line(char_tokenizer& tokenizer);
void parse_face(std::string_view line);
void parse_face(char_tokenizer& tokenizer);
public:
void parseFile(std::string_view file);
};

75
src/blt/gfx/loader/obj_loader.cpp
View File

@ -21,6 +21,7 @@
#include <blt/std/logging.h>
#include <cctype>
#include <charconv>
#include "blt/std/assert.h"
namespace blt::gfx
{
@ -68,8 +69,8 @@ namespace blt::gfx
// x = static_cast<float>(i);
// } else
// {
BLT_WARN("Unable to parse string '%s' into number!", std::string(str).c_str());
x = 0;
BLT_WARN("Unable to parse string '%s' into number!", std::string(str).c_str());
x = 0;
// }
}
return x;
@ -78,47 +79,41 @@ namespace blt::gfx
void obj_loader::parse_extra_line(char_tokenizer& tokenizer)
{
char type = tokenizer.advance();
auto elements = blt::string::split(std::string(tokenizer.read_fully()), " ");
if (elements.size() < 2)
if (type == 'p')
{
BLT_ERROR("Unable to parse line '%s' too few arguments to type '%c'", std::string(tokenizer.read_fully()).c_str(), type);
BLT_WARN("Unexpected type '%c' (not supported)", type);
return;
}
auto elements = blt::string::split(std::string(tokenizer.read_fully()), " ");
BLT_ASSERT(elements.size() >= 2 && "Current line doesn't have enough arguments to process!");
float x = get(elements[0]), y = get(elements[1]);
if (elements.size() < 3)
{
if (type == 't')
uvs.push_back(uv_t{x, y});
else
BLT_ERROR("Unable to parse line '%s' type '%c' not recognized for arg count", std::string(tokenizer.read_fully()).c_str(), type);
} else
{
float z = get(elements[2]);
if (!handle_vertex_and_normals(x, y, z, type))
BLT_ERROR("Unable to parse line '%s' type '%c' not recognized", std::string(tokenizer.read_fully()).c_str(), type);
}
}
bool obj_loader::handle_vertex_and_normals(float x, float y, float z, char type)
{
if (std::isspace(type))
{
if (elements.size() < 3)
{
BLT_ERROR("Unable to parse line '%s' too few arguments to type '%c'", std::string(tokenizer.read_fully()).c_str(), type);
return;
}
float z = get(elements[2]);
vertices.push_back(vertex_t{x, y, z});
return;
}
switch (type)
} else if (type == 'n')
{
case 't':
uvs.push_back(uv_t{x,y});
break;
case 'n':
{
if (elements.size() < 3)
{
BLT_ERROR("Unable to parse line '%s' too few arguments to type '%c'", std::string(tokenizer.read_fully()).c_str(), type);
return;
}
float z = get(elements[2]);
normals.push_back(vertex_t{x, y, z});
break;
}
case 'p':
// optional todo
break;
default:
BLT_WARN("Unexpected type '%c'", type);
break;
}
normals.push_back(normal_t{x, y, z});
} else
return false;
return true;
}
std::vector<obj_object_t> quick_load(std::string_view file)
@ -142,24 +137,20 @@ namespace blt::gfx
case '#':
continue;
case 'f':
{
parse_face(token);
break;
}
case 'v':
{
parse_extra_line(token);
break;
}
case 'o':
{
break;
}
}
}
}
void obj_loader::parse_face(std::string_view line)
void obj_loader::parse_face(char_tokenizer& tokenizer)
{
}