goat3dgfx

changeset 17:f2da87b02fcd

fixes mostly visual studio stuff
author John Tsiombikas <nuclear@member.fsf.org>
date Sun, 01 Dec 2013 02:25:29 +0200
parents f61cc1df533c
children 6f82b9b6d6c3
files examples/cubemap/src/main.cc examples/examples.vsprop goat3dgfx.sln goat3dgfx.vcproj src/meshgen.cc
diffstat 5 files changed, 13 insertions(+), 6 deletions(-) [+]
line diff
     1.1 --- a/examples/cubemap/src/main.cc	Sat Nov 30 20:53:26 2013 +0200
     1.2 +++ b/examples/cubemap/src/main.cc	Sun Dec 01 02:25:29 2013 +0200
     1.3 @@ -4,6 +4,8 @@
     1.4  #include <goat3dgfx/goat3dgfx.h>
     1.5  #include <vmath/vmath.h>
     1.6  
     1.7 +using namespace goatgfx;
     1.8 +
     1.9  #define CUBEMAP_FILENAME	"data/cubemap2.jpg"
    1.10  
    1.11  static bool init();
     2.1 --- a/examples/examples.vsprop	Sat Nov 30 20:53:26 2013 +0200
     2.2 +++ b/examples/examples.vsprop	Sun Dec 01 02:25:29 2013 +0200
     2.3 @@ -11,7 +11,7 @@
     2.4  	/>
     2.5  	<Tool
     2.6  		Name="VCLinkerTool"
     2.7 -		AdditionalDependencies="goat3dgfx.lib opengl32.lib glut32.lib glew32.lib libimago2.lib libpng.lib zlib.lib jpeglib.lib libvmath.lib libanim.lib libpsys.lib"
     2.8 +		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"
     2.9  		AdditionalLibraryDirectories="$(SolutionDir)\usr\lib"
    2.10  	/>
    2.11  </VisualStudioPropertySheet>
     3.1 --- a/goat3dgfx.sln	Sat Nov 30 20:53:26 2013 +0200
     3.2 +++ b/goat3dgfx.sln	Sun Dec 01 02:25:29 2013 +0200
     3.3 @@ -8,6 +8,8 @@
     3.4  		{251F8AFF-5A37-4F10-A519-C55C40E127AF} = {251F8AFF-5A37-4F10-A519-C55C40E127AF}
     3.5  	EndProjectSection
     3.6  EndProject
     3.7 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "viewscn", "examples\viewscn\viewscn.vcproj", "{7240C31B-8746-4816-AE13-BF0F75228411}"
     3.8 +EndProject
     3.9  Global
    3.10  	GlobalSection(SolutionConfigurationPlatforms) = preSolution
    3.11  		Debug|Win32 = Debug|Win32
    3.12 @@ -22,6 +24,10 @@
    3.13  		{21606BDB-5E01-45F3-9431-D5F4AF5F2CC0}.Debug|Win32.Build.0 = Debug|Win32
    3.14  		{21606BDB-5E01-45F3-9431-D5F4AF5F2CC0}.Release|Win32.ActiveCfg = Release|Win32
    3.15  		{21606BDB-5E01-45F3-9431-D5F4AF5F2CC0}.Release|Win32.Build.0 = Release|Win32
    3.16 +		{7240C31B-8746-4816-AE13-BF0F75228411}.Debug|Win32.ActiveCfg = Debug|Win32
    3.17 +		{7240C31B-8746-4816-AE13-BF0F75228411}.Debug|Win32.Build.0 = Debug|Win32
    3.18 +		{7240C31B-8746-4816-AE13-BF0F75228411}.Release|Win32.ActiveCfg = Release|Win32
    3.19 +		{7240C31B-8746-4816-AE13-BF0F75228411}.Release|Win32.Build.0 = Release|Win32
    3.20  	EndGlobalSection
    3.21  	GlobalSection(SolutionProperties) = preSolution
    3.22  		HideSolutionNode = FALSE
     4.1 --- a/goat3dgfx.vcproj	Sat Nov 30 20:53:26 2013 +0200
     4.2 +++ b/goat3dgfx.vcproj	Sun Dec 01 02:25:29 2013 +0200
     4.3 @@ -85,7 +85,6 @@
     4.4  			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
     4.5  			IntermediateDirectory="$(ConfigurationName)"
     4.6  			ConfigurationType="4"
     4.7 -			InheritedPropertySheets=".\goat3dgfx.vsprops"
     4.8  			CharacterSet="2"
     4.9  			WholeProgramOptimization="1"
    4.10  			>
     5.1 --- a/src/meshgen.cc	Sat Nov 30 20:53:26 2013 +0200
     5.2 +++ b/src/meshgen.cc	Sun Dec 01 02:25:29 2013 +0200
     5.3 @@ -16,7 +16,7 @@
     5.4  			cos(theta) * sin(phi));
     5.5  }
     5.6  
     5.7 -void gen_sphere(Mesh *mesh, float rad, int usub, int vsub, float urange, float vrange)
     5.8 +void goatgfx::gen_sphere(Mesh *mesh, float rad, int usub, int vsub, float urange, float vrange)
     5.9  {
    5.10  	if(usub < 4) usub = 4;
    5.11  	if(vsub < 2) vsub = 2;
    5.12 @@ -78,7 +78,7 @@
    5.13  	return Vector3(sin(theta), height, cos(theta));
    5.14  }
    5.15  
    5.16 -void gen_cylinder(Mesh *mesh, float rad, float height, int usub, int vsub, int capsub, float urange, float vrange)
    5.17 +void goatgfx::gen_cylinder(Mesh *mesh, float rad, float height, int usub, int vsub, int capsub, float urange, float vrange)
    5.18  {
    5.19  	if(usub < 4) usub = 4;
    5.20  	if(vsub < 1) vsub = 1;
    5.21 @@ -209,7 +209,7 @@
    5.22  	return Vector3(sin(theta) * scale, y, cos(theta) * scale);
    5.23  }
    5.24  
    5.25 -void gen_cone(Mesh *mesh, float rad, float height, int usub, int vsub, int capsub, float urange, float vrange)
    5.26 +void goatgfx::gen_cone(Mesh *mesh, float rad, float height, int usub, int vsub, int capsub, float urange, float vrange)
    5.27  {
    5.28  	if(usub < 4) usub = 4;
    5.29  	if(vsub < 1) vsub = 1;
    5.30 @@ -324,7 +324,7 @@
    5.31  
    5.32  // -------- plane --------
    5.33  
    5.34 -void gen_plane(Mesh *mesh, float width, float height, int usub, int vsub)
    5.35 +void goatgfx::gen_plane(Mesh *mesh, float width, float height, int usub, int vsub)
    5.36  {
    5.37  	if(usub < 1) usub = 1;
    5.38  	if(vsub < 1) vsub = 1;