Changeset 88ebdc8 in opengl-game

Timestamp:

Jul 26, 2019, 6:39:38 PM (5 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

f5d5686

Parents:

eea05dd

git-author:

Dmitry Portnoy <dmitry.portnoy@…> (07/26/19 18:37:23)

git-committer:

Dmitry Portnoy <dmitry.portnoy@…> (07/26/19 18:39:38)

Message:

Update new-game.cpp to use a header-only version of stb_image

Files:

• makefile (modified) (2 diffs)
• new-game.cpp (modified) (2 diffs)
• stb_image.cpp (deleted)

makefile

@@ -22 +22 @@
 # as this well prevent regenerating .o files for unchanged .cpp files
 
-newgame: new-game.cpp logger.cpp utils.cpp CrashLogger.cpp stb_image.cpp imgui_impl_glfw_gl3.cpp $(IMGUI_FILES)
+newgame: new-game.cpp logger.cpp utils.cpp CrashLogger.cpp imgui_impl_glfw_gl3.cpp $(IMGUI_FILES)
         $(CC) $^ $(DEP) $(CFLAGS) -o $@
 
@@ -55 +55 @@
         $(CC) $(CXX_FLAGS) -o $@ $^ $(LIB_FLAGS)
 
+.PHONY: shaders
+shaders: shaders/shader.vert shaders/shader.frag
+        cd shaders && ../compile.sh && cd ..
+
 clean:
         rm -f newgame
         rm -f vulkangame
+        rm -f shaders/*.spv

new-game.cpp

@@ +1 @@
+#define STB_IMAGE_IMPLEMENTATION
 #include "stb_image.h"
 
@@ -574 +575 @@
    objects.push_back(createShip());
 
-   vector<SceneObject>::iterator obj_it;
-
    populateBuffers(objects, shaderBufferInfo, modelGroups, ubo);