fixed Makefile (had forgotten glut debugging stuff)

diff --git a/Makefile b/Makefile
index 4ca72b2..8b94f2b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,11 +6,10 @@ bin = hair
 
 dbg = -g
 opt = -O0
-inc = -Isrc -Isrc/shaders -Isrc/math -I/home/eleni/igalia/install/include
-
+inc = -Isrc -Isrc/shaders -Isrc/math
 CXX = g++
 CXXFLAGS = -pedantic -Wall $(dbg) $(opt) $(inc)
-LDFLAGS = -lGL -lGLU -lglut -lGLEW -limago -lassimp -lgmath -L/home/eleni/igalia/install/lib/libglut.so
+LDFLAGS = -lGL -lGLU -lglut -lGLEW -limago -lassimp -lgmath
 
 $(bin): $(obj)
        $(CXX) -o $@ $(obj) $(LDFLAGS)

diff --git a/src/main.cc b/src/main.cc
index ef26c3c..307f647 100644 (file)
--- a/src/main.cc
+++ b/src/main.cc
@@ -138,6 +138,7 @@ static void display()
                meshes[i]->draw();
        }
 
+       hair.set_transform(head_xform);
        hair.draw();
 
        glutSwapBuffers();