# HG changeset patch
# User John Tsiombikas <nuclear@member.fsf.org>
# Date 1385857529 -7200
# Node ID f2da87b02fcd529cf527af69cb64a1e2edaa2b74
# Parent  f61cc1df533c92b66ce1ad5e487d7436dba0289e
fixes mostly visual studio stuff

diff -r f61cc1df533c -r f2da87b02fcd examples/cubemap/src/main.cc
--- a/examples/cubemap/src/main.cc	Sat Nov 30 20:53:26 2013 +0200
+++ b/examples/cubemap/src/main.cc	Sun Dec 01 02:25:29 2013 +0200
@@ -4,6 +4,8 @@
 #include <goat3dgfx/goat3dgfx.h>
 #include <vmath/vmath.h>
 
+using namespace goatgfx;
+
 #define CUBEMAP_FILENAME	"data/cubemap2.jpg"
 
 static bool init();
diff -r f61cc1df533c -r f2da87b02fcd examples/examples.vsprop
--- a/examples/examples.vsprop	Sat Nov 30 20:53:26 2013 +0200
+++ b/examples/examples.vsprop	Sun Dec 01 02:25:29 2013 +0200
@@ -11,7 +11,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="goat3dgfx.lib opengl32.lib glut32.lib glew32.lib libimago2.lib libpng.lib zlib.lib jpeglib.lib libvmath.lib libanim.lib libpsys.lib"
+		AdditionalDependencies="goat3dgfx.lib opengl32.lib glut32.lib glew32.lib libimago2.lib libpng.lib zlib.lib jpeglib.lib libvmath.lib libanim.lib libpsys.lib goat3d.lib"
 		AdditionalLibraryDirectories="$(SolutionDir)\usr\lib"
 	/>
 </VisualStudioPropertySheet>
diff -r f61cc1df533c -r f2da87b02fcd goat3dgfx.sln
--- a/goat3dgfx.sln	Sat Nov 30 20:53:26 2013 +0200
+++ b/goat3dgfx.sln	Sun Dec 01 02:25:29 2013 +0200
@@ -8,6 +8,8 @@
 		{251F8AFF-5A37-4F10-A519-C55C40E127AF} = {251F8AFF-5A37-4F10-A519-C55C40E127AF}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "viewscn", "examples\viewscn\viewscn.vcproj", "{7240C31B-8746-4816-AE13-BF0F75228411}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -22,6 +24,10 @@
 		{21606BDB-5E01-45F3-9431-D5F4AF5F2CC0}.Debug|Win32.Build.0 = Debug|Win32
 		{21606BDB-5E01-45F3-9431-D5F4AF5F2CC0}.Release|Win32.ActiveCfg = Release|Win32
 		{21606BDB-5E01-45F3-9431-D5F4AF5F2CC0}.Release|Win32.Build.0 = Release|Win32
+		{7240C31B-8746-4816-AE13-BF0F75228411}.Debug|Win32.ActiveCfg = Debug|Win32
+		{7240C31B-8746-4816-AE13-BF0F75228411}.Debug|Win32.Build.0 = Debug|Win32
+		{7240C31B-8746-4816-AE13-BF0F75228411}.Release|Win32.ActiveCfg = Release|Win32
+		{7240C31B-8746-4816-AE13-BF0F75228411}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff -r f61cc1df533c -r f2da87b02fcd goat3dgfx.vcproj
--- a/goat3dgfx.vcproj	Sat Nov 30 20:53:26 2013 +0200
+++ b/goat3dgfx.vcproj	Sun Dec 01 02:25:29 2013 +0200
@@ -85,7 +85,6 @@
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="4"
-			InheritedPropertySheets=".\goat3dgfx.vsprops"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
 			>
diff -r f61cc1df533c -r f2da87b02fcd src/meshgen.cc
--- a/src/meshgen.cc	Sat Nov 30 20:53:26 2013 +0200
+++ b/src/meshgen.cc	Sun Dec 01 02:25:29 2013 +0200
@@ -16,7 +16,7 @@
 			cos(theta) * sin(phi));
 }
 
-void gen_sphere(Mesh *mesh, float rad, int usub, int vsub, float urange, float vrange)
+void goatgfx::gen_sphere(Mesh *mesh, float rad, int usub, int vsub, float urange, float vrange)
 {
 	if(usub < 4) usub = 4;
 	if(vsub < 2) vsub = 2;
@@ -78,7 +78,7 @@
 	return Vector3(sin(theta), height, cos(theta));
 }
 
-void gen_cylinder(Mesh *mesh, float rad, float height, int usub, int vsub, int capsub, float urange, float vrange)
+void goatgfx::gen_cylinder(Mesh *mesh, float rad, float height, int usub, int vsub, int capsub, float urange, float vrange)
 {
 	if(usub < 4) usub = 4;
 	if(vsub < 1) vsub = 1;
@@ -209,7 +209,7 @@
 	return Vector3(sin(theta) * scale, y, cos(theta) * scale);
 }
 
-void gen_cone(Mesh *mesh, float rad, float height, int usub, int vsub, int capsub, float urange, float vrange)
+void goatgfx::gen_cone(Mesh *mesh, float rad, float height, int usub, int vsub, int capsub, float urange, float vrange)
 {
 	if(usub < 4) usub = 4;
 	if(vsub < 1) vsub = 1;
@@ -324,7 +324,7 @@
 
 // -------- plane --------
 
-void gen_plane(Mesh *mesh, float width, float height, int usub, int vsub)
+void goatgfx::gen_plane(Mesh *mesh, float width, float height, int usub, int vsub)
 {
 	if(usub < 1) usub = 1;
 	if(vsub < 1) vsub = 1;