Changeset 8a6d19d in opengl-game

Timestamp:

Jun 23, 2017, 8:07:56 PM (8 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

92bc4fe

Parents:

b33f87b

Message:

Implement movement in a basic 3D scene and add some examples from the new OpenGL tutorials site

Files:

• .gitignore (modified) (1 diff)
• README.txt (modified) (1 diff)
• common/controls-new.cpp (added)
• common/controls.cpp (added)
• common/controls.hpp (added)
• common/shader.cpp (added)
• common/shader.hpp (added)
• common/texture.cpp (added)
• common/texture.hpp (added)
• game01.cpp (added)
• game02.cpp (added)
• game04.cpp (added)
• game06.cpp (added)
• makefile (modified) (1 diff)
• mygame.cpp (added)
• shaders/ColorFragmentShader.fragmentshader (added)
• shaders/SimpleFragmentShader.fragmentshader (added)
• shaders/SimpleVertexShader.vertexshader (added)
• shaders/TextureFragmentShader.fragmentshader (added)
• shaders/TransformVertexShader-color.vertexshader (added)
• shaders/TransformVertexShader.vertexshader (added)
• uvtemplate.DDS (added)

.gitignore

@@ -1 +1 @@
 game
+demo
 
 # Visual Studio files

README.txt

@@ +1 @@
+TODO: Make sure the instructions in this README still work and, if not, update them
+
 Installation Instructions for Linux
 ---------------------------------------
 
 -Compile GLEW from source
- (download and following the instructions in README.md)
+ (download and follow the instructions in README.md)
 
 sudo apt-get install cmake xorg-dev  libglew-dev libglu1-mesa-dev freeglut3-dev mesa-common-dev

makefile

@@ -10 +10 @@
 endif
 
-game: game.cpp
+game: mygame.cpp common/shader.cpp common/texture.cpp common/controls-new.cpp
+        $(CC) $? $(DEP) $(CFLAGS) -o $@
+
+demo: game06.cpp common/shader.cpp common/texture.cpp common/controls.cpp
         $(CC) $? $(DEP) $(CFLAGS) -o $@
 
 clean:
         rm -f game
+        rm -f demo