Commits

CSBerger committed a418c6c

Now working with visual studio 2012

  • Participants
  • Parent commits bb81dd1

Comments (0)

Files changed (9)

     exit(0);
     return 0;
   default:
-    return Fl_Gl_Window::handle(ev);
+	return Fl_Gl_Window::handle(ev);
     break;
     //	return Fl_Gl_Window::handle(ev);
   }
         int axis, device;
         axis= std::atoi(axis_num.c_str());
         device = std::atoi(device_num.c_str());
-        std::pair<int, int> p = std::make_pair<int, int>(device,axis);
+        std::pair<int, int> p = std::make_pair(device,axis);
         inputAxisMapToDeviceAndDeviceAxis[action] = p;
     }
 }
   <ImportGroup Label="PropertySheets" />
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <LibraryPath>D:\Libraries\protobuf-2.4.1\vsprojects\Release;D:\boost\boost_1_47\lib;C:\Users\Chris\Home\libs\fltk-1.1.10\lib;D:\Libraries\glfw;D:\Libraries\ftgl-2.1.3~rc5\msvc\Build;D:\Libraries\soil\Simple OpenGL Image Library\lib;$(LibraryPath)</LibraryPath>
+    <LibraryPath>D:\Libraries\protobuf-2.4.1\vsprojects\Release;D:\boost\boost_1_53_0\stage\lib;C:\Users\Chris\Home\libs\fltk-1.1.10\lib;D:\Libraries\glfw;D:\Libraries\ftgl-2.1.3~rc5\msvc\Build;D:\Libraries\soil\Simple OpenGL Image Library\lib;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <Link>
-      <AdditionalDependencies>libprotobuf.lib;ftgl.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;opengl32.lib;glu32.lib;fltkd.lib;fltkgld.lib;fltkimagesd.lib;fltkjpegd.lib;fltkpngd.lib;fltkzd.lib;wsock32.lib;comctl32.lib;glfw.lib;FreeImage.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>libprotobuf.lib;ftgl_static.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;opengl32.lib;glu32.lib;wsock32.lib;comctl32.lib;glfw.lib;FreeImage.lib;freetype240MT.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>C:\Users\Chris\Documents\Projects\New folder %282%29\external_libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
     <ClCompile>
       <DisableSpecificWarnings>
       </DisableSpecificWarnings>
-      <AdditionalIncludeDirectories>D:\Libraries\freetype-2.3.5-1-bin\include;D:\Libraries\freetype-2.3.5-1-bin\include\freetype2;C:\Users\Chris\Home\libs\fltk-1.1.10;D:\Libraries\ftgl-2.1.3~rc5\src;D:\boost\boost_1_47;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>D:\Libraries\freetype-2.4.0\include;C:\Users\Chris\Home\libs\fltk-1.1.10;D:\Libraries\ftgl-2.1.3~rc5\src;C:\Users\Chris\Documents\Projects\New folder %282%29\external_libs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup />
 		("resolutionY", po::value<int>()->default_value(600), "set Y resolution")
 		("resolutionX", po::value<int>()->default_value(800), "set X resolution")
 		("startupScreen", po::value<bool>()->default_value(true), "show startup screen")
