# HG changeset patch
# User John Tsiombikas <nuclear@member.fsf.org>
# Date 1393719495 -7200
# Node ID 9d581abd0bfb0ce39dfa4ca15a9961aa64ad1718
# Parent  dc5918c62a64fafde557f31f141d5d44a7fe307e# Parent  0b863938da04ecd3b4da49b552ebdba7f3fdfc20
merged

diff -r dc5918c62a64 -r 9d581abd0bfb examples/viewscn/src/main.cc
--- a/examples/viewscn/src/main.cc	Sat Mar 01 22:04:29 2014 +0200
+++ b/examples/viewscn/src/main.cc	Sun Mar 02 02:18:15 2014 +0200
@@ -87,9 +87,9 @@
 
 	//setup_gl_matrices();
 
-	bind_shader(sdr);
+	goatgfx::bind_shader(sdr);
 	scn->draw();
-	bind_shader(0);
+	goatgfx::bind_shader(0);
 
 	/*glBegin(GL_QUADS);
 	glColor3f(1, 1, 1);
diff -r dc5918c62a64 -r 9d581abd0bfb goat3dgfx.sln
--- a/goat3dgfx.sln	Sat Mar 01 22:04:29 2014 +0200
+++ b/goat3dgfx.sln	Sun Mar 02 02:18:15 2014 +0200
@@ -9,6 +9,9 @@
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "viewscn", "examples\viewscn\viewscn.vcproj", "{7240C31B-8746-4816-AE13-BF0F75228411}"
+	ProjectSection(ProjectDependencies) = postProject
+		{251F8AFF-5A37-4F10-A519-C55C40E127AF} = {251F8AFF-5A37-4F10-A519-C55C40E127AF}
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff -r dc5918c62a64 -r 9d581abd0bfb goat3dgfx.vcproj
--- a/goat3dgfx.vcproj	Sat Mar 01 22:04:29 2014 +0200
+++ b/goat3dgfx.vcproj	Sun Mar 02 02:18:15 2014 +0200
@@ -25,6 +25,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				CommandLine="echo #ifndef GOAT3DGFX_CONFIG_H_&gt;$(ProjectDir)\src\config.h&#x0D;&#x0A;echo #define GOAT3DGFX_CONFIG_H_&gt;&gt;$(ProjectDir)\src\config.h&#x0D;&#x0A;echo #define USE_VR&gt;&gt;$(ProjectDir)\src\config.h&#x0D;&#x0A;echo #define USE_LIBOVR&gt;&gt;$(ProjectDir)\src\config.h&#x0D;&#x0A;echo #endif&gt;&gt;$(ProjectDir)\src\config.h&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -41,6 +42,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
+				AdditionalIncludeDirectories="$(SolutionDir)\src"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GOAT3DGFX_EXPORTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -77,7 +79,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="mkdir usr\include\goat3dgfx&#x0D;&#x0A;mkdir usr\lib&#x0D;&#x0A;copy /Y src\*.h usr\include\goat3dgfx\&#x0D;&#x0A;copy /Y src\*.inl usr\include\goat3dgfx\&#x0D;&#x0A;copy /Y $(TargetPath) usr\lib\"
+				CommandLine="mkdir usr\include\goat3dgfx&#x0D;&#x0A;mkdir usr\lib&#x0D;&#x0A;copy /Y src\*.h usr\include\goat3dgfx\&#x0D;&#x0A;copy /Y src\*.inl usr\include\goat3dgfx\&#x0D;&#x0A;copy /Y $(TargetPath) usr\lib\&#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
@@ -90,6 +92,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				CommandLine="echo #ifndef GOAT3DGFX_CONFIG_H_&gt;$(ProjectDir)\src\config.h&#x0D;&#x0A;echo #define GOAT3DGFX_CONFIG_H_&gt;&gt;$(ProjectDir)\src\config.h&#x0D;&#x0A;echo #define USE_VR&gt;&gt;$(ProjectDir)\src\config.h&#x0D;&#x0A;echo #define USE_LIBOVR&gt;&gt;$(ProjectDir)\src\config.h&#x0D;&#x0A;echo #endif&gt;&gt;$(ProjectDir)\src\config.h&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -107,6 +110,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="$(SolutionDir)\src"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GOAT3DGFX_EXPORTS"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -141,6 +145,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
+				CommandLine="mkdir usr\include\goat3dgfx&#x0D;&#x0A;mkdir usr\lib&#x0D;&#x0A;copy /Y src\*.h usr\include\goat3dgfx\&#x0D;&#x0A;copy /Y src\*.inl usr\include\goat3dgfx\&#x0D;&#x0A;copy /Y $(TargetPath) usr\lib\&#x0D;&#x0A;"
 			/>
 		</Configuration>
 	</Configurations>
@@ -149,7 +154,7 @@
 	<Files>
 		<Filter
 			Name="src"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;h;inl"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
@@ -161,113 +166,35 @@
 				>
 			</File>
 			<File
+				RelativePath=".\src\assload.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\camera.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\src\camera.h"
+				>
+			</File>
+			<File
 				RelativePath=".\src\curve.cc"
 				>
 			</File>
 			<File
+				RelativePath=".\src\curve.h"
+				>
+			</File>
+			<File
 				RelativePath=".\src\curveload.cc"
 				>
 			</File>
 			<File
-				RelativePath=".\src\datapath.cc"
+				RelativePath=".\src\curveload.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\geom.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\src\gfxutil.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\src\image.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\src\logger.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\src\material.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\src\mesh.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\src\meshgen.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\src\object.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\src\opengl.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\src\psyspp.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\src\rtarg.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\src\scene.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\src\sdrman.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\src\shader.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\src\texgen.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\src\texman.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\src\texture.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\src\timer.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\src\unistate.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\src\xform_node.cc"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="include"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\src\assload.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\curve.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\curveload.h"
+				RelativePath=".\src\datapath.cc"
 				>
 			</File>
 			<File
@@ -283,85 +210,193 @@
 				>
 			</File>
 			<File
+				RelativePath=".\src\geom.cc"
+				>
+			</File>
+			<File
 				RelativePath=".\src\geom.h"
 				>
 			</File>
 			<File
+				RelativePath=".\src\gfxutil.cc"
+				>
+			</File>
+			<File
 				RelativePath=".\src\gfxutil.h"
 				>
 			</File>
 			<File
+				RelativePath=".\src\goat3dgfx.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\src\goat3dgfx.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\image.cc"
+				>
+			</File>
+			<File
 				RelativePath=".\src\image.h"
 				>
 			</File>
 			<File
+				RelativePath=".\src\logger.cc"
+				>
+			</File>
+			<File
 				RelativePath=".\src\logger.h"
 				>
 			</File>
 			<File
+				RelativePath=".\src\material.cc"
+				>
+			</File>
+			<File
 				RelativePath=".\src\material.h"
 				>
 			</File>
 			<File
+				RelativePath=".\src\mesh.cc"
+				>
+			</File>
+			<File
 				RelativePath=".\src\mesh.h"
 				>
 			</File>
 			<File
+				RelativePath=".\src\meshgen.cc"
+				>
+			</File>
+			<File
 				RelativePath=".\src\meshgen.h"
 				>
 			</File>
 			<File
+				RelativePath=".\src\object.cc"
+				>
+			</File>
+			<File
 				RelativePath=".\src\object.h"
 				>
 			</File>
 			<File
+				RelativePath=".\src\opengl.cc"
+				>
+			</File>
+			<File
 				RelativePath=".\src\opengl.h"
 				>
 			</File>
 			<File
+				RelativePath=".\src\psyspp.cc"
+				>
+			</File>
+			<File
 				RelativePath=".\src\psyspp.h"
 				>
 			</File>
 			<File
+				RelativePath=".\src\rtarg.cc"
+				>
+			</File>
+			<File
 				RelativePath=".\src\rtarg.h"
 				>
 			</File>
 			<File
+				RelativePath=".\src\scene.cc"
+				>
+			</File>
+			<File
 				RelativePath=".\src\scene.h"
 				>
 			</File>
 			<File
+				RelativePath=".\src\sdrman.cc"
+				>
+			</File>
+			<File
 				RelativePath=".\src\sdrman.h"
 				>
 			</File>
 			<File
+				RelativePath=".\src\shader.cc"
+				>
+			</File>
+			<File
 				RelativePath=".\src\shader.h"
 				>
 			</File>
 			<File
+				RelativePath=".\src\texgen.cc"
+				>
+			</File>
+			<File
 				RelativePath=".\src\texgen.h"
 				>
 			</File>
 			<File
+				RelativePath=".\src\texman.cc"
+				>
+			</File>
+			<File
 				RelativePath=".\src\texman.h"
 				>
 			</File>
 			<File
+				RelativePath=".\src\texture.cc"
+				>
+			</File>
+			<File
 				RelativePath=".\src\texture.h"
 				>
 			</File>
 			<File
+				RelativePath=".\src\timer.cc"
+				>
+			</File>
+			<File
 				RelativePath=".\src\timer.h"
 				>
 			</File>
 			<File
+				RelativePath=".\src\unistate.cc"
+				>
+			</File>
+			<File
 				RelativePath=".\src\unistate.h"
 				>
 			</File>
 			<File
+				RelativePath=".\src\vr.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\xform_node.cc"
+				>
+			</File>
+			<File
 				RelativePath=".\src\xform_node.h"
 				>
 			</File>
+			<Filter
+				Name="vr"
+				>
+				<File
+					RelativePath=".\src\vr\vr.cc"
+					>
+				</File>
+				<File
+					RelativePath=".\src\vr\vr_impl.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\vr\vr_sdr.h"
+					>
+				</File>
+			</Filter>
 		</Filter>
 	</Files>
 	<Globals>
diff -r dc5918c62a64 -r 9d581abd0bfb src/scene.cc
--- a/src/scene.cc	Sat Mar 01 22:04:29 2014 +0200
+++ b/src/scene.cc	Sun Mar 02 02:18:15 2014 +0200
@@ -40,6 +40,7 @@
 		return false;
 	}
 
+	// load all the meshes
 	int num_meshes = goat3d_get_mesh_count(goat);
 	for(int i=0; i<num_meshes; i++) {
 		goat3d_mesh *gmesh = goat3d_get_mesh(goat, i);
@@ -49,6 +50,12 @@
 		}
 	}
 
+	// load all the nodes recursively
+	int num_nodes = goat3d_get_node_count(goat);
+	for(int i=0; i<num_nodes; i++) {
+		goat3d_node *gnode = goat3d_get_node(goat, i);
+	}
+
 	goat3d_free(goat);
 	return true;
 }
@@ -64,6 +71,7 @@
 		objects[i]->draw(msec);
 	}
 
+	// if there are no objects in the scene, just draw the meshes instead
 	if(objects.empty()) {
 		for(size_t i=0; i<meshes.size(); i++) {
 			meshes[i]->draw();
diff -r dc5918c62a64 -r 9d581abd0bfb src/scene.h
--- a/src/scene.h	Sat Mar 01 22:04:29 2014 +0200
+++ b/src/scene.h	Sun Mar 02 02:18:15 2014 +0200
@@ -12,6 +12,11 @@
 	std::vector<Object*> objects;
 	std::vector<Mesh*> meshes;
 	std::vector<Curve*> curves;
+	std::vector<Light*> lights;
+	std::vector<Camera*> cameras;
+
+	// nodes can be objects, lights, cameras, or just dummy nodes
+	std::vector<XFormNode*> nodes;
 
 	~Scene();
 	void destroy();
diff -r dc5918c62a64 -r 9d581abd0bfb src/vr/vr.cc
--- a/src/vr/vr.cc	Sat Mar 01 22:04:29 2014 +0200
+++ b/src/vr/vr.cc	Sun Mar 02 02:18:15 2014 +0200
@@ -1,5 +1,11 @@
+#include "config.h"
+
 #include <stdio.h>
+#include <string.h>
+#define _USE_MATH_DEFINES
+#include <math.h>
 #include <GL/glew.h>
+#include "vmath/vmath.h"
 #include "vr.h"
 #include "vr_impl.h"
 #include "vr_sdr.h"
@@ -35,8 +41,10 @@
 extern "C" void vr_shutdown(void)
 {
 	delete [] vr_ctx.info.display;
+#ifdef USE_LIBOVR
 	delete vr_ctx.ovr_sfusion;
 	//System::Destroy();
+#endif
 
 	memset(&vr_ctx, 0, sizeof vr_ctx);
 }
@@ -53,6 +61,7 @@
 
 static bool init_ovr()
 {
+#ifdef USE_LIBOVR
 	LogMaskConstants log_level = LogMask_All;
 	// initialize Oculus SDK
 	const char *logenv = getenv("VR_LOGLEVEL");
@@ -150,6 +159,7 @@
 		vr_ctx.ovr_sfusion = new SensorFusion;
 		vr_ctx.ovr_sfusion->AttachToSensor(vr_ctx.ovr_sensor_dev);
 	}
+#endif	// USE_LIBOVR
 	return true;
 }
 
@@ -289,12 +299,16 @@
 
 extern "C" void vr_set_prediction_sec(float dt)
 {
+#ifdef USE_LIBOVR
 	vr_ctx.ovr_sfusion->SetPrediction(dt);
+#endif
 }
 
 extern "C" float vr_get_prediction_sec(void)
 {
+#ifdef USE_LIBOVR
 	return vr_ctx.ovr_sfusion->GetPredictionDelta();
+#endif
 }
 
 extern "C" void vr_get_view_matrix(float *res, int eye)
@@ -304,12 +318,19 @@
 
 extern "C" void vr_get_proj_matrix(float *res, int eye)
 {
+#ifdef USE_LIBOVR
 	static float eye_scale[] = {0.0, 1.0, -1.0};
 
 	Matrix4f proj = Matrix4f::PerspectiveRH(vr_ctx.info.fov, vr_ctx.info.aspect / 2.0, 0.3, 1000.0);
 	proj = Matrix4f::Translation(vr_ctx.info.proj_center_offset * eye_scale[eye], 0, 0) * proj;
 
 	memcpy(res, proj.M[0], 16 * sizeof(float));
+#else
+	Matrix4x4 proj;
+	proj.set_perspective(vr_ctx.info.fov, vr_ctx.info.aspect, 0.3, 1000.0);
+	proj.transpose();
+	memcpy(res, proj[0], 16 * sizeof(float));
+#endif
 }
 
 extern "C" void vr_get_translation(float *offs)
@@ -320,17 +341,26 @@
 
 extern "C" void vr_get_rotation(float *quat)
 {
+#ifdef USE_LIBOVR
 	Quatf oq = vr_ctx.ovr_sfusion->GetPredictedOrientation();
 	quat[0] = oq.x;
 	quat[1] = oq.y;
 	quat[2] = oq.z;
 	quat[3] = oq.w;
+#else
+	quat[0] = quat[1] = quat[2] = 0.0;
+	quat[3] = 1.0;
+#endif
 }
 
 extern "C" void vr_get_rotation_euler(float *euler)
 {
+#ifdef USE_LIBOVR
 	Quatf oq = vr_ctx.ovr_sfusion->GetPredictedOrientation();
 	oq.GetEulerAngles<Axis_Y, Axis_X, Axis_Z>(euler + 1, euler, euler + 2);
+#else
+	euler[0] = euler[1] = euler[2] = 0.0;
+#endif
 }
 
 extern "C" void vr_draw_eye(int eye, unsigned int tex, float tex_scale_x, float tex_scale_y)
diff -r dc5918c62a64 -r 9d581abd0bfb src/vr/vr_impl.h
--- a/src/vr/vr_impl.h	Sat Mar 01 22:04:29 2014 +0200
+++ b/src/vr/vr_impl.h	Sun Mar 02 02:18:15 2014 +0200
@@ -1,15 +1,21 @@
 #ifndef VR_IMPL_H_
 #define VR_IMPL_H_
 
+#include "config.h"
+
+#ifdef USE_LIBOVR
 #include <OVR.h>
 
 using namespace OVR;
+#endif
 
 struct VRContext {
+#ifdef USE_LIBOVR
 	DeviceManager *ovr_devman;
 	HMDDevice *ovr_hmd_dev;
 	SensorDevice *ovr_sensor_dev;
 	SensorFusion *ovr_sfusion;
+#endif
 
 	struct {
 		char *display;