test and fix examples in NBL_EMBED_BUILTIN_RESOURCES mode

devshgraphicsprogramming · devshgraphicsprogramming · commit 49023e7414ff · 2023-11-28T19:15:45.000+01:00
diff --git a/examples_tests b/examples_tests
@@ -1 +1 @@
-Subproject commit b37be840894682ccee1f37e40209a95c2b91bc22
+Subproject commit 215462f4cdceb49156878e1906d147de79f241d8
diff --git a/include/nbl/system/IFileBase.h b/include/nbl/system/IFileBase.h
@@ -71,6 +71,8 @@ class IFileBase : public core::IReferenceCounted
 		core::bitflag<E_CREATE_FLAGS> m_flags;
 };
 
+NBL_ENUM_ADD_BITWISE_OPERATORS(IFileBase::E_CREATE_FLAGS);
+
 }
 
 #endif
diff --git a/src/nbl/builtin/template/CArchive.h.in b/src/nbl/builtin/template/CArchive.h.in
@@ -16,10 +16,10 @@ namespace @_NAMESPACE_@
 			CArchive(nbl::system::logger_opt_smart_ptr&& logger);
 			
 		protected:
-			file_buffer_t getFileBuffer(const nbl::system::IFileArchive::SFileList::SEntry* item) override
+			file_buffer_t getFileBuffer(const nbl::system::IFileArchive::SFileList::found_t& found) override
 			{
-					auto found = get_resource_runtime(item->pathRelativeToArchive.string());
-					return { const_cast<uint8_t*>(found.first), found.second, nullptr };
+					auto resource = get_resource_runtime(found->pathRelativeToArchive.string());
+					return {const_cast<uint8_t*>(resource.first),resource.second,nullptr};
 			}			
 	};
 }

Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,8 @@ class IFileBase : public core::IReferenceCounted`
`71`	`71`	`core::bitflag<E_CREATE_FLAGS> m_flags;`
`72`	`72`	`};`
`73`	`73`
	`74`	`+NBL_ENUM_ADD_BITWISE_OPERATORS(IFileBase::E_CREATE_FLAGS);`
	`75`	`+`
`74`	`76`	`}`
`75`	`77`
`76`	`78`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -16,10 +16,10 @@ namespace @_NAMESPACE_@`
`16`	`16`	`CArchive(nbl::system::logger_opt_smart_ptr&& logger);`
`17`	`17`
`18`	`18`	`protected:`
`19`		`- file_buffer_t getFileBuffer(const nbl::system::IFileArchive::SFileList::SEntry* item) override`
	`19`	`+ file_buffer_t getFileBuffer(const nbl::system::IFileArchive::SFileList::found_t& found) override`
`20`	`20`	`{`
`21`		`- auto found = get_resource_runtime(item->pathRelativeToArchive.string());`
`22`		`- return { const_cast<uint8_t*>(found.first), found.second, nullptr };`
	`21`	`+ auto resource = get_resource_runtime(found->pathRelativeToArchive.string());`
	`22`	`+ return {const_cast<uint8_t*>(resource.first),resource.second,nullptr};`
`23`	`23`	`}`
`24`	`24`	`};`
`25`	`25`	`}`