X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2Fmoof%2Ftexture.cc;h=94d792dfc9d8ea295a152508d9c309700b1a5c93;hp=f8687f0c5f98b38110104225f5d47d357b97c43e;hb=6b0a0d0efafe34d48ab344fca3b479553bd4e62c;hpb=85783316365181491a3e3c0c63659972477cebba

diff --git a/src/moof/texture.cc b/src/moof/texture.cc
index f8687f0..94d792d 100644
--- a/src/moof/texture.cc
+++ b/src/moof/texture.cc
@@ -105,10 +105,9 @@ class texture::impl : public manager<impl>
 
 public:
 
-	/**
+	/*
 	 * Construction is initialization.
 	 */
-
 	impl() :
 		mMinFilter(GL_NEAREST),
 		mMagFilter(GL_NEAREST),
@@ -138,7 +137,7 @@ public:
 	{
 		std::string path(name);
 		
-		texture::find_path(path);
+		resource::find(path);
 
 		mImage = image::alloc(path);
 		if (!mImage->is_valid())
@@ -161,8 +160,7 @@ public:
 		}
 		else
 		{
-			log_info << "loading tiles from texture " << path
-					<< std::endl;
+			log_info("loading tiles from texture", path);
 
 			script::slot globals = script.globals();
 			globals.get(mTilesS, "tiles_s");
@@ -175,11 +173,10 @@ public:
 	}
 
 
-	/**
+	/*
 	 * Upload the image to GL so that it will be accessible by a much more
 	 * manageable handle and hopefully reside in video memory.
 	 */
-
 	void upload_to_gl()
 	{
 		if (mObject)
@@ -210,11 +207,10 @@ public:
 	}
 
 
-	/**
+	/*
 	 * Sets some texture properties such as the filters and external
 	 * coordinate behavior.
 	 */
-
 	void set_properties()
 	{
 		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, mMinFilter);
@@ -399,11 +395,5 @@ bool texture::tile_coordinates(int index, scalar coords[8],
 }
 
 
-bool texture::find_path(std::string& name)
-{
-	return resource::find_path(name, "textures/", "png");
-}
-
-
 } // namespace moof