Changes in / [669c4e6:11a48af] in opengl-game

Files:

• .gitignore (modified) (1 diff)
• OpenGLGame.vcxproj (modified) (6 diffs)
• README.txt (modified) (2 diffs)
• mygame.cpp (modified) (7 diffs)

.gitignore

@@ -8 +8 @@
 .vs/
 *.filters
+include/
+lib/
 Debug/
 Release/

OpenGLGame.vcxproj

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -22 +22 @@
     <ProjectGuid>{592F30FE-3B41-4EE6-A544-23F924C8A1C0}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
+    <WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -27 +28 @@
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -64 +65 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <IncludePath>D:\Visual Studio Projects\include;$(IncludePath)</IncludePath>
-    <LibraryPath>D:\Visual Studio Projects\lib;$(LibraryPath)</LibraryPath>
+    <IncludePath>C:\Users\dportnoy\Desktop\opengl-game\include;D:\Visual Studio Projects\include;$(IncludePath)</IncludePath>
+    <LibraryPath>C:\Users\dportnoy\Desktop\opengl-game\lib;D:\Visual Studio Projects\lib;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -72 +73 @@
     <LibraryPath>D:\Visual Studio Projects\lib;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <IncludePath>C:\Users\dportnoy\Desktop\opengl-game\include;C:\Users\dportnoy\Desktop\opengl-game\include;$(IncludePath)</IncludePath>
+    <LibraryPath>C:\Users\dportnoy\Desktop\opengl-game\lib;C:\Users\dportnoy\Desktop\opengl-game\lib;$(LibraryPath)</LibraryPath>
+  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;GLEW_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
@@ -108 +113 @@
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Link>
+      <AdditionalDependencies>
+      </AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="game.cpp" />
+    <ClCompile Include="common\controls-new.cpp" />
+    <ClCompile Include="common\shader.cpp" />
+    <ClCompile Include="mygame.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

README.txt

@@ -1 @@
-TODO: Make sure the instructions in this README still work and, if not, update them
-
 Installation Instructions for Linux
 ---------------------------------------
@@ -26 +24 @@
 ---------------------------------------
 
-Download the precompiled 32bit binaries of GLFW and GLEW.
-Create /lib and /include folders and add the paths to those folders to the
-VC++ project. Copy the include/GL and include/GLFW folders into your /include
-folder and all the files in the include folders of both libraries into your /lib
-folder. This should be enough to compile and run the project.
+Download the precompiled 32bit binaries of GLFW, GLEW, and glm (a header-only
+library). Create lib/ and include/ folders in the root opengl-game directory
+you cloned. Copy the include/GL/, include/GLFW/, and glm/ folders into your
+include/ folder and all the files in the lib/ folders of the GLFW and GLEW
+libraries into your lib/ folder (glm has no lib/ folder). This should be enough
+to compile and run the project.

mygame.cpp

@@ -1 @@
-// Include standard headers
 #include <stdio.h>
 #include <stdlib.h>
@@ -6 +5 @@
 using namespace std;
 
-// Include GLEW
 #include <GL/glew.h>
 
-// Include GLFW
 #include <GLFW/glfw3.h>
 GLFWwindow* window;
 
-// Include GLM
 #include <glm/glm.hpp>
 #include <glm/gtc/matrix_transform.hpp>
@@ -21 +17 @@
 #include "common/controls.hpp"
 
-int main( void )
-{
-        // Initialise GLFW
-        if( !glfwInit() )
-        {
-                fprintf( stderr, "Failed to initialize GLFW\n" );
+int main(int argc, char* argv[]) {
+        if (!glfwInit()) {
+                cerr << "Failed to initialize GLFW" << endl;;
                 getchar();
                 return -1;
@@ -41 +34 @@
   // Open a window and create its OpenGL context
   window = glfwCreateWindow(mode->width, mode->height, "My Space Game", glfwGetPrimaryMonitor(), NULL);
-        if( window == NULL ){
-                fprintf( stderr, "Failed to open GLFW window. If you have an Intel GPU, they are not 3.3 compatible. Try the 2.1 version of the tutorials.\n" );
+        if (window == NULL) {
+                cerr << "Failed to open GLFW window. If you have an Intel GPU, they are not 3.3 compatible. Try the 2.1 version of the tutorials." << endl;
                 getchar();
                 glfwTerminate();
@@ -53 +46 @@
         glewExperimental = true; // Needed for core profile
         if (glewInit() != GLEW_OK) {
-                fprintf(stderr, "Failed to initialize GLEW\n");
+                cout << "Failed to initialize GLEW\n" << endl;
                 getchar();
                 glfwTerminate();
@@ -221 +214 @@
   do {
 
-    // Clear the screen
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
-    // Use our shader
     glUseProgram(programID);
 
@@ -232 +223 @@
     glm::mat4 Projection = glm::perspective(45.0f, 4.0f / 3.0f, 0.1f, 100.0f);
 
-    // Camera matrix
-    /*
-    glm::mat4 View       = glm::lookAt(
-                                                                glm::vec3(4,3,-3), // Camera is at (4,3,-3), in World Space
-                                                                glm::vec3(0,0,0), // and looks at the origin
-                                                                glm::vec3(0,1,0)  // Head is up (set to 0,-1,0 to look upside-down)
-                                                   );
-    */
     glm::mat4 View = getViewMatrix();