+		("fullscreen", po::value<bool>()->default_value(true), "fullscreen mode")
 		;
 	po::store(
 		po::parse_config_file<char>(INIT_FILE_NAME, desc, false)
 	int res_x = vm["resolutionX"].as<int>();
 	int res_y = vm["resolutionY"].as<int>();
 	bool startup = vm["startupScreen"].as<bool>();
+	bool fullscreen = vm["fullscreen"].as<bool>();
 	LOGMSG(11, "%s", startup?"true":"false");
 #else
     int res_x = 800;
     int res_y = 600;
     bool startup = true;
+bool fullscreen = true;
 #endif
 	glfwInit();
-    glfwOpenWindowHint(GLFW_WINDOW_NO_RESIZE, GL_TRUE);
-	if (!glfwOpenWindow(res_x, res_y, 8, 8, 8, 8, 8, 8, GLFW_WINDOW)) {
+    unsigned int fullscreen_flag = fullscreen ? GLFW_FULLSCREEN: GLFW_WINDOW;	
+	if (fullscreen) {
+		glfwOpenWindowHint(GLFW_FULLSCREEN, GL_TRUE);
+	}
+	else {
+		glfwOpenWindowHint(GLFW_WINDOW_NO_RESIZE, GL_TRUE);
+	}
+	if (!glfwOpenWindow(res_x, res_y, 8, 8, 8, 8, 8, 8, fullscreen_flag)) {
         glfwTerminate();
     }
 	glfwSetWindowPos(350, 150);
     glfwTerminate();
     exit(0);
 }
+
 
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nightspace", "nightspace.vcxproj", "{64D13D5E-A050-47DA-AC07-59995073D0DC}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{0B3C5835-FF04-42FF-95DF-58588FB63766}"
-	ProjectSection(SolutionItems) = preProject
-		bindings.txt = bindings.txt
-		settings.ini = settings.ini
-		TextFile2.txt = TextFile2.txt
-	EndProjectSection
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
 		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{64D13D5E-A050-47DA-AC07-59995073D0DC}.Debug|Win32.ActiveCfg = Debug|Win32
 		{64D13D5E-A050-47DA-AC07-59995073D0DC}.Debug|Win32.Build.0 = Debug|Win32
+		{64D13D5E-A050-47DA-AC07-59995073D0DC}.Debug|x64.ActiveCfg = Debug|x64
+		{64D13D5E-A050-47DA-AC07-59995073D0DC}.Debug|x64.Build.0 = Debug|x64
 		{64D13D5E-A050-47DA-AC07-59995073D0DC}.Release|Win32.ActiveCfg = Release|Win32
 		{64D13D5E-A050-47DA-AC07-59995073D0DC}.Release|Win32.Build.0 = Release|Win32
+		{64D13D5E-A050-47DA-AC07-59995073D0DC}.Release|x64.ActiveCfg = Release|x64
+		{64D13D5E-A050-47DA-AC07-59995073D0DC}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		AMDCaProjectFile = C:\Users\Chris\Documents\Projects\Nightspace\CodeAnalyst\nightspace.caw
-		AMDCaPersistentStartup = nightspace
-		AMDCaPersistentConfig = Debug|Win32
-	EndGlobalSection
 EndGlobal

nightspace.suo

Binary file modified.

nightspace.vcxproj

       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{64D13D5E-A050-47DA-AC07-59995073D0DC}</ProjectGuid>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="libs.props" />
-    <Import Project="new_Prop.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="libs.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="new_Prop.props" />
-    <Import Project="debug_libs.props" />
+    <Import Project="libs.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="libs.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LibraryPath>D:\boost\boost_1_53_0\stage\lib;$(LibraryPath)</LibraryPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LibraryPath>D:\boost\boost_1_53_0\stage\lib;$(LibraryPath)</LibraryPath>
+  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>opengl32.lib;glu32.lib;wsock32.lib;comctl32.lib;ftgl.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>C:\Python26\libs;C:\FLTK\lib;G:\src\Python-2.6.1\PC\VS8.0\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>C:\Python26\include;C:\FLTK;C:\Chris\ftgl-2.1.3~rc5\msvc\vc8\Release;C:\OGLSDK\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>GLEW_STATIC;USE_GLEW;_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>opengl32.lib;glu32.lib;wsock32.lib;comctl32.lib;ftgl.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>C:\Python26\libs;C:\FLTK\lib;G:\src\Python-2.6.1\PC\VS8.0\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>C:\FLTK;C:\Python26\include;C:\OGLSDK\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>GLEW_STATIC;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>opengl32.lib;glu32.lib;fltk.lib;fltkgl.lib;wsock32.lib;comctl32.lib;python26.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>C:\Python26\libs;C:\FLTK\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>C:\FLTK;C:\Python26\include;C:\OGLSDK\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
     </ClCompile>
     <Link>
     <ClCompile Include="menu.cpp" />
     <ClCompile Include="MenuItemStyle.cpp" />
     <ClCompile Include="mesh.cpp" />
-    <ClCompile Include="Messages\gamestate.pb.cc" />
     <ClCompile Include="openGlRenderer.cpp" />
     <ClCompile Include="perception.cpp" />
     <ClCompile Include="PlayerNameHUD.cpp" />
     <ClCompile Include="SingleLogger.cpp" />
     <ClCompile Include="SpeedBarHUD.cpp" />
     <ClCompile Include="textureLoader.cpp" />
-    <ClCompile Include="trigger.cpp" />
     <ClCompile Include="util.cpp" />
     <ClCompile Include="vec.cpp" />
     <ClCompile Include="dummyController.cpp" />
     <ClInclude Include="GLGraphicsFont.h" />
     <ClInclude Include="glshadermanager.h" />
     <ClInclude Include="GLTextureManager.h" />
-    <ClInclude Include="GL\glfw.h" />
+    <ClInclude Include="GLWindow.h" />
     <ClInclude Include="GraphicsFont.h" />
     <ClInclude Include="gui.h" />
     <ClInclude Include="gunshot.h" />
     <ClInclude Include="menu.h" />
     <ClInclude Include="MenuItemStyle.h" />
     <ClInclude Include="mesh.h" />
-    <ClInclude Include="Messages\gamestate.pb.h" />
-    <ClInclude Include="openGlRenderer.h" />
     <ClInclude Include="perception.h" />
     <ClInclude Include="playerController.h" />
     <ClInclude Include="PlayerNameHUD.h" />
+    <ClInclude Include="pugiconfig.hpp" />
     <ClInclude Include="pugixml.hpp" />
     <ClInclude Include="renderer.h" />
     <ClInclude Include="resource.h" />
     <ClInclude Include="simulator.h" />
     <ClInclude Include="SingleLogger.h" />
     <ClInclude Include="SpeedBarHUD.h" />
-    <ClInclude Include="trigger.h" />
     <ClInclude Include="util.h" />
     <ClInclude Include="vec.h" />
     <ClInclude Include="wglew.h" />
     <ResourceCompile Include="nightspace.rc" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\Nightspace\libs.props">
-      <SubType>Designer</SubType>
-    </None>
-    <None Include="..\Nightspace\new_Prop.props">
-      <SubType>Designer</SubType>
-    </None>
     <None Include="art\SKYBOXFRONT.bmp" />
-    <None Include="ClassDiagram1.cd" />
     <None Include="gouraud.frag" />
     <None Include="gouraud.vert" />
     <None Include="phong.frag" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-  <ProjectExtensions>
-    <VisualStudio>
-      <UserProperties RESOURCE_FILE="nightspace.rc" />
-    </VisualStudio>
-  </ProjectExtensions>
 </Project>

nightspace.vcxproj.filters

       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
     </Filter>
     <Filter Include="Shaders">
-      <UniqueIdentifier>{4f49281f-552f-4b39-a35f-9dfa81a46e17}</UniqueIdentifier>
+      <UniqueIdentifier>{c70465e2-94ac-464d-a701-ab41e6a253c1}</UniqueIdentifier>
       <Extensions>*.frag *.vert</Extensions>
     </Filter>
     <Filter Include="Controllers">
-      <UniqueIdentifier>{08eb947a-b271-4b3e-b395-ba79a49e7787}</UniqueIdentifier>
+      <UniqueIdentifier>{f5239348-dfbb-43fd-81fd-ec84e793312a}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="main.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="menu.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="mesh.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="playerController.cpp">
       <Filter>Controllers</Filter>
     </ClCompile>
+    <ClCompile Include="pugixml.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="MenuItemStyle.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="MainMenuScreen.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="InputHandler.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="Banner.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="FTGLFontManager.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="GLTextureManager.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="GLGraphicsFont.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="GraphicsFont.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="HudElement.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="PlayerNameHUD.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="GraphicsFont.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="GLGraphicsFont.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="FTGLFontManager.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="SpeedBarHUD.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="pugixml.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="SingleLogger.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="menu.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="MainMenuScreen.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="GLTextureManager.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="MenuItemStyle.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Banner.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Messages\gamestate.pb.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="trigger.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="action.h">
     <ClInclude Include="glshadermanager.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="GLWindow.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="gui.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="gunshot.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="menu.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="mesh.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="dummyController.h">
       <Filter>Controllers</Filter>
     </ClInclude>
-    <ClInclude Include="GL\glfw.h">
+    <ClInclude Include="pugixml.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="pugiconfig.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="MenuItemStyle.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="MainMenuScreen.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="InputHandler.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="Banner.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="FTGLFontManager.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="FreeImage.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="GLTextureManager.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="GLGraphicsFont.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="GraphicsFont.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="HudElement.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="PlayerNameHUD.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="GraphicsFont.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="GLGraphicsFont.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="FTGLFontManager.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="SpeedBarHUD.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="pugixml.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="SingleLogger.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="FreeImage.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="menu.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="MainMenuScreen.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="GLTextureManager.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="MenuItemStyle.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="openGlRenderer.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Banner.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Messages\gamestate.pb.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="trigger.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="nightspace.rc">
     <None Include="mission1.txt" />
     <None Include="mwing.txt" />
     <None Include="TODO.txt" />
-    <None Include="..\Nightspace\new_Prop.props" />
-    <None Include="..\Nightspace\libs.props" />
-    <None Include="ClassDiagram1.cd" />
   </ItemGroup>
 </Project>
 compression=10
-resolutionX=800
-resolutionY=600
+resolutionX=1980
+resolutionY=1080
 startupScreen=false
+fullscreen=true