From 3bfa17f584d9b6ad0bcb468c85b815c5046d7250 Mon Sep 17 00:00:00 2001
From: John Tsiombikas <nuclear@mutantstargoat.com>
Date: Wed, 2 Nov 2016 23:36:06 +0200
Subject: [PATCH] initial vc project

---
 .gitignore                      |    4 +
 laserbrain_demo.sln             |   22 ++++++
 laserbrain_demo.vcxproj         |  141 +++++++++++++++++++++++++++++++++
 laserbrain_demo.vcxproj.filters |  165 +++++++++++++++++++++++++++++++++++++++
 src/machine/machine.cc          |    1 +
 src/texture.cc                  |    2 +-
 6 files changed, 334 insertions(+), 1 deletion(-)
 create mode 100644 laserbrain_demo.sln
 create mode 100644 laserbrain_demo.vcxproj
 create mode 100644 laserbrain_demo.vcxproj.filters

diff --git a/.gitignore b/.gitignore
index 6871807..e377c0e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,7 @@
 demo
 data/
 .clang_complete
+*.suo
+*sdf
+Debug/
+Release/
diff --git a/laserbrain_demo.sln b/laserbrain_demo.sln
new file mode 100644
index 0000000..d7ed79f
--- /dev/null
+++ b/laserbrain_demo.sln
@@ -0,0 +1,22 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2013
+VisualStudioVersion = 12.0.40629.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "laserbrain_demo", "laserbrain_demo.vcxproj", "{71A6DAF0-CBF6-4135-BE23-B3999E432EF6}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{71A6DAF0-CBF6-4135-BE23-B3999E432EF6}.Debug|Win32.ActiveCfg = Debug|Win32
+		{71A6DAF0-CBF6-4135-BE23-B3999E432EF6}.Debug|Win32.Build.0 = Debug|Win32
+		{71A6DAF0-CBF6-4135-BE23-B3999E432EF6}.Release|Win32.ActiveCfg = Release|Win32
+		{71A6DAF0-CBF6-4135-BE23-B3999E432EF6}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/laserbrain_demo.vcxproj b/laserbrain_demo.vcxproj
new file mode 100644
index 0000000..65d6e82
--- /dev/null
+++ b/laserbrain_demo.vcxproj
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{71A6DAF0-CBF6-4135-BE23-B3999E432EF6}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>laserbrain_demo</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <DisableSpecificWarnings>4244;4305;4996</DisableSpecificWarnings>
+      <AdditionalIncludeDirectories>$(ProjectDir)\src;$(ProjectDir)\src\machine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>opengl32.lib;freeglut.lib;glew32.lib;libgmath.lib;libvmath.lib;libimago2.lib;zlib.lib;libpng.lib;libjpeg.lib;libresman.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <DisableSpecificWarnings>4244;4305;4996</DisableSpecificWarnings>
+      <AdditionalIncludeDirectories>$(ProjectDir)\src;$(ProjectDir)\src\machine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>opengl32.lib;freeglut.lib;glew32.lib;libgmath.lib;libvmath.lib;libimago2.lib;zlib.lib;libpng.lib;libjpeg.lib;libresman.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="src\app.cc" />
+    <ClCompile Include="src\datamap.cc" />
+    <ClCompile Include="src\geom.cc" />
+    <ClCompile Include="src\image.cc" />
+    <ClCompile Include="src\machine\gear.cc" />
+    <ClCompile Include="src\machine\machine.cc" />
+    <ClCompile Include="src\machine\mparser.cc" />
+    <ClCompile Include="src\main.cc" />
+    <ClCompile Include="src\material.cc" />
+    <ClCompile Include="src\mesh.cc" />
+    <ClCompile Include="src\meshgen.cc" />
+    <ClCompile Include="src\object.cc" />
+    <ClCompile Include="src\objmesh.cc" />
+    <ClCompile Include="src\scene.cc" />
+    <ClCompile Include="src\sceneload.cc" />
+    <ClCompile Include="src\sdr.c" />
+    <ClCompile Include="src\shadow.cc" />
+    <ClCompile Include="src\snode.cc" />
+    <ClCompile Include="src\texture.cc" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="src\app.h" />
+    <ClInclude Include="src\datamap.h" />
+    <ClInclude Include="src\dataset.h" />
+    <ClInclude Include="src\exhibit.h" />
+    <ClInclude Include="src\geom.h" />
+    <ClInclude Include="src\image.h" />
+    <ClInclude Include="src\machine\gear.h" />
+    <ClInclude Include="src\machine\machine.h" />
+    <ClInclude Include="src\machine\mparser.h" />
+    <ClInclude Include="src\material.h" />
+    <ClInclude Include="src\mech_exhibit.h" />
+    <ClInclude Include="src\mesh.h" />
+    <ClInclude Include="src\meshgen.h" />
+    <ClInclude Include="src\object.h" />
+    <ClInclude Include="src\objmesh.h" />
+    <ClInclude Include="src\opengl.h" />
+    <ClInclude Include="src\scene.h" />
+    <ClInclude Include="src\sceneload.h" />
+    <ClInclude Include="src\sdr.h" />
+    <ClInclude Include="src\shadow.h" />
+    <ClInclude Include="src\snode.h" />
+    <ClInclude Include="src\texture.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="sdr\shadow-notex.p.glsl" />
+    <None Include="sdr\shadow.v.glsl" />
+    <None Include="sdr\skydome.p.glsl" />
+    <None Include="sdr\skydome.v.glsl" />
+    <None Include="sdr\test.p.glsl" />
+    <None Include="sdr\test.v.glsl" />
+    <None Include="src\dataset.inl" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/laserbrain_demo.vcxproj.filters b/laserbrain_demo.vcxproj.filters
new file mode 100644
index 0000000..43d5a0d
--- /dev/null
+++ b/laserbrain_demo.vcxproj.filters
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="src">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;h</Extensions>
+    </Filter>
+    <Filter Include="src\machine">
+      <UniqueIdentifier>{b07e85b5-1bef-4321-9140-79e9c1b6de3d}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="sdr">
+      <UniqueIdentifier>{8e6a8961-784c-4356-9074-885fb1660b86}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="src\app.cc">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="src\datamap.cc">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="src\geom.cc">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="src\image.cc">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="src\main.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\meshgen.cc">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="src\object.cc">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="src\objmesh.cc">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="src\scene.cc">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="src\sceneload.cc">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="src\sdr.c">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="src\shadow.cc">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="src\snode.cc">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="src\texture.cc">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="src\machine\gear.cc">
+      <Filter>src\machine</Filter>
+    </ClCompile>
+    <ClCompile Include="src\machine\machine.cc">
+      <Filter>src\machine</Filter>
+    </ClCompile>
+    <ClCompile Include="src\machine\mparser.cc">
+      <Filter>src\machine</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="src\app.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="src\datamap.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="src\dataset.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="src\exhibit.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="src\geom.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="src\image.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="src\material.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="src\mech_exhibit.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="src\mesh.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="src\meshgen.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="src\object.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="src\objmesh.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="src\opengl.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="src\scene.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="src\sceneload.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="src\sdr.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="src\shadow.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="src\snode.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="src\texture.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="src\machine\gear.h">
+      <Filter>src\machine</Filter>
+    </ClInclude>
+    <ClInclude Include="src\machine\machine.h">
+      <Filter>src\machine</Filter>
+    </ClInclude>
+    <ClInclude Include="src\machine\mparser.h">
+      <Filter>src\machine</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="src\dataset.inl">
+      <Filter>src</Filter>
+    </None>
+    <None Include="sdr\shadow.v.glsl">
+      <Filter>sdr</Filter>
+    </None>
+    <None Include="sdr\shadow-notex.p.glsl">
+      <Filter>sdr</Filter>
+    </None>
+    <None Include="sdr\skydome.p.glsl">
+      <Filter>sdr</Filter>
+    </None>
+    <None Include="sdr\skydome.v.glsl">
+      <Filter>sdr</Filter>
+    </None>
+    <None Include="sdr\test.p.glsl">
+      <Filter>sdr</Filter>
+    </None>
+    <None Include="sdr\test.v.glsl">
+      <Filter>sdr</Filter>
+    </None>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/machine/machine.cc b/src/machine/machine.cc
index 441826e..191fe2f 100644
--- a/src/machine/machine.cc
+++ b/src/machine/machine.cc
@@ -3,6 +3,7 @@
 #include <math.h>
 #include <float.h>
 #include <assert.h>
+#include <algorithm>
 #include "opengl.h"
 #include "machine.h"
 
diff --git a/src/texture.cc b/src/texture.cc
index 5bf291d..45f9094 100644
--- a/src/texture.cc
+++ b/src/texture.cc
@@ -459,7 +459,7 @@ TextureSet::TextureSet()
 
 Texture *TextureSet::get_texture(const char *name, TextureType type) const
 {
-	typename std::map<std::string, Texture*>::const_iterator iter = data.find(name);
+	std::map<std::string, Texture*>::const_iterator iter = data.find(name);
 	if(iter != data.end()) {
 		return iter->second;
 	}
-- 
1.7.10.4