Changeset a9e808e in network-game

Timestamp:

May 17, 2014, 6:55:01 PM (10 years ago)

Author:

Dmitry Portnoy <dmp1488@…>

Branches:

master

Children:

883bb5d

Parents:

95d7add (diff), af116c0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of github.com:weretaco/network-game

Files:

• client/Client/main.cpp (modified) (1 diff)
• client/makefile (modified) (1 diff)
• graphics_library/TextureFragmentShader.fragmentshader (added)
• graphics_library/TransformVertexShader.vertexshader (added)
• graphics_library/common/controls.cpp (added)
• graphics_library/common/controls.hpp (added)
• graphics_library/common/shader.cpp (added)
• graphics_library/common/shader.hpp (added)
• graphics_library/common/texture.cpp (added)
• graphics_library/common/texture.hpp (added)
• graphics_library/main.cpp (modified) (4 diffs)
• graphics_library/makefile (modified) (2 diffs)
• graphics_library/uvtemplate.DDS (added)

client/Client/main.cpp

@@ -263 +263 @@
    {
       ALLEGRO_EVENT ev;
-      
+
       al_wait_for_event(event_queue, &ev);
 
       if(wndCurrent->handleEvent(ev)) {
+         cout << "Processed gui event: " << getCurrentMillis() << endl;
          // do nothing
       }

client/makefile

@@ -36 +36 @@
 
 clean:
-        rm *.o
-        rm gameClient
+        rm -f *.o
+        rm -f gameClient

graphics_library/main.cpp

@@ -7 +7 @@
 
 // Include GLFW
-#include <GL/glfw.h>
+#include <GLFW/glfw3.h>
+GLFWwindow* window;
 
 // Include GLM
@@ -27 +28 @@
         }
 
-        glfwOpenWindowHint(GLFW_FSAA_SAMPLES, 4);
-        glfwOpenWindowHint(GLFW_OPENGL_VERSION_MAJOR, 3);
-        glfwOpenWindowHint(GLFW_OPENGL_VERSION_MINOR, 3);
-        glfwOpenWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
+        glfwWindowHint(GLFW_SAMPLES, 4);
+        glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
+        glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 3);
+        glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
 
         // Open a window and create its OpenGL context
-        if( !glfwOpenWindow( 1024, 768, 0,0,0,0, 32,0, GLFW_WINDOW ) )
-        {
+        window = glfwCreateWindow( 1024, 768, "Tutorial 0 - Keyboard and Mouse", NULL, 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" );
                 glfwTerminate();
                 return -1;
         }
+        glfwMakeContextCurrent(window);
 
         // Initialize GLEW
@@ -47 +49 @@
         }
 
-        glfwSetWindowTitle( "Tutorial 06" );
-
         // Ensure we can capture the escape key being pressed below
-        glfwEnable( GLFW_STICKY_KEYS );
-        glfwSetMousePos(1024/2, 768/2);
+        glfwSetInputMode(window, GLFW_STICKY_KEYS, GL_TRUE);
+        glfwSetCursorPos(window, 1024/2, 768/2);
 
         // Dark blue background
@@ -227 +227 @@
 
                 // Swap buffers
-                glfwSwapBuffers();
+                glfwSwapBuffers(window);
+                glfwPollEvents();
 
         } // Check if the ESC key was pressed or the window was closed
-        while( glfwGetKey( GLFW_KEY_ESC ) != GLFW_PRESS &&
-                   glfwGetWindowParam( GLFW_OPENED ) );
+        while( glfwGetKey(window, GLFW_KEY_ESCAPE ) != GLFW_PRESS &&
+                   glfwWindowShouldClose(window) == 0 );
 
         // Cleanup VBO and shader

graphics_library/makefile

@@ -1 +1 @@
 CC = g++
-LIB_FLAGS = -lGL -lglut -lGLEW -lglfw
+LIB_FLAGS = -lGL -lglut -lGLEW `pkg-config glfw3 --static --cflags --libs`
 FLAGS = -Wall
-DEPENDENCIES =
+DEPENDENCIES = common/texture.o common/controls.o common/shader.o
 
 graphics_engine : main.cpp $(DEPENDENCIES)
@@ -11 +11 @@
 
 clean:
-        rm graphics_engine
-        rm *.o
+        rm -f *.o
+        rm -f common/*.o
+        rm -f graphics_engine