chore: clean up existing stuff

craftablescience · Dec 3, 2023 · e0c266b · e0c266b
1 parent 83566f8
commit e0c266b
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 15 deletions.
diff --git a/include/studiomodelpp/studiomodelpp.h b/include/studiomodelpp/studiomodelpp.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include <optional>
-#include <string_view>
 #include <vector>
 
 #include "structs/MDL.h"
@@ -11,25 +9,30 @@
 namespace studiomodelpp {
 
 struct StudioModel {
-	bool open(const std::byte* mdlData, std::size_t mdlSize,
-	          const std::byte* vtxData, std::size_t vtxSize,
-	          const std::byte* vvdData, std::size_t vvdSize);
+	[[nodiscard]] bool open(const std::byte* mdlData, std::size_t mdlSize,
+							const std::byte* vtxData, std::size_t vtxSize,
+							const std::byte* vvdData, std::size_t vvdSize);
 
-	bool open(const unsigned char* mdlData, std::size_t mdlSize,
-	          const unsigned char* vtxData, std::size_t vtxSize,
-	          const unsigned char* vvdData, std::size_t vvdSize);
+	[[nodiscard]] bool open(const unsigned char* mdlData, std::size_t mdlSize,
+							const unsigned char* vtxData, std::size_t vtxSize,
+							const unsigned char* vvdData, std::size_t vvdSize);
 
-	bool open(const std::vector<std::byte>& mdlData,
-	          const std::vector<std::byte>& vtxData,
-	          const std::vector<std::byte>& vvdData);
+	[[nodiscard]] bool open(const std::vector<std::byte>& mdlData,
+							const std::vector<std::byte>& vtxData,
+							const std::vector<std::byte>& vvdData);
 
-	bool open(const std::vector<unsigned char>& mdlData,
-	          const std::vector<unsigned char>& vtxData,
-	          const std::vector<unsigned char>& vvdData);
+	[[nodiscard]] bool open(const std::vector<unsigned char>& mdlData,
+							const std::vector<unsigned char>& vtxData,
+							const std::vector<unsigned char>& vvdData);
+
+	[[nodiscard]] explicit operator bool() const;
 
 	MDL::MDL mdl;
 	VTX::VTX vtx;
 	VVD::VVD vvd;
+
+private:
+	bool opened = false;
 };
 
 } // namespace studiomodelpp
diff --git a/src/structs/MDL.cpp b/src/structs/MDL.cpp
@@ -17,6 +17,10 @@ bool MDL::open(const std::byte* data, std::size_t size) {
 	}
 
 	stream.read(this->version);
+	if (this->version < 44 || this->version > 49) {
+		return false;
+	}
+
 	stream.read(this->checksum);
 
 	auto nameBytes = stream.readBytes<64>();

diff --git a/src/studiomodelpp.cpp b/src/studiomodelpp.cpp
@@ -5,14 +5,15 @@ using namespace studiomodelpp;
 bool StudioModel::open(const std::byte* mdlData, std::size_t mdlSize,
 					   const std::byte* vtxData, std::size_t vtxSize,
                        const std::byte* vvdData, std::size_t vvdSize) {
-	if (!mdlData || !vtxData || !vvdData || !mdlSize || !vtxSize || !vvdSize) {
+	if (this->opened || !mdlData || !vtxData || !vvdData || !mdlSize || !vtxSize || !vvdSize) {
 		return false;
 	}
 	if ((!this->mdl.open(mdlData, mdlSize) ||
 		!this->vtx.open(vtxData, vtxSize, this->mdl.version, this->mdl.checksum)) ||
 		!this->vvd.open(vvdData, vvdSize, this->mdl.version, this->mdl.checksum)) {
 		return false;
 	}
+	this->opened = true;
 	return true;
 }
 
@@ -39,3 +40,7 @@ bool StudioModel::open(const std::vector<unsigned char>& mdlData,
 	                  vtxData.data(), vtxData.size(),
 	                  vvdData.data(), vvdData.size());
 }
+
+StudioModel::operator bool() const {
+	return this->opened;
+}