# HG changeset patch
# User John Tsiombikas <nuclear@member.fsf.org>
# Date 1412383319 -10800
# Node ID 0168104ec5683027b88df7a011218e0a113f42aa
# Parent  cb97ea43709b2bc2fdb60d22b78227ebe33e2fd2
- added new files to the vs project
- fixed bug caused by LibOVR's failure to restore OpenGL state

diff -r cb97ea43709b -r 0168104ec568 src/game.cc
--- a/src/game.cc	Fri Oct 03 23:11:43 2014 +0300
+++ b/src/game.cc	Sat Oct 04 03:41:59 2014 +0300
@@ -291,8 +291,7 @@
 
 	glMatrixMode(GL_MODELVIEW);
 
-	/*
-	glBindTexture(GL_TEXTURE_2D, chess_tex);
+	/*glBindTexture(GL_TEXTURE_2D, chess_tex);
 	glEnable(GL_TEXTURE_2D);
 	material(1, 1, 1, 1);
 	glBegin(GL_QUADS);
@@ -303,9 +302,8 @@
 	glTexCoord2f(0, 1); glVertex3f(-10, 0, -10);
 	glEnd();
 	glDisable(GL_TEXTURE_2D);
-	*/
 
-	/*material(1, 1, 1, 0.4);
+	material(1, 1, 1, 0.4);
 	glPushMatrix();
 	glTranslatef(0, 1.3, -10);
 	glFrontFace(GL_CW);
@@ -313,6 +311,9 @@
 	glFrontFace(GL_CCW);
 	glPopMatrix();*/
 
+	glBindBuffer(GL_ARRAY_BUFFER, 0);
+	glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
+
 	for(size_t i=0; i<scn.obj.size(); i++) {
 		scn.obj[i]->draw();
 	}
diff -r cb97ea43709b -r 0168104ec568 vrheights.sln
--- a/vrheights.sln	Fri Oct 03 23:11:43 2014 +0300
+++ b/vrheights.sln	Sat Oct 04 03:41:59 2014 +0300
@@ -19,4 +19,7 @@
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(Performance) = preSolution
+		HasPerformanceSessions = true
+	EndGlobalSection
 EndGlobal
diff -r cb97ea43709b -r 0168104ec568 vrheights.vcxproj
--- a/vrheights.vcxproj	Fri Oct 03 23:11:43 2014 +0300
+++ b/vrheights.vcxproj	Sat Oct 04 03:41:59 2014 +0300
@@ -57,7 +57,7 @@
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>SDL2.lib;SDL2main.lib;opengl32.lib;glu32.lib;glew32.lib;libgoatvr.lib;libvmath.lib;libdrawtext.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>SDL2.lib;SDL2main.lib;opengl32.lib;glu32.lib;glew32.lib;libgoatvr.lib;libvmath.lib;libimago2d.lib;libdrawtext.lib;goat3d.lib;zlib.lib;libpng.lib;jpeglib.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -76,7 +76,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>SDL2.lib;SDL2main.lib;opengl32.lib;glu32.lib;glew32.lib;libgoatvr.lib;libvmath.lib;libdrawtext.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>SDL2.lib;SDL2main.lib;opengl32.lib;glu32.lib;glew32.lib;libgoatvr.lib;libvmath.lib;libimago2.lib;libdrawtext.lib;goat3d.lib;zlib.lib;libpng.lib;jpeglib.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -85,17 +85,27 @@
     <ClCompile Include="src\game.cc" />
     <ClCompile Include="src\game_var.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\scenefile.cc" />
     <ClCompile Include="src\teapot.c" />
+    <ClCompile Include="src\texman.cc" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\bezmath.h" />
     <ClInclude Include="src\console.h" />
     <ClInclude Include="src\game.h" />
     <ClInclude Include="src\game_var.h" />
+    <ClInclude Include="src\material.h" />
+    <ClInclude Include="src\mesh.h" />
+    <ClInclude Include="src\object.h" />
     <ClInclude Include="src\opengl.h" />
+    <ClInclude Include="src\scenefile.h" />
     <ClInclude Include="src\teapot.h" />
     <ClInclude Include="src\teapot_data.h" />
+    <ClInclude Include="src\texman.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff -r cb97ea43709b -r 0168104ec568 vrheights.vcxproj.filters
--- a/vrheights.vcxproj.filters	Fri Oct 03 23:11:43 2014 +0300
+++ b/vrheights.vcxproj.filters	Sat Oct 04 03:41:59 2014 +0300
@@ -28,6 +28,21 @@
     <ClCompile Include="src\game_var.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\scenefile.cc">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="src\texman.cc">
+      <Filter>src</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\game.h">
@@ -51,5 +66,20 @@
     <ClInclude Include="src\game_var.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\scenefile.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="src\texman.h">
+      <Filter>src</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file