Преглед изворни кода

Add resource parameter to online() callback

Daniele Bartolini пре 12 година
родитељ
комит
0262c6c222

+ 1 - 1
engine/resource/FontResource.cpp

@@ -49,7 +49,7 @@ void FontResource::unload(Allocator& /*allocator*/, void* /*resource*/)
 }
 
 //-----------------------------------------------------------------------------
-void FontResource::offline()
+void FontResource::offline(void* /*resource*/)
 {
 }
 

+ 2 - 2
engine/resource/FontResource.h

@@ -40,9 +40,9 @@ class FontResource
 public:
 
 	static void*		load(Allocator& allocator, Bundle& bundle, ResourceId id);
-	static void			online(void* resource);
 	static void			unload(Allocator& allocator, void* resource);
-	static void			offline();
+	static void			online(void* resource);
+	static void			offline(void* resource);
 
 public:
 

+ 1 - 1
engine/resource/MaterialResource.cpp

@@ -51,7 +51,7 @@ void MaterialResource::unload(Allocator& /*allocator*/, void* /*material*/)
 }
 
 //-----------------------------------------------------------------------------
-void MaterialResource::offline()
+void MaterialResource::offline(void* /*resource*/)
 {
 	// TODO
 }

+ 4 - 4
engine/resource/MaterialResource.h

@@ -51,10 +51,10 @@ class MaterialResource
 {
 public:
 
-	static void*	load(Allocator& allocator, Bundle& bundle, ResourceId id);
-	static void		online(void* resource);
-	static void		unload(Allocator& allocator, void* texture);
-	static void		offline();
+	static void*		load(Allocator& allocator, Bundle& bundle, ResourceId id);
+	static void			unload(Allocator& allocator, void* resource);
+	static void			online(void* resource);
+	static void			offline(void* resource);
 
 private:
 

+ 1 - 1
engine/resource/MeshResource.cpp

@@ -72,7 +72,7 @@ void MeshResource::unload(Allocator& , void* )
 }
 
 //-----------------------------------------------------------------------------
-void MeshResource::offline()
+void MeshResource::offline(void* /*resource*/)
 {
 
 }

+ 2 - 2
engine/resource/MeshResource.h

@@ -53,9 +53,9 @@ class MeshResource
 public:
 
 	static void*		load(Allocator& allocator, Bundle& bundle, ResourceId id);
-	static void			online(void* resource);
 	static void			unload(Allocator& allocator, void* resource);
-	static void			offline();
+	static void			online(void* resource);
+	static void			offline(void* resource);
 
 public:
 

+ 1 - 1
engine/resource/Resource.h

@@ -74,7 +74,7 @@ class Bundle;
 typedef void*	(*ResourceLoadCallback)(Allocator& a, Bundle& b, ResourceId id);
 typedef void	(*ResourceUnloadCallback)(Allocator& a, void* resource);
 typedef void	(*ResourceOnlineCallback)(void* resource);
-typedef void	(*ResourceOfflineCallback)(void);
+typedef void	(*ResourceOfflineCallback)(void* resource);
 
 struct ResourceCallback
 {

+ 2 - 2
engine/resource/ResourceRegistry.cpp

@@ -89,13 +89,13 @@ void resource_on_online(uint32_t type, void* resource)
 }
 
 //-----------------------------------------------------------------------------
-void resource_on_offline(uint32_t type)
+void resource_on_offline(uint32_t type, void* resource)
 {
 	const ResourceCallback* c = find_callback(type);
 
 	CE_ASSERT_NOT_NULL(c);
 
-	return c->on_offline();
+	return c->on_offline(resource);
 }
 
 } // namespace crown

+ 1 - 1
engine/resource/ResourceRegistry.h

@@ -33,7 +33,7 @@ namespace crown
 
 void* resource_on_load(uint32_t type, Allocator& allocator, Bundle& bundle, ResourceId id);
 void resource_on_online(uint32_t type, void* resource);
-void resource_on_offline(uint32_t type);
+void resource_on_offline(uint32_t type, void* resource);
 void resource_on_unload(uint32_t type, Allocator& allocator, void* resource);
 
 } // namespace crown

+ 1 - 1
engine/resource/SoundResource.cpp

@@ -73,7 +73,7 @@ void SoundResource::unload(Allocator& allocator, void* resource)
 }
 
 //-----------------------------------------------------------------------------
-void SoundResource::offline()
+void SoundResource::offline(void* /*resource*/)
 {
 
 }

+ 2 - 2
engine/resource/SoundResource.h

@@ -50,9 +50,9 @@ class SoundResource
 public:
 
 	static void*		load(Allocator& allocator, Bundle& bundle, ResourceId id);
-	static void			online(void* resource);
 	static void			unload(Allocator& allocator, void* resource);
-	static void			offline();
+	static void			online(void* resource);
+	static void			offline(void* resource);
 
 public:
 

+ 1 - 1
engine/resource/TextureResource.cpp

@@ -74,7 +74,7 @@ void TextureResource::unload(Allocator& allocator, void* resource)
 }
 
 //-----------------------------------------------------------------------------
-void TextureResource::offline()
+void TextureResource::offline(void* /*resource*/)
 {
 
 }

+ 2 - 2
engine/resource/TextureResource.h

@@ -53,9 +53,9 @@ class TextureResource
 public:
 
 	static void*		load(Allocator& allocator, Bundle& bundle, ResourceId id);
-	static void			online(void* resource);
 	static void			unload(Allocator& allocator, void* resource);
-	static void			offline();
+	static void			online(void* resource);
+	static void			offline(void* resource);
 
 public: