Use only the file buffer in stream adapter.

Author: kovacsv

assimpjs/example/main.cpp

@@ -11,7 +11,7 @@ static File GetFile (const std::string& filePath)
 		return File ();
 	}
 	size_t fileSize = stream->FileSize ();
-	std::vector<std::uint8_t> content (fileSize);
+	Buffer content (fileSize);
 	stream->Read (&content[0], 1, fileSize);
 	return File (filePath, content);
 }

assimpjs/src/fileio.cpp

@@ -11,63 +11,62 @@ static char GetOsSeparator ()
 #endif
 }
 
-
-FileIOStreamAdapter::FileIOStreamAdapter (const File& file) :
-	file (file),
+BufferIOStreamAdapter::BufferIOStreamAdapter (const Buffer& buffer) :
+	buffer (buffer),
 	position (0)
 {
 }
 
-FileIOStreamAdapter::~FileIOStreamAdapter ()
+BufferIOStreamAdapter::~BufferIOStreamAdapter ()
 {
 }
 
-size_t FileIOStreamAdapter::Read (void* pvBuffer, size_t pSize, size_t pCount)
+size_t BufferIOStreamAdapter::Read (void* pvBuffer, size_t pSize, size_t pCount)
 {
 	size_t remainingElemCount = (size_t) (std::floor ((FileSize () - position) / pSize));
 	size_t readableElemCount = std::min (remainingElemCount, pCount);
 	if (readableElemCount == 0) {
 		return 0;
 	}
-	memcpy (pvBuffer, &file.content[position], readableElemCount * pSize);
+	memcpy (pvBuffer, &buffer[position], readableElemCount * pSize);
 	position += readableElemCount * pSize;
 	return readableElemCount;
 }
 
-size_t FileIOStreamAdapter::Write (const void* pvBuffer, size_t pSize, size_t pCount)
+size_t BufferIOStreamAdapter::Write (const void* pvBuffer, size_t pSize, size_t pCount)
 {
 	throw std::logic_error ("not implemented");
 }
 
-aiReturn FileIOStreamAdapter::Seek (size_t pOffset, aiOrigin pOrigin)
+aiReturn BufferIOStreamAdapter::Seek (size_t pOffset, aiOrigin pOrigin)
 {
 	switch (pOrigin) {
-	case aiOrigin_SET:
-		position = pOffset;
-		break;
-	case aiOrigin_CUR:
-		position += pOffset;
-		break;
-	case aiOrigin_END:
-		position = file.content.size () - pOffset;
-		break;
-	default:
-		break;
+		case aiOrigin_SET:
+			position = pOffset;
+			break;
+		case aiOrigin_CUR:
+			position += pOffset;
+			break;
+		case aiOrigin_END:
+			position = buffer.size () - pOffset;
+			break;
+		default:
+			break;
 	}
 	return aiReturn::aiReturn_SUCCESS;
 }
 
-size_t FileIOStreamAdapter::Tell () const
+size_t BufferIOStreamAdapter::Tell () const
 {
 	return position;
 }
 
-size_t FileIOStreamAdapter::FileSize () const
+size_t BufferIOStreamAdapter::FileSize () const
 {
-	return file.content.size ();
+	return buffer.size ();
 }
 
-void FileIOStreamAdapter::Flush ()
+void BufferIOStreamAdapter::Flush ()
 {
 
 }
@@ -93,7 +92,7 @@ Assimp::IOStream* FileListIOSystemAdapter::Open (const char* pFile, const char*
 	if (foundFile == nullptr) {
 		return nullptr;
 	}
-	return new FileIOStreamAdapter (*foundFile);
+	return new BufferIOStreamAdapter (foundFile->content);
 }
 
 void FileListIOSystemAdapter::Close (Assimp::IOStream* pFile)

assimpjs/src/fileio.hpp

@@ -6,11 +6,11 @@
 
 #include "filelist.hpp"
 
-class FileIOStreamAdapter : public Assimp::IOStream
+class BufferIOStreamAdapter : public Assimp::IOStream
 {
 public:
-	FileIOStreamAdapter (const File& file);
-	virtual ~FileIOStreamAdapter ();
+	BufferIOStreamAdapter (const Buffer& buffer);
+	virtual ~BufferIOStreamAdapter ();
 
 	virtual size_t		Read (void* pvBuffer, size_t pSize, size_t pCount) override;
 	virtual size_t		Write (const void* pvBuffer, size_t pSize, size_t pCount) override;
@@ -19,11 +19,10 @@ class FileIOStreamAdapter : public Assimp::IOStream
 	virtual size_t		Tell () const override;
 
 	virtual size_t		FileSize () const override;
-
 	virtual void		Flush () override;
 
 private:
-	const File&			file;
+	const Buffer&		buffer;
 	size_t				position;
 };
 

assimpjs/src/filelist.cpp

@@ -28,7 +28,7 @@ File::File () :
 {
 }
 
-File::File (const std::string& path, const std::vector<std::uint8_t>& content) :
+File::File (const std::string& path, const Buffer& content) :
 	path (path),
 	content (content)
 {
@@ -44,7 +44,7 @@ FileList::FileList () :
 {
 }
 
-void FileList::AddFile (const std::string& path, const std::vector<std::uint8_t>& content)
+void FileList::AddFile (const std::string& path, const Buffer& content)
 {
 	files.push_back (File (path, content));
 }
@@ -75,7 +75,7 @@ const File* FileList::GetFile (const std::string& path) const
 
 void FileList::AddFileEmscripten (const std::string& path, const emscripten::val& content)
 {
-	std::vector<std::uint8_t> contentArr = emscripten::vecFromJSArray<std::uint8_t> (content);
+	Buffer contentArr = emscripten::vecFromJSArray<std::uint8_t> (content);
 	AddFile (path, contentArr);
 }
 #endif

assimpjs/src/filelist.hpp

@@ -8,24 +8,26 @@
 #include <vector>
 #include <string>
 
+using Buffer = std::vector<std::uint8_t>;
+
 class File
 {
 public:
 	File ();
-	File (const std::string& path, const std::vector<std::uint8_t>& content);
+	File (const std::string& path, const Buffer& content);
 
-	bool	IsValid () const;
+	bool			IsValid () const;
 
-	std::string					path;
-	std::vector<std::uint8_t>	content;
+	std::string		path;
+	Buffer			content;
 };
 
 class FileList
 {
 public:
 	FileList ();
 
-	void			AddFile (const std::string& path, const std::vector<std::uint8_t>& content);
+	void			AddFile (const std::string& path, const Buffer& content);
 
 	size_t			FileCount () const;
 	const File*		GetFile (size_t index) const;