# HG changeset patch
# User John Tsiombikas <nuclear@member.fsf.org>
# Date 1408880160 -10800
# Node ID 9b0db7dbde6e70d50d2807dfe1fa8958aac681a6
# Parent  423d4e6728cbda2e8f493ab08104b57406cfa0e8
hmmm doesn't work properly yes

diff -r 423d4e6728cb -r 9b0db7dbde6e conworlds.vcxproj
--- a/conworlds.vcxproj	Sun Aug 24 09:43:58 2014 +0300
+++ b/conworlds.vcxproj	Sun Aug 24 14:36:00 2014 +0300
@@ -58,7 +58,7 @@
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>opengl32.lib;freeglutd.lib;glew32.lib;libvmath.lib;libimago2.lib;jpeglib.lib;libpng.lib;zlib.lib;libovrd.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>opengl32.lib;freeglutd.lib;glew32.lib;libvmath.lib;libanim.lib;libimago2.lib;jpeglib.lib;libpng.lib;zlib.lib;libovrd.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -78,17 +78,28 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>opengl32.lib;freeglut.lib;glew32.lib;libvmath.lib;libimago2.lib;jpeglib.lib;libpng.lib;zlib.lib;libovr.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>opengl32.lib;freeglut.lib;glew32.lib;libvmath.lib;libanim.lib;libimago2.lib;jpeglib.lib;libpng.lib;zlib.lib;libovr.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="src\assload.cc" />
     <ClCompile Include="src\camera.cc" />
     <ClCompile Include="src\game.cc" />
+    <ClCompile Include="src\gameopt.cc" />
+    <ClCompile Include="src\geom.cc" />
     <ClCompile Include="src\image.cc" />
+    <ClCompile Include="src\light.cc" />
+    <ClCompile Include="src\logger.cc" />
     <ClCompile Include="src\main.cc" />
+    <ClCompile Include="src\material.cc" />
+    <ClCompile Include="src\mesh.cc" />
+    <ClCompile Include="src\object.cc" />
     <ClCompile Include="src\opengl.cc" />
+    <ClCompile Include="src\scene.cc" />
     <ClCompile Include="src\sdr.c" />
+    <ClCompile Include="src\shader.cc" />
     <ClCompile Include="src\texture.cc" />
+    <ClCompile Include="src\unistate.cc" />
     <ClCompile Include="src\vr\mathutil.c" />
     <ClCompile Include="src\vr\opt.c" />
     <ClCompile Include="src\vr\rbtree.c" />
@@ -97,21 +108,38 @@
     <ClCompile Include="src\vr\vr_modules.c" />
     <ClCompile Include="src\vr\vr_null.c" />
     <ClCompile Include="src\vr\vr_openhmd.c" />
+    <ClCompile Include="src\xform_node.cc" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="src\assload.h" />
     <ClInclude Include="src\camera.h" />
+    <ClInclude Include="src\dataset.h" />
     <ClInclude Include="src\game.h" />
+    <ClInclude Include="src\gameopt.h" />
+    <ClInclude Include="src\geom.h" />
     <ClInclude Include="src\image.h" />
+    <ClInclude Include="src\light.h" />
+    <ClInclude Include="src\logger.h" />
+    <ClInclude Include="src\material.h" />
+    <ClInclude Include="src\mesh.h" />
+    <ClInclude Include="src\object.h" />
     <ClInclude Include="src\opengl.h" />
+    <ClInclude Include="src\scene.h" />
     <ClInclude Include="src\sdr.h" />
+    <ClInclude Include="src\shader.h" />
     <ClInclude Include="src\texture.h" />
+    <ClInclude Include="src\unistate.h" />
     <ClInclude Include="src\vr\mathutil.h" />
     <ClInclude Include="src\vr\opt.h" />
     <ClInclude Include="src\vr\rbtree.h" />
     <ClInclude Include="src\vr\vr.h" />
     <ClInclude Include="src\vr\vr_impl.h" />
+    <ClInclude Include="src\xform_node.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="src\dataset.inl" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff -r 423d4e6728cb -r 9b0db7dbde6e conworlds.vcxproj.filters
--- a/conworlds.vcxproj.filters	Sun Aug 24 09:43:58 2014 +0300
+++ b/conworlds.vcxproj.filters	Sun Aug 24 14:36:00 2014 +0300
@@ -55,6 +55,42 @@
     <ClCompile Include="src\vr\mathutil.c">
       <Filter>src\vr</Filter>
     </ClCompile>
+    <ClCompile Include="src\assload.cc">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="src\gameopt.cc">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="src\geom.cc">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="src\light.cc">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="src\logger.cc">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="src\material.cc">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="src\mesh.cc">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="src\object.cc">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="src\scene.cc">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="src\shader.cc">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="src\unistate.cc">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="src\xform_node.cc">
+      <Filter>src</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\camera.h">
@@ -90,5 +126,49 @@
     <ClInclude Include="src\vr\mathutil.h">
       <Filter>src\vr</Filter>
     </ClInclude>
+    <ClInclude Include="src\assload.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="src\dataset.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="src\gameopt.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="src\geom.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="src\light.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="src\logger.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="src\material.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="src\mesh.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="src\object.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="src\scene.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="src\shader.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="src\unistate.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="src\xform_node.h">
+      <Filter>src</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="src\dataset.inl">
+      <Filter>src</Filter>
+    </None>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff -r 423d4e6728cb -r 9b0db7dbde6e src/game.cc
--- a/src/game.cc	Sun Aug 24 09:43:58 2014 +0300
+++ b/src/game.cc	Sun Aug 24 14:36:00 2014 +0300
@@ -1,3 +1,4 @@
+#include <math.h>
 #include "game.h"
 #include "gameopt.h"
 #include "opengl.h"
