From 8af1284654a4a5d454a559eca371bf0ac3c79786 Mon Sep 17 00:00:00 2001 From: jacopograndi Date: Tue, 31 Aug 2021 23:53:53 +0200 Subject: tech done, building sprites, upgrade on age up, gui --- CMakeFiles/sdl_test.dir/CXX.includecache | 420 +-------------------- CMakeFiles/sdl_test.dir/depend.internal | 1 + CMakeFiles/sdl_test.dir/depend.make | 1 + CMakeFiles/sdl_test.dir/game/ground.cpp.obj | Bin 184139 -> 367258 bytes CMakeFiles/sdl_test.dir/game/gst.cpp.obj | Bin 166407 -> 538957 bytes CMakeFiles/sdl_test.dir/game/load.cpp.obj | Bin 2113607 -> 2262664 bytes CMakeFiles/sdl_test.dir/game/menu.cpp.obj | Bin 182045 -> 182115 bytes CMakeFiles/sdl_test.dir/game/playercontrol.cpp.obj | Bin 443933 -> 529811 bytes CMakeFiles/sdl_test.dir/game/tech.cpp.obj | Bin 555 -> 625 bytes CMakeFiles/sdl_test.dir/game/view.cpp.obj | Bin 15564 -> 16092 bytes CMakeFiles/sdl_test.dir/graphics/graphics.cpp.obj | Bin 226173 -> 395241 bytes CMakeFiles/sdl_test.dir/main.cpp.obj | Bin 302022 -> 453538 bytes CMakeFiles/sdl_test.dir/objects.a | Bin 4076418 -> 5292794 bytes 13 files changed, 6 insertions(+), 416 deletions(-) (limited to 'CMakeFiles/sdl_test.dir') diff --git a/CMakeFiles/sdl_test.dir/CXX.includecache b/CMakeFiles/sdl_test.dir/CXX.includecache index cf9bd6c..c1a7a4e 100644 --- a/CMakeFiles/sdl_test.dir/CXX.includecache +++ b/CMakeFiles/sdl_test.dir/CXX.includecache @@ -630,12 +630,6 @@ vector SDL2/SDL.h - -C:/Users/jaksk/Desktop/dev/_cpp/age/game/entity.cpp -entity.h -C:/Users/jaksk/Desktop/dev/_cpp/age/game/entity.h -iostream -- - C:/Users/jaksk/Desktop/dev/_cpp/age/game/entity.h vector - @@ -646,26 +640,10 @@ iostream ../umath/vec2.h C:/Users/jaksk/Desktop/dev/_cpp/age/umath/vec2.h -C:/Users/jaksk/Desktop/dev/_cpp/age/game/ground.cpp -ground.h -C:/Users/jaksk/Desktop/dev/_cpp/age/game/ground.h -gst.h -C:/Users/jaksk/Desktop/dev/_cpp/age/game/gst.h -iostream -- -algorithm -- - C:/Users/jaksk/Desktop/dev/_cpp/age/game/ground.h entity.h C:/Users/jaksk/Desktop/dev/_cpp/age/game/entity.h -C:/Users/jaksk/Desktop/dev/_cpp/age/game/gst.cpp -gst.h -C:/Users/jaksk/Desktop/dev/_cpp/age/game/gst.h -iostream -- - C:/Users/jaksk/Desktop/dev/_cpp/age/game/gst.h iostream - @@ -688,18 +666,6 @@ C:/Users/jaksk/Desktop/dev/_cpp/age/game/player.h tech.h C:/Users/jaksk/Desktop/dev/_cpp/age/game/tech.h -C:/Users/jaksk/Desktop/dev/_cpp/age/game/load.cpp -iostream -- -fstream -- -vector -- -load.h -C:/Users/jaksk/Desktop/dev/_cpp/age/game/load.h -nlohmann/json.hpp -C:/Users/jaksk/Desktop/dev/_cpp/age/game/nlohmann/json.hpp - C:/Users/jaksk/Desktop/dev/_cpp/age/game/load.h gst.h C:/Users/jaksk/Desktop/dev/_cpp/age/game/gst.h @@ -714,371 +680,11 @@ C:/Users/jaksk/Desktop/dev/_cpp/age/umath/vec2.h tech.h C:/Users/jaksk/Desktop/dev/_cpp/age/game/tech.h -C:/Users/jaksk/Desktop/dev/_cpp/age/game/nlohmann/json.hpp -algorithm -- -cstddef -- -functional -- -initializer_list -- -iosfwd -- -iterator -- -memory -- -numeric -- -string -- -utility -- -vector -- -type_traits -- -utility -- -algorithm -- -array -- -forward_list -- -iterator -- -map -- -string -- -tuple -- -type_traits -- -unordered_map -- -utility -- -valarray -- -exception -- -stdexcept -- -string -- -vector -- -array -- -cstddef -- -cstdint -- -string -- -string -- -utility -- -stdint.h -- -stdint.h -- -cstdlib -- -cassert -- -cstddef -- -cstddef -- -type_traits -- -utility -- -limits -- -type_traits -- -utility -- -tuple -- -iterator -- -type_traits -- -cstdint -- -map -- -memory -- -string -- -vector -- -algorithm -- -iterator -- -string -- -tuple -- -type_traits -- -utility -- -valarray -- -vector -- -cstddef -- -iterator -- -string -- -tuple -- -utility -- -cstdint -- -tuple -- -utility -- -cstdint -- -cstddef -- -functional -- -algorithm -- -array -- -cmath -- -cstddef -- -cstdint -- -cstdio -- -cstring -- -iterator -- -limits -- -string -- -utility -- -vector -- -array -- -cstddef -- -cstring -- -iterator -- -memory -- -numeric -- -string -- -type_traits -- -utility -- -cstdio -- -istream -- -cstddef -- -string -- -utility -- -vector -- -array -- -clocale -- -cstddef -- -cstdio -- -cstdlib -- -initializer_list -- -string -- -utility -- -vector -- -cstdint -- -utility -- -string -- -cmath -- -cstdint -- -functional -- -string -- -utility -- -vector -- -cstddef -- -limits -- -iterator -- -type_traits -- -cstddef -- -iterator -- -utility -- -algorithm -- -cctype -- -limits -- -numeric -- -string -- -utility -- -vector -- -initializer_list -- -utility -- -algorithm -- -array -- -cmath -- -cstdint -- -cstring -- -limits -- -string -- -utility -- -algorithm -- -cstddef -- -iterator -- -memory -- -string -- -vector -- -ios -- -ostream -- -algorithm -- -array -- -clocale -- -cmath -- -cstddef -- -cstdint -- -cstdio -- -limits -- -string -- -type_traits -- -utility -- -array -- -cmath -- -cstdint -- -cstring -- -limits -- -type_traits -- -functional -- -initializer_list -- -iterator -- -memory -- -stdexcept -- -type_traits -- -utility -- -vector -- -string_view -- - C:/Users/jaksk/Desktop/dev/_cpp/age/game/player.h vector - - -C:/Users/jaksk/Desktop/dev/_cpp/age/game/playercontrol.cpp -iostream -- -string -- -playercontrol.h -C:/Users/jaksk/Desktop/dev/_cpp/age/game/playercontrol.h -entity.h -C:/Users/jaksk/Desktop/dev/_cpp/age/game/entity.h +tech.h +C:/Users/jaksk/Desktop/dev/_cpp/age/game/tech.h C:/Users/jaksk/Desktop/dev/_cpp/age/game/playercontrol.h iostream @@ -1095,6 +701,8 @@ functional C:/Users/jaksk/Desktop/dev/_cpp/age/game/tech.h vector - +unordered_map +- string - ../umath/vec2.h @@ -1108,10 +716,6 @@ string ../umath/vec2.h C:/Users/jaksk/Desktop/dev/_cpp/age/umath/vec2.h -C:/Users/jaksk/Desktop/dev/_cpp/age/game/view.cpp -view.h -C:/Users/jaksk/Desktop/dev/_cpp/age/game/view.h - C:/Users/jaksk/Desktop/dev/_cpp/age/game/view.h vector - @@ -1126,22 +730,6 @@ C:/Users/jaksk/Desktop/dev/_cpp/age/graphics/cam.h vector - -C:/Users/jaksk/Desktop/dev/_cpp/age/graphics/graphics.cpp -algorithm -- -iostream -- -string -- -math.h -- -graphics.h -C:/Users/jaksk/Desktop/dev/_cpp/age/graphics/graphics.h -../game/menu.h -C:/Users/jaksk/Desktop/dev/_cpp/age/game/menu.h -../game/tile.h -C:/Users/jaksk/Desktop/dev/_cpp/age/game/tile.h - C:/Users/jaksk/Desktop/dev/_cpp/age/graphics/graphics.h vector - diff --git a/CMakeFiles/sdl_test.dir/depend.internal b/CMakeFiles/sdl_test.dir/depend.internal index f191c0c..7277f69 100644 --- a/CMakeFiles/sdl_test.dir/depend.internal +++ b/CMakeFiles/sdl_test.dir/depend.internal @@ -166,6 +166,7 @@ CMakeFiles/sdl_test.dir/graphics/graphics.cpp.obj C:/MinGW_libs/include/SDL2/SDL_video.h C:/MinGW_libs/include/SDL2/begin_code.h C:/MinGW_libs/include/SDL2/close_code.h + C:/Users/jaksk/Desktop/dev/_cpp/age/game/constants.h C:/Users/jaksk/Desktop/dev/_cpp/age/game/entity.h C:/Users/jaksk/Desktop/dev/_cpp/age/game/ground.h C:/Users/jaksk/Desktop/dev/_cpp/age/game/gst.h diff --git a/CMakeFiles/sdl_test.dir/depend.make b/CMakeFiles/sdl_test.dir/depend.make index e197c59..2e68f12 100644 --- a/CMakeFiles/sdl_test.dir/depend.make +++ b/CMakeFiles/sdl_test.dir/depend.make @@ -165,6 +165,7 @@ CMakeFiles/sdl_test.dir/graphics/graphics.cpp.obj: C:/MinGW_libs/include/SDL2/SD CMakeFiles/sdl_test.dir/graphics/graphics.cpp.obj: C:/MinGW_libs/include/SDL2/SDL_video.h CMakeFiles/sdl_test.dir/graphics/graphics.cpp.obj: C:/MinGW_libs/include/SDL2/begin_code.h CMakeFiles/sdl_test.dir/graphics/graphics.cpp.obj: C:/MinGW_libs/include/SDL2/close_code.h +CMakeFiles/sdl_test.dir/graphics/graphics.cpp.obj: game/constants.h CMakeFiles/sdl_test.dir/graphics/graphics.cpp.obj: game/entity.h CMakeFiles/sdl_test.dir/graphics/graphics.cpp.obj: game/ground.h CMakeFiles/sdl_test.dir/graphics/graphics.cpp.obj: game/gst.h diff --git a/CMakeFiles/sdl_test.dir/game/ground.cpp.obj b/CMakeFiles/sdl_test.dir/game/ground.cpp.obj index 2426007..e8fe88d 100644 Binary files a/CMakeFiles/sdl_test.dir/game/ground.cpp.obj and b/CMakeFiles/sdl_test.dir/game/ground.cpp.obj differ diff --git a/CMakeFiles/sdl_test.dir/game/gst.cpp.obj b/CMakeFiles/sdl_test.dir/game/gst.cpp.obj index 1ade445..622f3c3 100644 Binary files a/CMakeFiles/sdl_test.dir/game/gst.cpp.obj and b/CMakeFiles/sdl_test.dir/game/gst.cpp.obj differ diff --git a/CMakeFiles/sdl_test.dir/game/load.cpp.obj b/CMakeFiles/sdl_test.dir/game/load.cpp.obj index 5fee533..b227260 100644 Binary files a/CMakeFiles/sdl_test.dir/game/load.cpp.obj and b/CMakeFiles/sdl_test.dir/game/load.cpp.obj differ diff --git a/CMakeFiles/sdl_test.dir/game/menu.cpp.obj b/CMakeFiles/sdl_test.dir/game/menu.cpp.obj index 507e390..a1d1697 100644 Binary files a/CMakeFiles/sdl_test.dir/game/menu.cpp.obj and b/CMakeFiles/sdl_test.dir/game/menu.cpp.obj differ diff --git a/CMakeFiles/sdl_test.dir/game/playercontrol.cpp.obj b/CMakeFiles/sdl_test.dir/game/playercontrol.cpp.obj index 7b273d0..c1c6716 100644 Binary files a/CMakeFiles/sdl_test.dir/game/playercontrol.cpp.obj and b/CMakeFiles/sdl_test.dir/game/playercontrol.cpp.obj differ diff --git a/CMakeFiles/sdl_test.dir/game/tech.cpp.obj b/CMakeFiles/sdl_test.dir/game/tech.cpp.obj index dbf13d3..88191d8 100644 Binary files a/CMakeFiles/sdl_test.dir/game/tech.cpp.obj and b/CMakeFiles/sdl_test.dir/game/tech.cpp.obj differ diff --git a/CMakeFiles/sdl_test.dir/game/view.cpp.obj b/CMakeFiles/sdl_test.dir/game/view.cpp.obj index 5292e10..1495405 100644 Binary files a/CMakeFiles/sdl_test.dir/game/view.cpp.obj and b/CMakeFiles/sdl_test.dir/game/view.cpp.obj differ diff --git a/CMakeFiles/sdl_test.dir/graphics/graphics.cpp.obj b/CMakeFiles/sdl_test.dir/graphics/graphics.cpp.obj index 1823965..d3970de 100644 Binary files a/CMakeFiles/sdl_test.dir/graphics/graphics.cpp.obj and b/CMakeFiles/sdl_test.dir/graphics/graphics.cpp.obj differ diff --git a/CMakeFiles/sdl_test.dir/main.cpp.obj b/CMakeFiles/sdl_test.dir/main.cpp.obj index 902c25e..d873aa1 100644 Binary files a/CMakeFiles/sdl_test.dir/main.cpp.obj and b/CMakeFiles/sdl_test.dir/main.cpp.obj differ diff --git a/CMakeFiles/sdl_test.dir/objects.a b/CMakeFiles/sdl_test.dir/objects.a index f1914f9..35d3bbc 100644 Binary files a/CMakeFiles/sdl_test.dir/objects.a and b/CMakeFiles/sdl_test.dir/objects.a differ -- cgit v1.2.3-54-g00ecf