Stabilize model loaders

src/Orbit/Core/IO/Parser/ITextParser.h → src/Orbit/Core/Color/RGB.h

@@ -16,30 +16,41 @@
  */
 
 #pragma once
-#include "Orbit/Core/IO/Parser/IParser.h"
+#include "Orbit/Core/Core.h"
+
+// Fix macro interference on Windows
+#if defined( ORB_OS_WINDOWS )
+#  include <Windows.h>
+#  undef RGB
+#endif // ORB_OS_WINDOWS
 
 ORB_NAMESPACE_BEGIN
 
-class ORB_API_CORE ITextParser : public IParser
+class RGB
 {
 public:
 
-	explicit ITextParser( ByteSpan data );
-
-protected:
+	constexpr RGB( void ) = default;
 
-	void        SkipWhitespace  ( void );
-	std::string ReadAlphaNumeric( void );
-	std::string ReadPrintable   ( void );
-	std::string ReadLiteral     ( void );
+	constexpr explicit RGB( float grey )
+		: r( grey )
+		, g( grey )
+		, b( grey )
+	{
+	}
 
-protected:
+	constexpr RGB( float red, float green, float blue )
+		: r( red )
+		, g( green )
+		, b( blue )
+	{
+	}
 
-	std::string Peek( size_t length ) const;
-
-protected:
+public:
 
-	bool ExpectString( std::string_view str );
+	float r = 0.0f;
+	float g = 0.0f;
+	float b = 0.0f;
 
 };
 

src/Orbit/Core/IO/Parser/IParser.h → src/Orbit/Core/Color/RGBA.h

@@ -16,41 +16,46 @@
  */
 
 #pragma once
-#include "Orbit/Core/Utility/Span.h"
-
-#include <memory>
-#include <string_view>
+#include "Orbit/Core/Color/RGB.h"
 
 ORB_NAMESPACE_BEGIN
 
-class ORB_API_CORE IParser
+class RGBA
 {
 public:
 
-	explicit IParser( ByteSpan data );
-	virtual ~IParser( void ) = default;
+	constexpr RGBA( void ) = default;
+
+	constexpr explicit RGBA( float grey )
+		: r( grey )
+		, g( grey )
+		, b( grey )
+		, a( 1.0f )
+	{
+	}
+
+	constexpr explicit RGBA( const RGB& rgb, float alpha = 1.0f )
+		: r( rgb.r )
+		, g( rgb.g )
+		, b( rgb.b )
+		, a( alpha )
+	{
+	}
+
+	constexpr RGBA( float red, float green, float blue, float alpha = 1.0f )
+		: r( red )
+		, g( green )
+		, b( blue )
+		, a( alpha )
+	{
+	}
 
 public:
 
-	bool IsGood( void ) const { return good_; }
-
-protected:
-
-	void Skip     ( size_t size );
-	void ReadBytes( void* dst, size_t count );
-
-protected:
-
-	bool IsEOF( void ) const;
-
-protected:
-
-	std::unique_ptr< uint8_t[] > data_;
-
-	size_t                       size_;
-	size_t                       offset_;
-
-	bool                         good_;
+	float r = 0.0f;
+	float g = 0.0f;
+	float b = 0.0f;
+	float a = 1.0f;
 
 };
 

src/Orbit/Core/Core.h

@@ -18,8 +18,36 @@
 #pragma once
 #include "Orbit/Orbit.h"
 
+#include <type_traits>
+
 #if defined( ORB_BUILD_CORE )
 #  define ORB_API_CORE ORB_DLL_EXPORT
 #else // ORB_BUILD_CORE
 #  define ORB_API_CORE ORB_DLL_IMPORT
 #endif // !ORB_BUILD_CORE
+
+ORB_NAMESPACE_BEGIN
+
+template< typename T, typename... RemainingTypes >
+constexpr T Or( T first, RemainingTypes... remaining )
+{
+	static_assert( ( std::is_convertible_v< T, RemainingTypes > && ... ) );
+
+	if( !!first )
+	{
+		return first;
+	}
+	else
+	{
+		for( T var : { remaining... } )
+		{
+			if( !!var )
+				return var;
+		}
+	}
+
+	// None of them evaluated to true. Just return the first one.
+	return first;
+}
+
+ORB_NAMESPACE_END

src/Orbit/Core/IO/Asset.cpp

