[Hgengine-cvs] SF.net SVN: hgengine:[124] Mercury2/src

[<axl...@us...>]

Revision: 124
          http://hgengine.svn.sourceforge.net/hgengine/?rev=124&view=rev
Author:   axlecrusher
Date:     2008-12-31 04:49:29 +0000 (Wed, 31 Dec 2008)

Log Message:
-----------
make macros to add and remove instances

Modified Paths:
--------------
    Mercury2/src/MercuryAsset.h
    Mercury2/src/Quad.cpp
    Mercury2/src/Texture.cpp

Modified: Mercury2/src/MercuryAsset.h
===================================================================
--- Mercury2/src/MercuryAsset.h	2008-12-31 04:37:02 UTC (rev 123)
+++ Mercury2/src/MercuryAsset.h	2008-12-31 04:49:29 UTC (rev 124)
@@ -47,7 +47,12 @@
 	Callback0R< MAutoPtr<MercuryAsset> > factoryclbk##class( FactoryFunct##class ); \
 	bool GlobalRegisterSuccess##class = AssetFactory::GetInstance().RegisterFactoryCallback(#class, factoryclbk##class);
 
+#define ADD_ASSET_INSTANCE(class, key, ptr)\
+		AssetFactory::GetInstance().AddAssetInstance( ToUpper(#class)+key, ptr );
 
+#define REMOVE_ASSET_INSTANCE(class, key)\
+		AssetFactory::GetInstance().RemoveAssetInstance( ToUpper(#class)+key );
+
 #endif
 
 /***************************************************************************

Modified: Mercury2/src/Quad.cpp
===================================================================
--- Mercury2/src/Quad.cpp	2008-12-31 04:37:02 UTC (rev 123)
+++ Mercury2/src/Quad.cpp	2008-12-31 04:49:29 UTC (rev 124)
@@ -39,13 +39,13 @@
 
 Quad::~Quad()
 {
-	AssetFactory::GetInstance().RemoveAssetInstance( "QUAD" );
+	REMOVE_ASSET_INSTANCE(Quad,"");
 }
 
 Quad* Quad::Generate()
 {
 	Quad *asset = new Quad();
-	AssetFactory::GetInstance().AddAssetInstance( "QUAD", asset );
+	ADD_ASSET_INSTANCE(Quad,"",asset);
 	printf("new quad\n");
 	return asset;
 }

Modified: Mercury2/src/Texture.cpp
===================================================================
--- Mercury2/src/Texture.cpp	2008-12-31 04:37:02 UTC (rev 123)
+++ Mercury2/src/Texture.cpp	2008-12-31 04:49:29 UTC (rev 124)
@@ -23,7 +23,7 @@
 
 Texture::~Texture()
 {
-	AssetFactory::GetInstance().RemoveAssetInstance( "TEXTURE"+m_filename );
+	REMOVE_ASSET_INSTANCE(TEXTURE, m_filename);
 	
 	if (m_textureID) glDeleteTextures(1, &m_textureID);
 	m_textureID = 0;
@@ -125,7 +125,7 @@
 	{
 		m_isLoaded = true;
 		m_filename = path;
-		AssetFactory::GetInstance().AddAssetInstance("TEXTURE" + m_filename, this);
+		ADD_ASSET_INSTANCE(Texture, m_filename, this);
 		RawImageData* d = ImageLoader::GetInstance().LoadImage( m_filename );
 		if (d) LoadFromRaw( d );
 	}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.