joshua/Orange
joshua
/
Orange
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Obj

This commit is contained in:
Joshua Ashton 2022-08-05 02:26:36 +00:00
parent 8a38007e35
commit aeed8530ad
6 changed files with 75 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/Orange/Core/FileSystem.h
View File

@ -6,5 +6,6 @@
namespace orange::fs
{
Result<Buffer> OpenFileIntoBuffer(const char* path, bool text = false);
Result<Buffer> OpenFileIntoBuffer(const char* path);
Result<TextBuffer> OpenFileIntoTextBuffer(const char* path);
}

29
include/Orange/Core/Parse.h
View File

@ -17,7 +17,7 @@ namespace orange::stream
if (result.ec == std::errc{})
{
first = result.ptr;
return Result<T>::Success(obj);
return Result<T>::Success(obj);
}
return Result<T>::Error(BasicErrorCode::NotFound);
@ -35,6 +35,11 @@ namespace orange::stream
return Parse<T>(first, first + strlen(first));
}
inline bool EndOfStream(const char* first, const char* end)
{
return first == end || *first == '\0';
}
inline bool CharMatches(char character, StringView delims)
{
for (auto delim : delims)
@ -46,10 +51,10 @@ namespace orange::stream
return false;
}
inline size_t Consume(const char*& first, StringView delims)
inline size_t Consume(const char*& first, const char* end, StringView delims)
{
size_t count = 0;
while (CharMatches(*first, delims))
while (!EndOfStream(first, end) && CharMatches(*first, delims))
{
first++;
count++;
@ -58,16 +63,16 @@ namespace orange::stream
return count;
}
inline size_t ConsumeSpace(const char*& first)
inline size_t ConsumeSpace(const char*& first, const char* end)
{
return Consume(first, " \t");
return Consume(first, end, " \t");
}
template <typename OutArray = SmallVector<char, 1>>
size_t ReadOrAdvance(const char*& first, StringView delims, size_t advancement = 0, OutArray* array = nullptr)
size_t ReadOrAdvance(const char*& first, const char* end, StringView delims, size_t advancement = 0, OutArray* array = nullptr)
{
size_t count = 0;
while (!CharMatches(*first, delims) && *first != '\0')
while (!EndOfStream(first, end) && !CharMatches(*first, delims))
{
if (array)
array->PushBack(*first);
@ -75,7 +80,7 @@ namespace orange::stream
count++;
}
if (*first == '\0')
if (EndOfStream(first, end))
return count;
first += advancement;
@ -84,13 +89,13 @@ namespace orange::stream
}
template <typename OutArray = SmallVector<char, 1>>
size_t ReadString(const char*& first, StringView delims, OutArray& array)
size_t ReadString(const char*& first, const char* end, StringView delims, OutArray& array)
{
return ReadOrAdvance(first, delims, 0, &array);
return ReadOrAdvance(first, end, delims, 0, &array);
}
inline size_t AdvancePast(const char*& first, StringView delims)
inline size_t AdvancePast(const char*& first, const char* end, StringView delims)
{
return ReadOrAdvance(first, delims, 1);
return ReadOrAdvance(first, end, delims, 1);
}
}

8
include/Orange/Core/SmallVector.h
View File

@ -118,6 +118,11 @@ namespace orange
Ptr(--m_size)->~T();
}
bool Empty() const
{
return Size() == 0;
}
T& operator [] (size_t idx) { return *Ptr(idx); }
const T& operator [] (size_t idx) const { return *Ptr(idx); }
@ -171,4 +176,7 @@ namespace orange
};
template <typename T>
using Vector = SmallVector<T, sizeof(T) / sizeof(void*)>;
}

10
include/Orange/Core/Span.h
View File

@ -58,8 +58,11 @@ namespace orange
};
using BufferView = Span<uint8_t>;
struct StringView : public Span<const char>
{
using Span<const char>::Span;
StringView(const char* str)
: Span<const char>{str, strlen(str)} {}
};
@ -70,4 +73,11 @@ namespace orange
~Buffer() { delete[] data; }
};
struct TextBuffer : public Span<char>
{
using Span<char>::Span;
~TextBuffer() { delete[] data; }
};
}

40
src/Apps/Tools/CubeTest.cpp
View File