@@ -37,7 +37,7 @@ ORB_NAMESPACE_BEGIN
 
 Asset::Asset( std::string_view path )
 {
-	ORB_TRACE( "Loading asset: %s", path.data() );
+	ORB_TRACE( "Loading asset: %.*s", path.size(), path.data() );
 
 #if defined( ORB_OS_WINDOWS )
 

src/Orbit/Core/IO/Parser/IParser.cpp → src/Orbit/Core/IO/File/BinaryFile.cpp

@@ -15,43 +15,39 @@
  * 3. This notice may not be removed or altered from any source distribution.
  */
 
-#include "IParser.h"
+#include "BinaryFile.h"
 
 #include <cstring>
 
 ORB_NAMESPACE_BEGIN
 
-IParser::IParser( ByteSpan data )
-	: data_  { data.Copy() }
-	, size_  { data.Size() }
-	, offset_{ 0 }
-	, good_  { false }
+void BinaryFile::Init( size_t total_size )
 {
+	total_size_     = total_size;
+	current_offset_ = 0;
 }
 
-void IParser::Skip( size_t size )
+void BinaryFile::Skip( size_t size )
 {
-	if( ( offset_ + size ) < size_ ) offset_ += size;
-	else                             offset_  = size_;
+	// Increment offset, but clamp it so it doesn't exceed the total size
+	current_offset_ = std::min( current_offset_ + size, total_size_ );
 }
 
-void IParser::ReadBytes( void* dst, size_t count )
+void BinaryFile::ReadBytes( const void* src, void* dst, size_t size )
 {
-	if( ( offset_ + count ) < size_ )
-	{
-		std::memcpy( dst, &data_[ offset_ ], count );
-		offset_ += count;
-	}
-	else
-	{
-		std::memcpy( dst, &data_[ offset_ ], ( offset_ - size_ ) );
-		offset_ = size_;
-	}
+	// Make sure we don't read more bytes than we have
+	const size_t bytes_to_write = std::min( size, total_size_ - current_offset_ );
+
+	// Copy bytes from src to dst
+	std::memcpy( dst, static_cast< const uint8_t* >( src ) + current_offset_, bytes_to_write );
+
+	// Increment offset
+	current_offset_ += bytes_to_write;
 }
 
-bool IParser::IsEOF( void ) const
+bool BinaryFile::IsEOF( void ) const
 {
-	return ( offset_ == size_ );
+	return ( current_offset_ == total_size_ );
 }
 
 ORB_NAMESPACE_END

src/Orbit/Core/IO/Parser/XML/XMLElement.h → src/Orbit/Core/IO/File/BinaryFile.h

@@ -16,41 +16,42 @@
  */
 
 #pragma once
-#include "Orbit/Core/IO/Parser/XML/XMLAttribute.h"
+#include "Orbit/Core/Utility/Span.h"
 
-#include <string>
-#include <vector>
+#include <memory>
+#include <string_view>
 
 ORB_NAMESPACE_BEGIN
 
-class ORB_API_CORE XMLElement
+/** Base class for file format parsers.
+ * Does not store the data by default. This is by design in case the output can be processed in chunks rather than
+ * needing to wait until the entire file has been parsed.
+ */
+class ORB_API_CORE BinaryFile
 {
 public:
 
-	std::string_view Attribute( std::string_view key ) const;
+	         BinaryFile( void ) = default;
+	virtual ~BinaryFile( void ) = default;
 
-public:
+protected:
 
-	const XMLElement& ChildWithAttribute( std::string_view element, std::string_view attribute, std::string_view value ) const;
-	size_t            CountChildren     ( std::string_view element ) const;
-	bool              IsValid           ( void ) const;
+	/** Initializes the metadata */
+	void Init( size_t total_size );
 
-public:
+	/** Skips forward @size amount of bytes */
+	void Skip( size_t size );
 
-	auto begin( void ) const { return children.begin(); }
-	auto end  ( void ) const { return children.end(); }
+	/** Reads @size amount of bytes from @src and writes them to @dst */
+	void ReadBytes( const void* src, void* dst, size_t size );
 
-public:
-
-	const XMLElement& operator[]( std::string_view key ) const;
-
-public:
+	/** Returns whether or not the file has reached the end */
+	bool IsEOF( void ) const;
 
-	std::string name;
-	std::string content;
+protected:
 
-	std::vector< XMLAttribute > attributes;
-	std::vector< XMLElement >   children;
+	size_t total_size_     = 0;
+	size_t current_offset_ = 0;
 
 };