X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FResource.hh;h=db6fe138e37f748d1d6747f667f8b93876c871dd;hp=2740fc31a136add04d6bcc81f7a21ae37aa878bc;hb=2f239b9ba2a556a5ca810cfffc60552a56a4fe86;hpb=a31d65a998121df0651c57bfb68782e2a07d2e2f

diff --git a/src/Moof/Resource.hh b/src/Moof/Resource.hh
index 2740fc3..db6fe13 100644
--- a/src/Moof/Resource.hh
+++ b/src/Moof/Resource.hh
@@ -1,30 +1,13 @@
 
-/*******************************************************************************
-
- Copyright (c) 2009, Charles McGarvey
- All rights reserved.
- 
- Redistribution   and   use  in  source  and  binary  forms,  with  or  without
- modification, are permitted provided that the following conditions are met:
- 
-   * Redistributions  of  source  code  must retain the above copyright notice,
-     this list of conditions and the following disclaimer.
-   * Redistributions  in binary form must reproduce the above copyright notice,
-     this  list of conditions and the following disclaimer in the documentation
-     and/or other materials provided with the distribution.
- 
- THIS  SOFTWARE  IS  PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND  ANY  EXPRESS  OR  IMPLIED  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED.  IN  NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- FOR  ANY  DIRECT,  INDIRECT,  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES  (INCLUDING,  BUT  NOT  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES;  LOSS  OF  USE,  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED  AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR  TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
+/*]  Copyright (c) 2009-2010, Charles McGarvey  [**************************
+**]  All rights reserved.
+*
+* vi:ts=4 sw=4 tw=75
+*
+* Distributable under the terms and conditions of the 2-clause BSD license;
+* see the file COPYING for a complete text of the license.
+*
+**************************************************************************/
 
 #ifndef _MOOF_RESOURCE_HH_
 #define _MOOF_RESOURCE_HH_
@@ -34,11 +17,10 @@
  * Interface for textures, sounds, and other types of resources.
  */
 
+#include <cstdio>
 #include <string>
 #include <vector>
 
-#include <Moof/Exception.hh>
-
 
 namespace Mf {
 
@@ -51,7 +33,7 @@ class Resource
 {
 public:
 
-	virtual ~Resource();
+	virtual ~Resource() {}
 
 
 	/**
@@ -59,32 +41,32 @@ public:
 	 * @param directory Path to a directory.
 	 */
 
-	static void addSearchPath(const std::string& directory);
+	static void addSearchPaths(const std::string& paths);
+	static void addSearchPaths(const std::vector<std::string>& pathList);
 
 	/**
 	 * Get the path to a resource of a given name.
-	 * @param name Name of a resource.  The name will be appended to each search
-	 * directory in order.
+	 * @param name Name of a resource.  The name will be appended to each
+	 * search directory in order.
 	 * @return The first path found which resolves to a file.
 	 */
 
-	static std::string getPath(const std::string& name);
-
+	static std::string getPath(const std::string& path,
+							   const std::string& prefix = "",
+							   const std::string& extension = "");
 
-	struct Exception : public Mf::Exception
-	{
-		explicit Exception(unsigned error) :
-			Mf::Exception(error) {}
+	static bool getPath(std::string& path,
+						const std::string& prefix = "",
+						const std::string& extension = "");
 
-		void raise()
-		{
-			throw *this;
-		}
-	};
+	static FILE* openFile(std::string& path,
+						  std::string prefix = "",
+						  const std::string& extension = "",
+						  const std::string& mode = "rb");
 
 private:
 
-	static std::vector<std::string> searchPaths_;
+	static std::vector<std::string> gSearchPaths;
 };
 
 
@@ -92,5 +74,3 @@ private:
 
 #endif // _MOOF_RESOURCE_HH_
 
-/** vim: set ts=4 sw=4 tw=80: *************************************************/
-