@ -10,23 +10,25 @@
using namespace orange;
Result<VoidResult> ParseOBJ(BufferView buffer)
Result<VoidResult> ParseOBJ(StringView buffer)
{
const char* obj = (const char *)buffer.data;
do
const char* obj = buffer.data;
const char* end = buffer.data + buffer.size;
while (obj != end)
{
SmallVector<char, 8> element;
stream::ReadString(obj, " #\n", element);
stream::ReadString(obj, end, " #\n", element);
if (element == "v" || element == "vn" || element == "vt")
{
float vtx[3]{};
for (int i = 0; i < 3; i++)
{
stream::ConsumeSpace(obj);
auto r_float = stream::Parse<float>(obj);
if (!r_float) return Result<VoidResult>::Error();
vtx[i] = *r_float;
stream::ConsumeSpace(obj, end);
if (auto r_float = stream::Parse<float>(obj, end))
vtx[i] = *r_float;
else
return Result<VoidResult>::Error();
}
element.PushBack('\0');
@ -34,9 +36,9 @@ Result<VoidResult> ParseOBJ(BufferView buffer)
}
else if (element == "g" || element == "o")
{
stream::ConsumeSpace(obj);
stream::ConsumeSpace(obj, end);
SmallVector<char, 32> name;
stream::ReadString(obj, " #\n", name);
stream::ReadString(obj, end, " #\n", name);
name.PushBack('\0');
if (element == "g")
@ -49,18 +51,16 @@ Result<VoidResult> ParseOBJ(BufferView buffer)
int32_t indices[3][3]{};
for (int i = 0; i < 3; i++)
{
stream::ConsumeSpace(obj);
stream::ConsumeSpace(obj, end);
for (int j = 0; j < 3; j++)
{
indices[i][j] = -1;
if (j == 0 || stream::Consume(obj, "/"))
if (j == 0 || stream::Consume(obj, end, "/"))
{
auto r_int = stream::Parse<uint32_t>(obj);
if (!r_int) continue;
indices[i][j] = *r_int;
if (auto r_int = stream::Parse<uint32_t>(obj, end))
indices[i][j] = *r_int;
}
}
}
@ -69,14 +69,14 @@ Result<VoidResult> ParseOBJ(BufferView buffer)
indices[1][0], indices[1][1], indices[1][2],
indices[2][0], indices[2][1], indices[2][2]);
}
else if (element.Size())
else if (!element.Empty())
{
element.PushBack('\0');
log::info("Unknown element: %s", element.Data());
}
stream::AdvancePast(obj, "\n");
} while (*obj != '\0');
stream::AdvancePast(obj, end, "\n");
};
return Result<VoidResult>::Success();
}
@ -101,7 +101,7 @@ int main(int argc, char** argv)
if (!r_swapchain)
return 1;
auto r_objData = fs::OpenFileIntoBuffer("/home/joshua/chair.obj", true);
auto r_objData = fs::OpenFileIntoTextBuffer("/home/joshua/chair.obj");
if (!r_objData)
return 1;

21
src/Orange/Core/Filesystem.cpp
View File

@ -4,9 +4,9 @@
namespace orange::fs
{
Result<Buffer> OpenFileIntoBuffer(const char* path, bool text)
Result<Buffer> OpenFileIntoBuffer(const char* path)
{
FILE* file = fopen(path, text ? "r" : "rb");
FILE* file = fopen(path, "rb");
if (!file)
Result<Buffer>::Error(BasicErrorCode::NotFound);
fseek(file, 0, SEEK_END);
@ -16,8 +16,23 @@ namespace orange::fs
uint8_t* data = new uint8_t[size];
fread(data, size, 1, file);
fclose(file);
if (text) data[size++] = '\0';
return Result<Buffer>::Success(data, size);
}
Result<TextBuffer> OpenFileIntoTextBuffer(const char* path)
{
FILE* file = fopen(path, "rb");
if (!file)
Result<TextBuffer>::Error(BasicErrorCode::NotFound);
fseek(file, 0, SEEK_END);
size_t size = size_t(ftell(file));
fseek(file, 0, SEEK_SET);
char* data = new char[size];
fread(data, size, 1, file);
fclose(file);
return Result<TextBuffer>::Success(data, size);
}
}