diff --git a/CMakeLists.txt b/CMakeLists.txt index 54c060cd334a5b4efbc3f83ce790a2cee645a1b9..10c93e981363a76b01d2ff65b45decc93174c3e3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,6 +13,8 @@ INCLUDE(FindPkgConfig) PKG_SEARCH_MODULE(SDL2 REQUIRED sdl2) PKG_SEARCH_MODULE(SDL2GFX REQUIRED SDL2_gfx) +PKG_SEARCH_MODULE(SDL2TTF REQUIRED SDL2_ttf) +PKG_SEARCH_MODULE(SDL2IMAGE REQUIRED SDL2_image) -INCLUDE_DIRECTORIES(${SDL2_INCLUDE_DIRS} ${SDL2GFX_INCLUDE_DIRS}) -TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${SDL2_LIBRARIES} ${SDL2GFX_LIBRARIES} SDL2_image) +INCLUDE_DIRECTORIES(${SDL2_INCLUDE_DIRS} ${SDL2GFX_INCLUDE_DIRS} ${SDL2TTF_INCLUDE_DIRS} ${SDL2IMAGE_INCLUDE_DIRS}) +TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${SDL2_LIBRARIES} ${SDL2GFX_LIBRARIES} ${SDL2TTF_LIBRARIES} ${SDL2IMAGE_LIBRARIES}) \ No newline at end of file diff --git a/cmake-build-debug/CMakeCache.txt b/cmake-build-debug/CMakeCache.txt index 8e544ade533d9df68d26d531d5cd12d7aae98201..af09f63e0f85d61e00ca1913585be5edc583b804 100644 --- a/cmake-build-debug/CMakeCache.txt +++ b/cmake-build-debug/CMakeCache.txt @@ -206,6 +206,18 @@ pkgcfg_lib_SDL2GFX_SDL2:FILEPATH=/usr/lib/x86_64-linux-gnu/libSDL2.so //Path to a library. pkgcfg_lib_SDL2GFX_SDL2_gfx:FILEPATH=/usr/lib/x86_64-linux-gnu/libSDL2_gfx.so +//Path to a library. +pkgcfg_lib_SDL2IMAGE_SDL2:FILEPATH=/usr/lib/x86_64-linux-gnu/libSDL2.so + +//Path to a library. +pkgcfg_lib_SDL2IMAGE_SDL2_image:FILEPATH=/usr/lib/x86_64-linux-gnu/libSDL2_image.so + +//Path to a library. +pkgcfg_lib_SDL2TTF_SDL2:FILEPATH=/usr/lib/x86_64-linux-gnu/libSDL2.so + +//Path to a library. +pkgcfg_lib_SDL2TTF_SDL2_ttf:FILEPATH=/usr/lib/x86_64-linux-gnu/libSDL2_ttf.so + //Path to a library. pkgcfg_lib_SDL2_SDL2:FILEPATH=/usr/lib/x86_64-linux-gnu/libSDL2.so @@ -381,6 +393,74 @@ SDL2GFX_STATIC_LIBS_L:INTERNAL= SDL2GFX_STATIC_LIBS_OTHER:INTERNAL= SDL2GFX_STATIC_LIBS_PATHS:INTERNAL= SDL2GFX_VERSION:INTERNAL=1.0.2 +SDL2IMAGE_CFLAGS:INTERNAL=-D_REENTRANT;-I/usr/include/SDL2 +SDL2IMAGE_CFLAGS_I:INTERNAL= +SDL2IMAGE_CFLAGS_OTHER:INTERNAL=-D_REENTRANT +SDL2IMAGE_FOUND:INTERNAL=1 +SDL2IMAGE_INCLUDEDIR:INTERNAL=/usr/include +SDL2IMAGE_INCLUDE_DIRS:INTERNAL=/usr/include/SDL2 +SDL2IMAGE_LDFLAGS:INTERNAL=-lSDL2_image;-lSDL2 +SDL2IMAGE_LDFLAGS_OTHER:INTERNAL= +SDL2IMAGE_LIBDIR:INTERNAL=/usr/lib/x86_64-linux-gnu +SDL2IMAGE_LIBRARIES:INTERNAL=SDL2_image;SDL2 +SDL2IMAGE_LIBRARY_DIRS:INTERNAL= +SDL2IMAGE_LIBS:INTERNAL= +SDL2IMAGE_LIBS_L:INTERNAL= +SDL2IMAGE_LIBS_OTHER:INTERNAL= +SDL2IMAGE_LIBS_PATHS:INTERNAL= +SDL2IMAGE_PREFIX:INTERNAL=/usr +SDL2IMAGE_SDL2_image_INCLUDEDIR:INTERNAL= +SDL2IMAGE_SDL2_image_LIBDIR:INTERNAL= +SDL2IMAGE_SDL2_image_PREFIX:INTERNAL= +SDL2IMAGE_SDL2_image_VERSION:INTERNAL= +SDL2IMAGE_STATIC_CFLAGS:INTERNAL=-D_REENTRANT;-I/usr/include/SDL2 +SDL2IMAGE_STATIC_CFLAGS_I:INTERNAL= +SDL2IMAGE_STATIC_CFLAGS_OTHER:INTERNAL=-D_REENTRANT +SDL2IMAGE_STATIC_INCLUDE_DIRS:INTERNAL=/usr/include/SDL2 +SDL2IMAGE_STATIC_LDFLAGS:INTERNAL=-lSDL2_image;-lSDL2;-Wl,--no-undefined;-lm;-ldl;-lasound;-lm;-ldl;-lpthread;-lpulse-simple;-lpulse;-lX11;-lXext;-lXcursor;-lXinerama;-lXi;-lXrandr;-lXss;-lXxf86vm;-lwayland-egl;-lwayland-client;-lwayland-cursor;-lxkbcommon;-lpthread;-lrt +SDL2IMAGE_STATIC_LDFLAGS_OTHER:INTERNAL=-Wl,--no-undefined +SDL2IMAGE_STATIC_LIBDIR:INTERNAL= +SDL2IMAGE_STATIC_LIBRARIES:INTERNAL=SDL2_image;SDL2;m;dl;asound;m;dl;pthread;pulse-simple;pulse;X11;Xext;Xcursor;Xinerama;Xi;Xrandr;Xss;Xxf86vm;wayland-egl;wayland-client;wayland-cursor;xkbcommon;pthread;rt +SDL2IMAGE_STATIC_LIBRARY_DIRS:INTERNAL= +SDL2IMAGE_STATIC_LIBS:INTERNAL= +SDL2IMAGE_STATIC_LIBS_L:INTERNAL= +SDL2IMAGE_STATIC_LIBS_OTHER:INTERNAL= +SDL2IMAGE_STATIC_LIBS_PATHS:INTERNAL= +SDL2IMAGE_VERSION:INTERNAL=2.0.5 +SDL2TTF_CFLAGS:INTERNAL=-D_REENTRANT;-I/usr/include/SDL2 +SDL2TTF_CFLAGS_I:INTERNAL= +SDL2TTF_CFLAGS_OTHER:INTERNAL=-D_REENTRANT +SDL2TTF_FOUND:INTERNAL=1 +SDL2TTF_INCLUDEDIR:INTERNAL=/usr/include +SDL2TTF_INCLUDE_DIRS:INTERNAL=/usr/include/SDL2 +SDL2TTF_LDFLAGS:INTERNAL=-lSDL2_ttf;-lSDL2 +SDL2TTF_LDFLAGS_OTHER:INTERNAL= +SDL2TTF_LIBDIR:INTERNAL=/usr/lib/x86_64-linux-gnu +SDL2TTF_LIBRARIES:INTERNAL=SDL2_ttf;SDL2 +SDL2TTF_LIBRARY_DIRS:INTERNAL= +SDL2TTF_LIBS:INTERNAL= +SDL2TTF_LIBS_L:INTERNAL= +SDL2TTF_LIBS_OTHER:INTERNAL= +SDL2TTF_LIBS_PATHS:INTERNAL= +SDL2TTF_PREFIX:INTERNAL=/usr +SDL2TTF_SDL2_ttf_INCLUDEDIR:INTERNAL= +SDL2TTF_SDL2_ttf_LIBDIR:INTERNAL= +SDL2TTF_SDL2_ttf_PREFIX:INTERNAL= +SDL2TTF_SDL2_ttf_VERSION:INTERNAL= +SDL2TTF_STATIC_CFLAGS:INTERNAL=-D_REENTRANT;-I/usr/include/SDL2 +SDL2TTF_STATIC_CFLAGS_I:INTERNAL= +SDL2TTF_STATIC_CFLAGS_OTHER:INTERNAL=-D_REENTRANT +SDL2TTF_STATIC_INCLUDE_DIRS:INTERNAL=/usr/include/SDL2 +SDL2TTF_STATIC_LDFLAGS:INTERNAL=-lSDL2_ttf;-lSDL2;-Wl,--no-undefined;-lm;-ldl;-lasound;-lm;-ldl;-lpthread;-lpulse-simple;-lpulse;-lX11;-lXext;-lXcursor;-lXinerama;-lXi;-lXrandr;-lXss;-lXxf86vm;-lwayland-egl;-lwayland-client;-lwayland-cursor;-lxkbcommon;-lpthread;-lrt +SDL2TTF_STATIC_LDFLAGS_OTHER:INTERNAL=-Wl,--no-undefined +SDL2TTF_STATIC_LIBDIR:INTERNAL= +SDL2TTF_STATIC_LIBRARIES:INTERNAL=SDL2_ttf;SDL2;m;dl;asound;m;dl;pthread;pulse-simple;pulse;X11;Xext;Xcursor;Xinerama;Xi;Xrandr;Xss;Xxf86vm;wayland-egl;wayland-client;wayland-cursor;xkbcommon;pthread;rt +SDL2TTF_STATIC_LIBRARY_DIRS:INTERNAL= +SDL2TTF_STATIC_LIBS:INTERNAL= +SDL2TTF_STATIC_LIBS_L:INTERNAL= +SDL2TTF_STATIC_LIBS_OTHER:INTERNAL= +SDL2TTF_STATIC_LIBS_PATHS:INTERNAL= +SDL2TTF_VERSION:INTERNAL=2.0.15 SDL2_CFLAGS:INTERNAL=-D_REENTRANT;-I/usr/include/SDL2 SDL2_CFLAGS_I:INTERNAL= SDL2_CFLAGS_OTHER:INTERNAL=-D_REENTRANT @@ -417,10 +497,20 @@ SDL2_sdl2_PREFIX:INTERNAL= SDL2_sdl2_VERSION:INTERNAL= __pkg_config_checked_SDL2:INTERNAL=1 __pkg_config_checked_SDL2GFX:INTERNAL=1 +__pkg_config_checked_SDL2IMAGE:INTERNAL=1 +__pkg_config_checked_SDL2TTF:INTERNAL=1 //ADVANCED property for variable: pkgcfg_lib_SDL2GFX_SDL2 pkgcfg_lib_SDL2GFX_SDL2-ADVANCED:INTERNAL=1 //ADVANCED property for variable: pkgcfg_lib_SDL2GFX_SDL2_gfx pkgcfg_lib_SDL2GFX_SDL2_gfx-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: pkgcfg_lib_SDL2IMAGE_SDL2 +pkgcfg_lib_SDL2IMAGE_SDL2-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: pkgcfg_lib_SDL2IMAGE_SDL2_image +pkgcfg_lib_SDL2IMAGE_SDL2_image-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: pkgcfg_lib_SDL2TTF_SDL2 +pkgcfg_lib_SDL2TTF_SDL2-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: pkgcfg_lib_SDL2TTF_SDL2_ttf +pkgcfg_lib_SDL2TTF_SDL2_ttf-ADVANCED:INTERNAL=1 //ADVANCED property for variable: pkgcfg_lib_SDL2_SDL2 pkgcfg_lib_SDL2_SDL2-ADVANCED:INTERNAL=1 prefix_result:INTERNAL=/usr/lib/x86_64-linux-gnu diff --git a/cmake-build-debug/CMakeFiles/clion-log.txt b/cmake-build-debug/CMakeFiles/clion-log.txt index ace78dfd02b6b7d027c5457bc2b4cc9cd8cae3af..5cded16b71b2fb0433632652439f0138c9553832 100644 --- a/cmake-build-debug/CMakeFiles/clion-log.txt +++ b/cmake-build-debug/CMakeFiles/clion-log.txt @@ -1,4 +1,6 @@ /snap/clion/92/bin/cmake/linux/bin/cmake -DCMAKE_BUILD_TYPE=Debug -G "CodeBlocks - Unix Makefiles" /home/blint/projects/nhf +-- Checking for one of the modules 'SDL2_ttf' +-- Checking for one of the modules 'SDL2_image' -- Configuring done -- Generating done -- Build files have been written to: /home/blint/projects/nhf/cmake-build-debug diff --git a/cmake-build-debug/CMakeFiles/nhf.dir/C.includecache b/cmake-build-debug/CMakeFiles/nhf.dir/C.includecache index b2dddb5eb0ec68ce8b53f1d2a7fffc88014ac54c..02fc3247091ca04fc709d04232ad90bcd6c19e82 100644 --- a/cmake-build-debug/CMakeFiles/nhf.dir/C.includecache +++ b/cmake-build-debug/CMakeFiles/nhf.dir/C.includecache @@ -13,18 +13,12 @@ move.h /home/blint/projects/nhf/move.h SDL2/SDL_image.h - -stdbool.h -- - -/home/blint/projects/nhf/move.c -move.h -/home/blint/projects/nhf/move.h -view.h -/home/blint/projects/nhf/view.h -SDL.h +SDL2/SDL2_gfxPrimitives.h - stdbool.h - +time.h +- /home/blint/projects/nhf/move.h SDL.h @@ -32,18 +26,6 @@ SDL.h stdbool.h - -/home/blint/projects/nhf/view.c -view.h -/home/blint/projects/nhf/view.h -SDL2/SDL.h -- -SDL2/SDL_image.h -- -stdlib.h -- -stdio.h -- - /home/blint/projects/nhf/view.h SDL2/SDL.h - diff --git a/cmake-build-debug/CMakeFiles/nhf.dir/link.txt b/cmake-build-debug/CMakeFiles/nhf.dir/link.txt index 5f41754272d0072b599c2df2c1b0d51e700ee00d..e737b810a5b92c753162bd9b8124eee4fe90278b 100644 --- a/cmake-build-debug/CMakeFiles/nhf.dir/link.txt +++ b/cmake-build-debug/CMakeFiles/nhf.dir/link.txt @@ -1 +1 @@ -/usr/bin/cc -I/usr/include/SDL2 -D_REENTRANT -g CMakeFiles/nhf.dir/main.c.o CMakeFiles/nhf.dir/view.c.o CMakeFiles/nhf.dir/move.c.o -o nhf -lm -lSDL2 -lSDL2_gfx -lSDL2 -lSDL2_image -lSDL2_gfx -lSDL2_image +/usr/bin/cc -I/usr/include/SDL2 -D_REENTRANT -g CMakeFiles/nhf.dir/main.c.o CMakeFiles/nhf.dir/view.c.o CMakeFiles/nhf.dir/move.c.o -o nhf -lm -lSDL2 -lSDL2_gfx -lSDL2 -lSDL2_ttf -lSDL2 -lSDL2_image -lSDL2 -lSDL2_gfx -lSDL2_ttf -lSDL2_image diff --git a/cmake-build-debug/CMakeFiles/nhf.dir/main.c.o b/cmake-build-debug/CMakeFiles/nhf.dir/main.c.o index 0f57d00c29fb1af8261de781ce081c8202be9b90..4412b56eb15dbb28531e4f01a134ebed894420c2 100644 Binary files a/cmake-build-debug/CMakeFiles/nhf.dir/main.c.o and b/cmake-build-debug/CMakeFiles/nhf.dir/main.c.o differ diff --git a/cmake-build-debug/nhf b/cmake-build-debug/nhf index 8fe8d5cf2c9214a5570545147786065b69aff1d9..63ebd209c07ee5c4110b312dade39ae93ed06c39 100755 Binary files a/cmake-build-debug/nhf and b/cmake-build-debug/nhf differ diff --git a/main.c b/main.c index d38dc4c1be3566a499f4da42aa3058df952be19a..9114f58647091273969dd73b0a82952b29ff852a 100644 --- a/main.c +++ b/main.c @@ -1,8 +1,15 @@ #include "view.h" #include "move.h" #include <SDL2/SDL_image.h> +#include <SDL2/SDL2_gfxPrimitives.h> #include <stdbool.h> +#include <time.h> +typedef struct Palyaelem{ + int x, y; + int hossz; + struct Palyaelem *kov; +}Palyaelem; int H = 600; int W = 900; @@ -10,15 +17,43 @@ int W = 900; SDL_Window *window; SDL_Renderer *renderer; +Palyaelem *gen_elem() +{ + Palyaelem *elem = (Palyaelem *) malloc(sizeof(Palyaelem)); + elem->hossz = rand() % (W * 2); + elem->x = rand() % W; + elem->y = rand() % (H - (owl * 2)); + elem->kov = NULL; + return elem; +} + +void palyaelem_kirajzolo(Palyaelem *elem, SDL_Renderer *prenderer) +{ + SDL_Rect r; + r.x = elem->x; + r.y = elem->y; + r.w = elem->hossz; + r.h = 20; + + SDL_SetRenderDrawColor( renderer, 0, 255, 0, 255 ); + SDL_RenderFillRect( prenderer, &r ); +} + +void palyakirajzol(SDL_Renderer *prenderer) +{ + +} + int main(int argc, char *argv[]) { + srand(time(NULL)); + sdl_init(W, H, &window, &renderer); SDL_Texture *bagoly = kep_betolt(renderer, "infoc.png"); - SDL_RenderPresent(renderer); //az elvegzett rajzolasok a kepernyore - + SDL_RenderPresent(renderer); bool quit = false; bool moving = false; @@ -26,12 +61,18 @@ int main(int argc, char *argv[]) { int elozo_x = 0; int elozo_y = 0; + Palyaelem *elem = gen_elem(); + while (!quit) { SDL_Event ev; SDL_WaitEvent(&ev); + SDL_SetRenderDrawColor(renderer, 0, 0, 0, 255); SDL_RenderClear(renderer); + + palyaelem_kirajzolo(elem, renderer); + keywatcher(ev, bagoly, elozo_x, elozo_y, &quit, &moving, renderer); if (moving){