From 913e8f62878432ba5fc6c104d105e0106b272b7e Mon Sep 17 00:00:00 2001
From: Josh Holtrop <jholtrop+git@gmail.com>
Date: Mon, 16 May 2011 15:25:03 -0400
Subject: [PATCH] build with loadTexture(), not rendering textures yet

---
 SConstruct    |  5 +++--
 wfobj         |  2 +-
 wfobj-view.cc | 13 +++++++++++++
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/SConstruct b/SConstruct
index 75c0040..4a57b36 100644
--- a/SConstruct
+++ b/SConstruct
@@ -3,12 +3,13 @@
 import os
 import sys
 
-env = Environment(LIBS = ['GL', 'GLU'],
+env = Environment(LIBS = ['GL', 'GLU', 'SDL_image'],
         CFLAGS = ['-Wall'],
         CXXFLAGS = ['-Wall'])
 env.ParseConfig('sdl-config --cflags --libs')
 
-env.Program('wfobj-view', [Glob('*.cc'), Glob('wfobj/WFObj.cc')])
+sources = [Glob('*.cc'), Glob('wfobj/WFObj.cc'), Glob('loadTexture/*.c')]
+env.Program('wfobj-view', sources)
 
 if len(os.listdir('wfobj')) == 0:
     sys.stderr.write('Warning: wfobj submodule not initialized\n')
diff --git a/wfobj b/wfobj
index 01a90fd..1918cc8 160000
--- a/wfobj
+++ b/wfobj
@@ -1 +1 @@
-Subproject commit 01a90fdef791dba32b455dc43726bb9de590ab8f
+Subproject commit 1918cc89bf954db83d079cfe4566a719fdc65237
diff --git a/wfobj-view.cc b/wfobj-view.cc
index ec70dae..28af4aa 100644
--- a/wfobj-view.cc
+++ b/wfobj-view.cc
@@ -9,6 +9,7 @@
 #include <GL/glu.h>
 #include <iostream>
 #include "wfobj/WFObj.h"
+#include "loadTexture/loadTexture.h"
 using namespace std;
 
 /* Some definitions */
@@ -43,6 +44,18 @@ private:
     GLint m_ambient_loc, m_diffuse_loc, m_specular_loc, m_shininess_loc;
 };
 
+static GLuint load_texture(const char *fname)
+{
+    GLuint id = loadTexture(fname);
+    if (id != 0)
+    {
+        glBindTexture(GL_TEXTURE_2D, id);
+        glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+        glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+    }
+    return id;
+}
+
 char * loadFile(const char *fname)
 {
     struct stat st;