add TextureLoader, FileLoader submodules; update to compile again

.gitmodules

@@ -0,0 +1,9 @@
+[submodule "wfobj"]
+	path = wfobj
+	url = ../wfobj
+[submodule "FileLoader"]
+	path = FileLoader
+	url = ../FileLoader.git
+[submodule "TextureLoader"]
+	path = TextureLoader
+	url = ../TextureLoader.git

Makefile

@@ -13,7 +13,7 @@ else
 GLLIBS     := -lGL -lGLU
 endif
 
-export CXXFLAGS := -O2 $(shell sdl-config --cflags)
+export CXXFLAGS := -O2 $(shell sdl-config --cflags) -I$(CURDIR)
 LDFLAGS  := $(GLLIBS) $(WINDOWSLIBS) $(shell sdl-config --libs) -lSDL_image
 TARGET   := wfobj-view
 

TextureCache/TextureCache.cc

@@ -4,7 +4,7 @@
 #include <GL/gl.h>
 #include <GL/glu.h>
 #include <iostream>
-#include "TextureCache.hh"
+#include "TextureCache.h"
 using namespace std;
 
 GLuint TextureCache::load(const string & filename)

wfobj-view.cc

@@ -4,8 +4,8 @@
 #include <GL/gl.h>
 #include <GL/glu.h>
 #include <iostream>
-#include "wfobj/WFObj.hh"
-#include "TextureCache/TextureCache.hh"
+#include "wfobj/WFObj.h"
+#include "TextureCache/TextureCache.h"
 using namespace std;
 
 /* Some definitions */
@@ -15,10 +15,15 @@ using namespace std;
 
 TextureCache textureCache;
 
-GLuint loadTexture(const char * filename)
+class LoadTexture : public TextureLoader
 {
-	return textureCache.load(filename);
+    public:
+        GLuint load(const FileLoader::Path & path,
+                FileLoader & fl, bool mipmaps, int mode, int quality)
+        {
+            return textureCache.load(path.fullPath);
         }
+};
 
 class Viewer
 {
@@ -31,7 +36,6 @@ private:
 	void display();
 	void setProjection();
 
-	WFObj m_obj;
 	GLuint m_list;
 	float m_rotationMatrix[16];
 	int	m_startx, m_starty;
@@ -76,7 +80,9 @@ Viewer::Viewer(const char * filename)
 {
 	m_dist = 5.0;
 	m_dragging = false;
-	m_obj.load(filename, &loadTexture);
+	LoadTexture lt;
+	WFObj m_obj(lt);
+	m_obj.load(FileLoader::Path(filename, ""));
 	m_list = m_obj.render();
 	
 	/* Print out the object's size */