@@ -8,6 +9,9 @@
 static void game_render_eye(int eye);
 static void draw_scene();
 static bool setup_rtarg(int x, int y);
+static void draw_box(float sz);
+static void draw_pyramid(float basesz, float height);
+
 
 static Texture *rtarg;
 static unsigned int fbo, rtarg_depth;
@@ -143,9 +147,11 @@
 	if(eye == 0 || !vr_view_matrix(eye < 0 ? 0 : 1, mat)) {
 		glLoadIdentity();
 	} else {
-		glLoadMatrixf(mat);
+		glLoadIdentity();
+		//glLoadMatrixf(mat);
 	}
 	glMultTransposeMatrixf(view_matrix[0]);
+	glMultMatrixf(mat);
 
 	draw_scene();
 }
@@ -258,27 +264,7 @@
 	for(int i=0; i<4; i++) {
 		glPushMatrix();
 		glTranslatef(i & 1 ? -10 : 10, 0, i & 2 ? -10 : 10);
-		glScalef(2.0, 2.0, 2.0);
-
-		glBegin(GL_TRIANGLES);
-		glNormal3f(0, 1, 1);
-		glVertex3f(-1, 0, 1);
-		glVertex3f(1, 0, 1);
-		glVertex3f(0, 1.75, 0);
-		glNormal3f(1, 1, 0);
-		glVertex3f(1, 0, 1);
-		glVertex3f(1, 0, -1);
-		glVertex3f(0, 1.75, 0);
-		glNormal3f(0, 1, -1);
-		glVertex3f(1, 0, -1);
-		glVertex3f(-1, 0, -1);
-		glVertex3f(0, 1.75, 0);
-		glNormal3f(-1, 1, 0);
-		glVertex3f(-1, 0, -1);
-		glVertex3f(-1, 0, 1);
-		glVertex3f(0, 1.75, 0);
-		glEnd();
-
+		draw_pyramid(2.0, 2.0);
 		glPopMatrix();
 	}
 }
@@ -314,3 +300,68 @@
 	printf("created render target %dx%d (texture: %dx%d)\n", x, y, tex_width, tex_height);
 	return true;
 }
+
+static void draw_box(float sz)
+{
+	float hsz = sz / 2.0;
+
+	glBegin(GL_QUADS);
+	glNormal3f(0, 0, 1);
+	glVertex3f(-hsz, -hsz, hsz);
+	glVertex3f(hsz, -hsz, hsz);
+	glVertex3f(hsz, hsz, hsz);
+	glVertex3f(-hsz, hsz, hsz);
+	glNormal3f(1, 0, 0);
+	glVertex3f(hsz, -hsz, hsz);
+	glVertex3f(hsz, -hsz, -hsz);
+	glVertex3f(hsz, hsz, -hsz);
+	glVertex3f(hsz, hsz, hsz);
+	glNormal3f(0, 0, -1);
+	glVertex3f(hsz, -hsz, -hsz);
+	glVertex3f(-hsz, -hsz, -hsz);
+	glVertex3f(-hsz, hsz, -hsz);
+	glVertex3f(hsz, hsz, -hsz);
+	glNormal3f(-1, 0, 0);
+	glVertex3f(-hsz, -hsz, -hsz);
+	glVertex3f(-hsz, -hsz, hsz);
+	glVertex3f(-hsz, hsz, hsz);
+	glVertex3f(-hsz, hsz, -hsz);
+	glNormal3f(0, 1, 0);
+	glVertex3f(-hsz, hsz, hsz);
+	glVertex3f(hsz, hsz, hsz);
+	glVertex3f(hsz, hsz, -hsz);
+	glVertex3f(-hsz, hsz, -hsz);
+	glNormal3f(0, -1, 0);
+	glVertex3f(-hsz, -hsz, -hsz);
+	glVertex3f(hsz, -hsz, -hsz);
+	glVertex3f(hsz, -hsz, hsz);
+	glVertex3f(-hsz, -hsz, hsz);
+	glEnd();
+}
+
+static void draw_pyramid(float basesz, float height)
+{
+	float hsz = basesz / 2.0;
+	float theta = atan(hsz / height);
+	float nx = cos(theta);
+	float ny = sin(theta);
+
+	glBegin(GL_TRIANGLES);
+	glNormal3f(0, ny, nx);
+	glVertex3f(-hsz, 0, hsz);
+	glVertex3f(hsz, 0, hsz);
+	glVertex3f(0, height, 0);
+	glNormal3f(nx, ny, 0);
+	glVertex3f(hsz, 0, hsz);
+	glVertex3f(hsz, 0, -hsz);
+	glVertex3f(0, height, 0);
+	glNormal3f(0, ny, -nx);
+	glVertex3f(hsz, 0, -hsz);
+	glVertex3f(-hsz, 0, -hsz);
+	glVertex3f(0, height, 0);
+	glNormal3f(-nx, ny, 0);
+	glVertex3f(-hsz, 0, -hsz);
+	glVertex3f(-hsz, 0, hsz);
+	glVertex3f(0, height, 0);
+	glEnd();
+}
\ No newline at end of file