constexpr CmptType

Ubpa · Jul 30, 2020 · adf2b13 · adf2b13
1 parent 1c51806
commit adf2b13
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/doc/todo.md b/doc/todo.md
@@ -32,6 +32,7 @@
 - [x] lock `FilterChange` 
 - [ ] `EntityMngr` `Query`-driven API
 - [x] `RTDCmptsView` = `const EntityLocator* locator + void** cmpts` 
+- [ ] Filter Builder
 
 ### maybe deprecate
 

diff --git a/include/UECS/CmptTag.h b/include/UECS/CmptTag.h
@@ -16,7 +16,7 @@ namespace Ubpa::UECS {
 	class LastFrame {
 	public:
 		LastFrame(const Cmpt* cmpt) noexcept : cmpt{ cmpt } {}
-		const Cmpt* get() const noexcept { return cmpt; }
+		const Cmpt* Get() const noexcept { return cmpt; }
 		operator const Cmpt* () const noexcept { return cmpt; }
 		const Cmpt* operator->() const noexcept { return cmpt; }
 	private:

diff --git a/include/UECS/CmptType.h b/include/UECS/CmptType.h
@@ -18,11 +18,11 @@ namespace Ubpa::UECS {
 		static constexpr CmptType Invalid() noexcept { return CmptType{ static_cast<size_t>(-1) }; }
 
 		template<typename Cmpt>
-		bool Is() const noexcept { return hashcode == TypeID<Cmpt>; }
+		constexpr bool Is() const noexcept { return hashcode == TypeID<Cmpt>; }
 
-		bool operator<(const CmptType& rhs) const noexcept { return hashcode < rhs.hashcode; }
-		bool operator==(const CmptType& rhs) const noexcept { return hashcode == rhs.hashcode; }
-		bool operator!=(const CmptType& rhs) const noexcept { return hashcode != rhs.hashcode; }
+		constexpr bool operator<(const CmptType& rhs) const noexcept { return hashcode < rhs.hashcode; }
+		constexpr bool operator==(const CmptType& rhs) const noexcept { return hashcode == rhs.hashcode; }
+		constexpr bool operator!=(const CmptType& rhs) const noexcept { return hashcode != rhs.hashcode; }
 	private:
 		size_t hashcode;
 	};

diff --git a/include/UECS/SystemMngr.h b/include/UECS/SystemMngr.h
@@ -18,8 +18,8 @@ namespace Ubpa::UECS{
 		bool IsRegister(std::string_view name) const {
 			return onUpdateMap.find(name) != onUpdateMap.end();
 		}
-		void Deregister(const std::string& name) {
-			onUpdateMap.erase(name);
+		void Deregister(std::string_view name) {
+			onUpdateMap.erase(onUpdateMap.find(name));
 		}
 
 		template<typename... Systems>