tri11paragon
/
BLT
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ugh TODO: measure gcc version

v1
Brett 2024-02-04 14:38:52 -05:00
parent 25b35024e1
commit 83729b83d0
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/blt/parse/obj_loader.h
View File

@ -26,7 +26,7 @@
#include <string_view> #include <string_view>
#include <string> #include <string>
namespace blt::gfx namespace blt::parse
{ {
typedef blt::vec3f vertex_t; typedef blt::vec3f vertex_t;

16
src/blt/parse/obj_loader.cpp
View File

@ -27,8 +27,7 @@
#include "blt/std/utility.h" #include "blt/std/utility.h"
#include <blt/std/logging.h> #include <blt/std/logging.h>
namespace blt::parse
namespace blt::gfx
{ {
class char_tokenizer class char_tokenizer
{ {
@ -59,7 +58,20 @@ namespace blt::gfx
T get(std::string_view str) T get(std::string_view str)
{ {
T x; T x;
#if __cplusplus >= BLT_CPP20
const auto [ptr, ec] = std::from_chars(str.data(), str.data() + str.size(), x); const auto [ptr, ec] = std::from_chars(str.data(), str.data() + str.size(), x);
#else
auto ec = std::errc();
if constexpr (std::is_floating_point_v<T>)
{
x = static_cast<T>(std::stod(std::string(str)));
} else if constexpr (std::is_integral_v<T>)
{
x = static_cast<T>(std::stoll(std::string(str)));
} else
static_assert(
"You are using a c++ version which does not support the required std::from_chars, manual conversion has failed to find a type!");
#endif
// probably not needed. // probably not needed.
if (ec != std::errc()) if (ec != std::errc())
{ {