diff --git a/img/foregrounds/deadpool.gifv b/img/foregrounds/deadpool.gifv new file mode 100644 index 0000000..67813fc --- /dev/null +++ b/img/foregrounds/deadpool.gifv @@ -0,0 +1,138 @@ + + + + Imgur + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + + +
+ + +
+ + +
+ +
+ +
+ + + + + +
+ +
+ +
+ + +
+
+ +
+
+ Imgur +
+
+ download +
+
+
+
+ + + + + + diff --git a/img/foregrounds/static-man/1.jpg b/img/foregrounds/static-man/1.jpg new file mode 100644 index 0000000..dfd4d14 Binary files /dev/null and b/img/foregrounds/static-man/1.jpg differ diff --git a/img/foregrounds/static-plane1/1.jpg b/img/foregrounds/static-plane1/1.jpg new file mode 100644 index 0000000..201e21b Binary files /dev/null and b/img/foregrounds/static-plane1/1.jpg differ diff --git a/img/foregrounds/static-plane2/1.jpg b/img/foregrounds/static-plane2/1.jpg new file mode 100644 index 0000000..402cc26 Binary files /dev/null and b/img/foregrounds/static-plane2/1.jpg differ diff --git a/img/foregrounds/surfing.gif b/img/foregrounds/surfing.gif new file mode 100644 index 0000000..321e98d Binary files /dev/null and b/img/foregrounds/surfing.gif differ diff --git a/img/foregrounds/surfing/0.jpg b/img/foregrounds/surfing/0.jpg new file mode 100644 index 0000000..86f7923 Binary files /dev/null and b/img/foregrounds/surfing/0.jpg differ diff --git a/img/foregrounds/surfing/1.jpg b/img/foregrounds/surfing/1.jpg new file mode 100644 index 0000000..6e78282 Binary files /dev/null and b/img/foregrounds/surfing/1.jpg differ diff --git a/img/foregrounds/surfing/2.jpg b/img/foregrounds/surfing/2.jpg new file mode 100644 index 0000000..bea5abe Binary files /dev/null and b/img/foregrounds/surfing/2.jpg differ diff --git a/img/foregrounds/surfing/3.jpg b/img/foregrounds/surfing/3.jpg new file mode 100644 index 0000000..23a33df Binary files /dev/null and b/img/foregrounds/surfing/3.jpg differ diff --git a/img/foregrounds/surfing/4.jpg b/img/foregrounds/surfing/4.jpg new file mode 100644 index 0000000..30e10c1 Binary files /dev/null and b/img/foregrounds/surfing/4.jpg differ diff --git a/img/foregrounds/surfing/5.jpg b/img/foregrounds/surfing/5.jpg new file mode 100644 index 0000000..17553f7 Binary files /dev/null and b/img/foregrounds/surfing/5.jpg differ diff --git a/img/foregrounds/surfing/6.jpg b/img/foregrounds/surfing/6.jpg new file mode 100644 index 0000000..8535114 Binary files /dev/null and b/img/foregrounds/surfing/6.jpg differ diff --git a/img/foregrounds/surfing/7.jpg b/img/foregrounds/surfing/7.jpg new file mode 100644 index 0000000..5d9c143 Binary files /dev/null and b/img/foregrounds/surfing/7.jpg differ diff --git a/img/foregrounds/surfing/8.jpg b/img/foregrounds/surfing/8.jpg new file mode 100644 index 0000000..26b9247 Binary files /dev/null and b/img/foregrounds/surfing/8.jpg differ diff --git a/img/foregrounds/surfing/9.jpg b/img/foregrounds/surfing/9.jpg new file mode 100644 index 0000000..23b7c22 Binary files /dev/null and b/img/foregrounds/surfing/9.jpg differ diff --git a/opengl-test-two/main.cpp b/opengl-test-two/main.cpp index b2911a2..1c4d57d 100644 --- a/opengl-test-two/main.cpp +++ b/opengl-test-two/main.cpp @@ -1,11 +1,10 @@ -// http://stackoverflow.com/questions/6005076/building-glew-on-windows-with-mingw - #define GLEW_STATIC #include #include #include #include #include +#include #include "loaders.h" int main(int argc, char* args[]) { @@ -23,8 +22,8 @@ int main(int argc, char* args[]) { return 1; } /* Create a windowed mode window and its OpenGL context */ - glfwSetWindowSizeLimits(window, 640, 480, 640, 480); window = glfwCreateWindow(640, 480, "Hello World", NULL, NULL); + glfwSetWindowSizeLimits(window, 640, 480, 640, 480); if (!window) { glfwTerminate(); return 1; @@ -89,16 +88,23 @@ int main(int argc, char* args[]) { glGenFramebuffers(1, &FramebufferName); glBindFramebuffer(GL_FRAMEBUFFER, FramebufferName); - + int lenTexFG = 10; + GLint texFGs[lenTexFG]; + char buffer[50]; texBG = LoadTexture("../img/backgrounds/sky.jpg",&textw2,&texth2); - texFG = LoadTexture("../img/tests/flieger.jpg",&textw,&texth); - printf("Tex1: %d\n", texFG); + for (int i=0; i= lenTexFG) { + loopNumber = 0; + } + // Measure speed + double currentTime = glfwGetTime(); + nbFrames++; + if ( currentTime - lastTime >= 1.0 ){ // If last prinf() was more than 1 sec ago + // printf and reset timer + printf("%f ms/frame\n", 1000.0/double(nbFrames)); + nbFrames = 0; + lastTime += 1.0; + } + + glActiveTexture(GL_TEXTURE0); + glBindTexture(GL_TEXTURE_2D, texFGs[loopNumber]); + // Render to our framebuffer glBindFramebuffer(GL_FRAMEBUFFER, FramebufferName); //glBindFramebuffer(GL_FRAMEBUFFER, 0); diff --git a/opengl-test-two/opengl-test-two.depend b/opengl-test-two/opengl-test-two.depend index 9e3caa7..abe2c93 100644 --- a/opengl-test-two/opengl-test-two.depend +++ b/opengl-test-two/opengl-test-two.depend @@ -2,15 +2,16 @@ 1385320478 source:d:\owncloud\documents\programmierung\cpp\opengl-test-two\main.cpp -1473703631 source:d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\main.cpp +1473775715 source:d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\main.cpp + "loaders.h" -1473015242 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\glfw\glfw3.h +1473011642 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\glfw\glfw3.h @@ -31,7 +32,7 @@ -1473015242 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl.h +1473011642 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl.h "SDL_main.h" "SDL_stdinc.h" "SDL_assert.h" @@ -62,12 +63,12 @@ "begin_code.h" "close_code.h" -1473015242 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_main.h +1473011642 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_main.h "SDL_stdinc.h" "begin_code.h" "close_code.h" -1473015242 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_stdinc.h +1473011642 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_stdinc.h "SDL_config.h" @@ -96,34 +97,34 @@ "close_code.h" -1473015242 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_config.h +1473011642 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_config.h "SDL_platform.h" -1473015242 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_platform.h +1473011642 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_platform.h "AvailabilityMacros.h" "TargetConditionals.h" "begin_code.h" "close_code.h" -1473015242 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\begin_code.h +1473011642 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\begin_code.h -1473015242 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\close_code.h +1473011642 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\close_code.h -1473015242 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_assert.h +1473011642 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_assert.h "SDL_config.h" "begin_code.h" "close_code.h" -1473015242 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_atomic.h +1473011642 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_atomic.h "SDL_stdinc.h" "SDL_platform.h" "begin_code.h" "close_code.h" -1473015242 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_audio.h +1473011642 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_audio.h "SDL_stdinc.h" "SDL_error.h" "SDL_endian.h" @@ -133,24 +134,24 @@ "begin_code.h" "close_code.h" -1473015242 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_error.h +1473011642 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_error.h "SDL_stdinc.h" "begin_code.h" "close_code.h" -1473015242 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_endian.h +1473011642 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_endian.h "SDL_stdinc.h" "begin_code.h" "close_code.h" -1473015242 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_mutex.h +1473011642 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_mutex.h "SDL_stdinc.h" "SDL_error.h" "begin_code.h" "close_code.h" -1473015242 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_thread.h +1473011642 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_thread.h "SDL_stdinc.h" "SDL_error.h" "SDL_atomic.h" @@ -159,18 +160,18 @@ "close_code.h" -1473015242 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_rwops.h +1473011642 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_rwops.h "SDL_stdinc.h" "SDL_error.h" "begin_code.h" "close_code.h" -1473015242 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_clipboard.h +1473011642 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_clipboard.h "SDL_stdinc.h" "begin_code.h" "close_code.h" -1473015242 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_cpuinfo.h +1473011642 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_cpuinfo.h "SDL_stdinc.h" @@ -182,7 +183,7 @@ "begin_code.h" "close_code.h" -1473015242 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_events.h +1473011642 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_events.h "SDL_stdinc.h" "SDL_error.h" "SDL_video.h" @@ -196,7 +197,7 @@ "begin_code.h" "close_code.h" -1473015242 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_video.h +1473011642 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_video.h "SDL_stdinc.h" "SDL_pixels.h" "SDL_rect.h" @@ -204,12 +205,12 @@ "begin_code.h" "close_code.h" -1473015242 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_pixels.h +1473011642 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_pixels.h "SDL_stdinc.h" "begin_code.h" "close_code.h" -1473015242 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_rect.h +1473011642 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_rect.h "SDL_stdinc.h" "SDL_error.h" "SDL_pixels.h" @@ -217,7 +218,7 @@ "begin_code.h" "close_code.h" -1473015242 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_surface.h +1473011642 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_surface.h "SDL_stdinc.h" "SDL_pixels.h" "SDL_rect.h" @@ -226,11 +227,11 @@ "begin_code.h" "close_code.h" -1473015242 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_blendmode.h +1473011642 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_blendmode.h "begin_code.h" "close_code.h" -1473015242 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_keyboard.h +1473011642 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_keyboard.h "SDL_stdinc.h" "SDL_error.h" "SDL_keycode.h" @@ -238,27 +239,27 @@ "begin_code.h" "close_code.h" -1473015242 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_keycode.h +1473011642 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_keycode.h "SDL_stdinc.h" "SDL_scancode.h" -1473015242 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_scancode.h +1473011642 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_scancode.h "SDL_stdinc.h" -1473015242 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_mouse.h +1473011642 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_mouse.h "SDL_stdinc.h" "SDL_error.h" "SDL_video.h" "begin_code.h" "close_code.h" -1473015242 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_joystick.h +1473011642 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_joystick.h "SDL_stdinc.h" "SDL_error.h" "begin_code.h" "close_code.h" -1473015242 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_gamecontroller.h +1473011642 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_gamecontroller.h "SDL_stdinc.h" "SDL_error.h" "SDL_rwops.h" @@ -266,11 +267,11 @@ "begin_code.h" "close_code.h" -1473015242 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_quit.h +1473011642 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_quit.h "SDL_stdinc.h" "SDL_error.h" -1473015242 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_gesture.h +1473011642 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_gesture.h "SDL_stdinc.h" "SDL_error.h" "SDL_video.h" @@ -278,60 +279,60 @@ "begin_code.h" "close_code.h" -1473015242 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_touch.h +1473011642 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_touch.h "SDL_stdinc.h" "SDL_error.h" "SDL_video.h" "begin_code.h" "close_code.h" -1473015242 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_filesystem.h +1473011642 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_filesystem.h "SDL_stdinc.h" "begin_code.h" "close_code.h" -1473015242 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_haptic.h +1473011642 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_haptic.h "SDL_stdinc.h" "SDL_error.h" "SDL_joystick.h" "begin_code.h" "close_code.h" -1473015242 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_hints.h +1473011642 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_hints.h "SDL_stdinc.h" "begin_code.h" "close_code.h" -1473015242 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_loadso.h +1473011642 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_loadso.h "SDL_stdinc.h" "SDL_error.h" "begin_code.h" "close_code.h" -1473015242 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_log.h +1473011642 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_log.h "SDL_stdinc.h" "begin_code.h" "close_code.h" -1473015242 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_messagebox.h +1473011642 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_messagebox.h "SDL_stdinc.h" "SDL_video.h" "begin_code.h" "close_code.h" -1473015242 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_power.h +1473011642 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_power.h "SDL_stdinc.h" "begin_code.h" "close_code.h" -1473015242 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_render.h +1473011642 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_render.h "SDL_stdinc.h" "SDL_rect.h" "SDL_video.h" "begin_code.h" "close_code.h" -1473015242 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_system.h +1473011642 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_system.h "SDL_stdinc.h" "SDL_keyboard.h" "SDL_render.h" @@ -339,24 +340,24 @@ "begin_code.h" "close_code.h" -1473015242 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_timer.h +1473011642 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_timer.h "SDL_stdinc.h" "SDL_error.h" "begin_code.h" "close_code.h" -1473015242 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_version.h +1473011642 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_version.h "SDL_stdinc.h" "begin_code.h" "close_code.h" -1473015242 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_image.h +1473011642 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\sdl2\sdl_image.h "SDL.h" "SDL_version.h" "begin_code.h" "close_code.h" -1473015242 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\gl\glew.h +1473011642 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\gl\glew.h @@ -739,13 +740,13 @@ "loaders.h" -1473669189 source:d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\src\loaders.cpp +1473700459 source:d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\src\loaders.cpp "loaders.h" -1473669189 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\loaders.h +1473700459 d:\owncloud\documents\programmierung\cpp\imanox-chroma-matting\opengl-test-two\include\loaders.h