# HG changeset patch
# User John Tsiombikas <nuclear@member.fsf.org>
# Date 1399579230 -10800
# Node ID c5e997e8fd62e2d771941e219cb9d77e24ed60a5
# Parent  a42f6cd4e2fa8ac5f007a23783898656524d8349
lalala

diff -r a42f6cd4e2fa -r c5e997e8fd62 goatview/Makefile
--- a/goatview/Makefile	Thu May 08 19:30:49 2014 +0300
+++ b/goatview/Makefile	Thu May 08 23:00:30 2014 +0300
@@ -1,15 +1,17 @@
 PREFIX = /usr/local
 
 src = $(wildcard src/*.cc)
+csrc = $(wildcard src/*.c)
 mochdr = src/goatview.h
 mocsrc = $(patsubst src/%.h,src/moc_%.cc,$(mochdr))
-obj = $(sort $(src:.cc=.o) $(mocsrc:.cc=.o))
+obj = $(sort $(csrc:.c=.o) $(src:.cc=.o) $(mocsrc:.cc=.o))
 dep = $(obj:.o=.d)
 bin = goatview
 
 goat_root = ..
 
-CXXFLAGS = -std=c++11 -pedantic -Wall -g $(pic) -I$(goat_root)/src $(qtinc)
+CFLAGS = -pedantic -Wall -g $(pic) -I$(goat_root)/src $(qtinc)
+CXXFLAGS = -std=c++11 $(CFLAGS)
 LDFLAGS = $(libgoat) $(libgl) $(qtlib) -lvmath
 MOC = moc
 
@@ -34,6 +36,9 @@
 
 -include $(dep)
 
+%.d: %.c
+	@$(CPP) $(CFLAGS) $< -MM -MT $(@:.d=.o) >$@
+
 %.d: %.cc
 	@$(CPP) $(CXXFLAGS) $< -MM -MT $(@:.d=.o) >$@
 
diff -r a42f6cd4e2fa -r c5e997e8fd62 goatview/src/goatview.cc
--- a/goatview/src/goatview.cc	Thu May 08 19:30:49 2014 +0300
+++ b/goatview/src/goatview.cc	Thu May 08 23:00:30 2014 +0300
@@ -183,9 +183,9 @@
 		int node_count = goat3d_get_node_count(scene);
 		for(int i=0; i<node_count; i++) {
 			goat3d_node *node = goat3d_get_node(scene, i);
-			if(!goat3d_get_node_parent(node)) {
+			//if(!goat3d_get_node_parent(node)) {
 				draw_node(node);	// only draw root nodes, the rest will be drawn recursively
-			}
+			//}
 		}
 	}
 }
@@ -203,7 +203,7 @@
 	}
 
 	glPushMatrix();
-	glLoadMatrixf(xform);
+	glMultMatrixf(xform);
 
 	if(goat3d_get_node_type(node) == GOAT3D_NODE_MESH) {
 		goat3d_mesh *mesh = (goat3d_mesh*)goat3d_get_node_object(node);
@@ -236,10 +236,10 @@
 		glDisableClientState(GL_TEXTURE_COORD_ARRAY);
 	}
 
-	int num_child = goat3d_get_node_child_count(node);
+	/*int num_child = goat3d_get_node_child_count(node);
 	for(int i=0; i<num_child; i++) {
 		draw_node(goat3d_get_node_child(node, i));
-	}
+	}*/
 
 	glPopMatrix();
 }
@@ -256,6 +256,8 @@
 {
 	int dx = ev->x() - prev_x;
 	int dy = ev->y() - prev_y;
+	prev_x = ev->x();
+	prev_y = ev->y();
 
 	if(!dx && !dy) return;