# HG changeset patch
# User John Tsiombikas <nuclear@member.fsf.org>
# Date 1399566649 -10800
# Node ID a42f6cd4e2fa8ac5f007a23783898656524d8349
# Parent  53ea5b25426eb662077cd0598873f520eb509631
foo

diff -r 53ea5b25426e -r a42f6cd4e2fa goatview/goatview.vcxproj
--- a/goatview/goatview.vcxproj	Thu May 08 16:25:04 2014 +0300
+++ b/goatview/goatview.vcxproj	Thu May 08 19:30:49 2014 +0300
@@ -103,7 +103,7 @@
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>goat3d-x64.lib;qtmaind.lib;Qt5Cored.lib;Qt5Widgetsd.lib;Qt5OpenGLd.lib;opengl32.lib;glu32.lib;libvmath-x64-dbg.lib;libanim-x64-dbg.lib;pthreadVC2_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>goat3d-x64.lib;qtmaind.lib;Qt5Guid.lib;Qt5Cored.lib;Qt5Widgetsd.lib;Qt5OpenGLd.lib;opengl32.lib;glu32.lib;libvmath-x64-dbg.lib;libanim-x64-dbg.lib;pthreadVC2_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
     <CustomBuildStep>
@@ -156,7 +156,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>goat3d-x64.lib;qtmain.lib;Qt5Widgets.lib;Qt5OpenGL.lib;opengl32.lib;glu32.lib;libvmath-x64.lib;libanim-x64.lib;pthreadVC2_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>goat3d-x64.lib;qtmain.lib;Qt5Gui.lib;Qt5Widgets.lib;Qt5OpenGL.lib;opengl32.lib;glu32.lib;libvmath-x64.lib;libanim-x64.lib;pthreadVC2_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
@@ -164,6 +164,7 @@
     <ClCompile Include="src\goatview.cc" />
     <ClCompile Include="src\main.cc" />
     <ClCompile Include="src\moc_goatview.cc" />
+    <ClCompile Include="src\opengl.c" />
   </ItemGroup>
   <!--ItemGroup>
     <ClInclude Include="src\goatview.h" />
@@ -178,6 +179,9 @@
       <Outputs>src\moc_goatview.cc</Outputs>
     </CustomBuild>
   </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="src\opengl.h" />
+  </ItemGroup>
   <PropertyGroup>
     <CustomBuildAfterTargets>ClCompile</CustomBuildAfterTargets>
     <CustomBuildBeforeTargets>Link</CustomBuildBeforeTargets>
diff -r 53ea5b25426e -r a42f6cd4e2fa goatview/goatview.vcxproj.filters
--- a/goatview/goatview.vcxproj.filters	Thu May 08 16:25:04 2014 +0300
+++ b/goatview/goatview.vcxproj.filters	Thu May 08 19:30:49 2014 +0300
@@ -27,10 +27,18 @@
     <ClCompile Include="src\moc_goatview.cc">
       <Filter>moc</Filter>
     </ClCompile>
+    <ClCompile Include="src\opengl.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="src\goatview.h">
       <Filter>Header Files</Filter>
     </CustomBuild>
   </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="src\opengl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff -r 53ea5b25426e -r a42f6cd4e2fa goatview/src/goatview.cc
--- a/goatview/src/goatview.cc	Thu May 08 16:25:04 2014 +0300
+++ b/goatview/src/goatview.cc	Thu May 08 19:30:49 2014 +0300
@@ -1,6 +1,6 @@
 #include <stdio.h>
 #include <QtOpenGL/QtOpenGL>
-#include <GL/glu.h>
+#include "opengl.h"
 #include <vmath/vmath.h>
 #include "goatview.h"
 #include "goat3d.h"
@@ -153,7 +153,9 @@
 
 void GoatViewport::initializeGL()
 {
-	glClearColor(0.1, 0.1, 0.1, 1);
+	init_opengl();
+
+	glClearColor(0.1f, 0.1f, 0.1f, 1.0f);
 
 	glEnable(GL_DEPTH_TEST);
 	glEnable(GL_CULL_FACE);
@@ -193,13 +195,15 @@
 	float xform[16];
 	goat3d_get_node_matrix(node, xform, anim_time);
 	for(int i=0; i<4; i++) {
-		float *row = xform + i * 4;
-		printf("[%3.3f %3.3f %3.3f %3.3f]\n", row[0], row[1], row[2], row[3]);
+		for(int j=0; j<i; j++) {
+			float tmp = xform[i * 4 + j];
+			xform[i * 4 + j] = xform[j * 4 + i];
+			xform[j * 4 + i] = tmp;
+		}
 	}
-	putchar('\n');
 
 	glPushMatrix();
-	glMultTransposeMatrixf(xform);
+	glLoadMatrixf(xform);
 
 	if(goat3d_get_node_type(node) == GOAT3D_NODE_MESH) {
 		goat3d_mesh *mesh = (goat3d_mesh*)goat3d_get_node_object(node);