integrating tileson with the project for tmx parsing
This commit is contained in:
Alan Youngblood
parent
8aa79741e4
commit
352034790c
@ -24,5 +24,18 @@ Configured Launchers=nativeAppLauncher
|
||||
Name=New Compiled Binary Launcher
|
||||
Type=Native Application
|
||||
|
||||
[Launch][Launch Configuration 0][Data]
|
||||
Arguments=
|
||||
Dependencies=@Variant(\x00\x00\x00\t\x00\x00\x00\x00\x00)
|
||||
Dependency Action=Build
|
||||
EnvironmentGroup=
|
||||
Executable=file:///home/ayoungblood/Projects/BeagleRescue
|
||||
External Terminal=konsole --noclose --workdir %workdir -e %exe
|
||||
Kill Before Executing Again=4194304
|
||||
Project Target=BeagleRescue,BeagleRescue
|
||||
Use External Terminal=false
|
||||
Working Directory=
|
||||
isExecutable=true
|
||||
|
||||
[Project]
|
||||
VersionControlSupport=kdevgit
|
||||
|
||||
BIN
BeagleRescue
BIN
BeagleRescue
Binary file not shown.
@ -11,6 +11,7 @@ set(CMAKE_DEPENDS_DEPENDENCY_FILES
|
||||
"/home/ayoungblood/Projects/BeagleRescue/src/cjson/cJSON.c" "CMakeFiles/BeagleRescue.dir/src/cjson/cJSON.c.o" "gcc" "CMakeFiles/BeagleRescue.dir/src/cjson/cJSON.c.o.d"
|
||||
"/home/ayoungblood/Projects/BeagleRescue/src/assetmgr/AssetManager.cpp" "CMakeFiles/BeagleRescue.dir/src/assetmgr/AssetManager.cpp.o" "gcc" "CMakeFiles/BeagleRescue.dir/src/assetmgr/AssetManager.cpp.o.d"
|
||||
"/home/ayoungblood/Projects/BeagleRescue/src/assetmgr/GameObject.cpp" "CMakeFiles/BeagleRescue.dir/src/assetmgr/GameObject.cpp.o" "gcc" "CMakeFiles/BeagleRescue.dir/src/assetmgr/GameObject.cpp.o.d"
|
||||
"/home/ayoungblood/Projects/BeagleRescue/src/assetmgr/Map.cpp" "CMakeFiles/BeagleRescue.dir/src/assetmgr/Map.cpp.o" "gcc" "CMakeFiles/BeagleRescue.dir/src/assetmgr/Map.cpp.o.d"
|
||||
"/home/ayoungblood/Projects/BeagleRescue/src/assetmgr/MusicManager.cpp" "CMakeFiles/BeagleRescue.dir/src/assetmgr/MusicManager.cpp.o" "gcc" "CMakeFiles/BeagleRescue.dir/src/assetmgr/MusicManager.cpp.o.d"
|
||||
"/home/ayoungblood/Projects/BeagleRescue/src/assetmgr/TextureManager.cpp" "CMakeFiles/BeagleRescue.dir/src/assetmgr/TextureManager.cpp.o" "gcc" "CMakeFiles/BeagleRescue.dir/src/assetmgr/TextureManager.cpp.o.d"
|
||||
"/home/ayoungblood/Projects/BeagleRescue/src/ecs/ECS.cpp" "CMakeFiles/BeagleRescue.dir/src/ecs/ECS.cpp.o" "gcc" "CMakeFiles/BeagleRescue.dir/src/ecs/ECS.cpp.o.d"
|
||||
|
||||
@ -111,10 +111,24 @@ CMakeFiles/BeagleRescue.dir/src/assetmgr/GameObject.cpp.s: cmake_force
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/BeagleRescue.dir/src/assetmgr/GameObject.cpp.s"
|
||||
/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /home/ayoungblood/Projects/BeagleRescue/src/assetmgr/GameObject.cpp -o CMakeFiles/BeagleRescue.dir/src/assetmgr/GameObject.cpp.s
|
||||
|
||||
CMakeFiles/BeagleRescue.dir/src/assetmgr/Map.cpp.o: CMakeFiles/BeagleRescue.dir/flags.make
|
||||
CMakeFiles/BeagleRescue.dir/src/assetmgr/Map.cpp.o: src/assetmgr/Map.cpp
|
||||
CMakeFiles/BeagleRescue.dir/src/assetmgr/Map.cpp.o: CMakeFiles/BeagleRescue.dir/compiler_depend.ts
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/ayoungblood/Projects/BeagleRescue/CMakeFiles --progress-num=$(CMAKE_PROGRESS_4) "Building CXX object CMakeFiles/BeagleRescue.dir/src/assetmgr/Map.cpp.o"
|
||||
/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -MD -MT CMakeFiles/BeagleRescue.dir/src/assetmgr/Map.cpp.o -MF CMakeFiles/BeagleRescue.dir/src/assetmgr/Map.cpp.o.d -o CMakeFiles/BeagleRescue.dir/src/assetmgr/Map.cpp.o -c /home/ayoungblood/Projects/BeagleRescue/src/assetmgr/Map.cpp
|
||||
|
||||
CMakeFiles/BeagleRescue.dir/src/assetmgr/Map.cpp.i: cmake_force
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/BeagleRescue.dir/src/assetmgr/Map.cpp.i"
|
||||
/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /home/ayoungblood/Projects/BeagleRescue/src/assetmgr/Map.cpp > CMakeFiles/BeagleRescue.dir/src/assetmgr/Map.cpp.i
|
||||
|
||||
CMakeFiles/BeagleRescue.dir/src/assetmgr/Map.cpp.s: cmake_force
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/BeagleRescue.dir/src/assetmgr/Map.cpp.s"
|
||||
/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /home/ayoungblood/Projects/BeagleRescue/src/assetmgr/Map.cpp -o CMakeFiles/BeagleRescue.dir/src/assetmgr/Map.cpp.s
|
||||
|
||||
CMakeFiles/BeagleRescue.dir/src/assetmgr/MusicManager.cpp.o: CMakeFiles/BeagleRescue.dir/flags.make
|
||||
CMakeFiles/BeagleRescue.dir/src/assetmgr/MusicManager.cpp.o: src/assetmgr/MusicManager.cpp
|
||||
CMakeFiles/BeagleRescue.dir/src/assetmgr/MusicManager.cpp.o: CMakeFiles/BeagleRescue.dir/compiler_depend.ts
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/ayoungblood/Projects/BeagleRescue/CMakeFiles --progress-num=$(CMAKE_PROGRESS_4) "Building CXX object CMakeFiles/BeagleRescue.dir/src/assetmgr/MusicManager.cpp.o"
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/ayoungblood/Projects/BeagleRescue/CMakeFiles --progress-num=$(CMAKE_PROGRESS_5) "Building CXX object CMakeFiles/BeagleRescue.dir/src/assetmgr/MusicManager.cpp.o"
|
||||
/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -MD -MT CMakeFiles/BeagleRescue.dir/src/assetmgr/MusicManager.cpp.o -MF CMakeFiles/BeagleRescue.dir/src/assetmgr/MusicManager.cpp.o.d -o CMakeFiles/BeagleRescue.dir/src/assetmgr/MusicManager.cpp.o -c /home/ayoungblood/Projects/BeagleRescue/src/assetmgr/MusicManager.cpp
|
||||
|
||||
CMakeFiles/BeagleRescue.dir/src/assetmgr/MusicManager.cpp.i: cmake_force
|
||||
@ -128,7 +142,7 @@ CMakeFiles/BeagleRescue.dir/src/assetmgr/MusicManager.cpp.s: cmake_force
|
||||
CMakeFiles/BeagleRescue.dir/src/assetmgr/TextureManager.cpp.o: CMakeFiles/BeagleRescue.dir/flags.make
|
||||
CMakeFiles/BeagleRescue.dir/src/assetmgr/TextureManager.cpp.o: src/assetmgr/TextureManager.cpp
|
||||
CMakeFiles/BeagleRescue.dir/src/assetmgr/TextureManager.cpp.o: CMakeFiles/BeagleRescue.dir/compiler_depend.ts
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/ayoungblood/Projects/BeagleRescue/CMakeFiles --progress-num=$(CMAKE_PROGRESS_5) "Building CXX object CMakeFiles/BeagleRescue.dir/src/assetmgr/TextureManager.cpp.o"
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/ayoungblood/Projects/BeagleRescue/CMakeFiles --progress-num=$(CMAKE_PROGRESS_6) "Building CXX object CMakeFiles/BeagleRescue.dir/src/assetmgr/TextureManager.cpp.o"
|
||||
/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -MD -MT CMakeFiles/BeagleRescue.dir/src/assetmgr/TextureManager.cpp.o -MF CMakeFiles/BeagleRescue.dir/src/assetmgr/TextureManager.cpp.o.d -o CMakeFiles/BeagleRescue.dir/src/assetmgr/TextureManager.cpp.o -c /home/ayoungblood/Projects/BeagleRescue/src/assetmgr/TextureManager.cpp
|
||||
|
||||
CMakeFiles/BeagleRescue.dir/src/assetmgr/TextureManager.cpp.i: cmake_force
|
||||
@ -142,7 +156,7 @@ CMakeFiles/BeagleRescue.dir/src/assetmgr/TextureManager.cpp.s: cmake_force
|
||||
CMakeFiles/BeagleRescue.dir/src/ecs/ECS.cpp.o: CMakeFiles/BeagleRescue.dir/flags.make
|
||||
CMakeFiles/BeagleRescue.dir/src/ecs/ECS.cpp.o: src/ecs/ECS.cpp
|
||||
CMakeFiles/BeagleRescue.dir/src/ecs/ECS.cpp.o: CMakeFiles/BeagleRescue.dir/compiler_depend.ts
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/ayoungblood/Projects/BeagleRescue/CMakeFiles --progress-num=$(CMAKE_PROGRESS_6) "Building CXX object CMakeFiles/BeagleRescue.dir/src/ecs/ECS.cpp.o"
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/ayoungblood/Projects/BeagleRescue/CMakeFiles --progress-num=$(CMAKE_PROGRESS_7) "Building CXX object CMakeFiles/BeagleRescue.dir/src/ecs/ECS.cpp.o"
|
||||
/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -MD -MT CMakeFiles/BeagleRescue.dir/src/ecs/ECS.cpp.o -MF CMakeFiles/BeagleRescue.dir/src/ecs/ECS.cpp.o.d -o CMakeFiles/BeagleRescue.dir/src/ecs/ECS.cpp.o -c /home/ayoungblood/Projects/BeagleRescue/src/ecs/ECS.cpp
|
||||
|
||||
CMakeFiles/BeagleRescue.dir/src/ecs/ECS.cpp.i: cmake_force
|
||||
@ -156,7 +170,7 @@ CMakeFiles/BeagleRescue.dir/src/ecs/ECS.cpp.s: cmake_force
|
||||
CMakeFiles/BeagleRescue.dir/src/game/Collision.cpp.o: CMakeFiles/BeagleRescue.dir/flags.make
|
||||
CMakeFiles/BeagleRescue.dir/src/game/Collision.cpp.o: src/game/Collision.cpp
|
||||
CMakeFiles/BeagleRescue.dir/src/game/Collision.cpp.o: CMakeFiles/BeagleRescue.dir/compiler_depend.ts
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/ayoungblood/Projects/BeagleRescue/CMakeFiles --progress-num=$(CMAKE_PROGRESS_7) "Building CXX object CMakeFiles/BeagleRescue.dir/src/game/Collision.cpp.o"
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/ayoungblood/Projects/BeagleRescue/CMakeFiles --progress-num=$(CMAKE_PROGRESS_8) "Building CXX object CMakeFiles/BeagleRescue.dir/src/game/Collision.cpp.o"
|
||||
/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -MD -MT CMakeFiles/BeagleRescue.dir/src/game/Collision.cpp.o -MF CMakeFiles/BeagleRescue.dir/src/game/Collision.cpp.o.d -o CMakeFiles/BeagleRescue.dir/src/game/Collision.cpp.o -c /home/ayoungblood/Projects/BeagleRescue/src/game/Collision.cpp
|
||||
|
||||
CMakeFiles/BeagleRescue.dir/src/game/Collision.cpp.i: cmake_force
|
||||
@ -170,7 +184,7 @@ CMakeFiles/BeagleRescue.dir/src/game/Collision.cpp.s: cmake_force
|
||||
CMakeFiles/BeagleRescue.dir/src/game/Game.cpp.o: CMakeFiles/BeagleRescue.dir/flags.make
|
||||
CMakeFiles/BeagleRescue.dir/src/game/Game.cpp.o: src/game/Game.cpp
|
||||
CMakeFiles/BeagleRescue.dir/src/game/Game.cpp.o: CMakeFiles/BeagleRescue.dir/compiler_depend.ts
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/ayoungblood/Projects/BeagleRescue/CMakeFiles --progress-num=$(CMAKE_PROGRESS_8) "Building CXX object CMakeFiles/BeagleRescue.dir/src/game/Game.cpp.o"
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/ayoungblood/Projects/BeagleRescue/CMakeFiles --progress-num=$(CMAKE_PROGRESS_9) "Building CXX object CMakeFiles/BeagleRescue.dir/src/game/Game.cpp.o"
|
||||
/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -MD -MT CMakeFiles/BeagleRescue.dir/src/game/Game.cpp.o -MF CMakeFiles/BeagleRescue.dir/src/game/Game.cpp.o.d -o CMakeFiles/BeagleRescue.dir/src/game/Game.cpp.o -c /home/ayoungblood/Projects/BeagleRescue/src/game/Game.cpp
|
||||
|
||||
CMakeFiles/BeagleRescue.dir/src/game/Game.cpp.i: cmake_force
|
||||
@ -184,7 +198,7 @@ CMakeFiles/BeagleRescue.dir/src/game/Game.cpp.s: cmake_force
|
||||
CMakeFiles/BeagleRescue.dir/src/game/GameStateManager.cpp.o: CMakeFiles/BeagleRescue.dir/flags.make
|
||||
CMakeFiles/BeagleRescue.dir/src/game/GameStateManager.cpp.o: src/game/GameStateManager.cpp
|
||||
CMakeFiles/BeagleRescue.dir/src/game/GameStateManager.cpp.o: CMakeFiles/BeagleRescue.dir/compiler_depend.ts
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/ayoungblood/Projects/BeagleRescue/CMakeFiles --progress-num=$(CMAKE_PROGRESS_9) "Building CXX object CMakeFiles/BeagleRescue.dir/src/game/GameStateManager.cpp.o"
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/ayoungblood/Projects/BeagleRescue/CMakeFiles --progress-num=$(CMAKE_PROGRESS_10) "Building CXX object CMakeFiles/BeagleRescue.dir/src/game/GameStateManager.cpp.o"
|
||||
/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -MD -MT CMakeFiles/BeagleRescue.dir/src/game/GameStateManager.cpp.o -MF CMakeFiles/BeagleRescue.dir/src/game/GameStateManager.cpp.o.d -o CMakeFiles/BeagleRescue.dir/src/game/GameStateManager.cpp.o -c /home/ayoungblood/Projects/BeagleRescue/src/game/GameStateManager.cpp
|
||||
|
||||
CMakeFiles/BeagleRescue.dir/src/game/GameStateManager.cpp.i: cmake_force
|
||||
@ -198,7 +212,7 @@ CMakeFiles/BeagleRescue.dir/src/game/GameStateManager.cpp.s: cmake_force
|
||||
CMakeFiles/BeagleRescue.dir/src/game/Main.cpp.o: CMakeFiles/BeagleRescue.dir/flags.make
|
||||
CMakeFiles/BeagleRescue.dir/src/game/Main.cpp.o: src/game/Main.cpp
|
||||
CMakeFiles/BeagleRescue.dir/src/game/Main.cpp.o: CMakeFiles/BeagleRescue.dir/compiler_depend.ts
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/ayoungblood/Projects/BeagleRescue/CMakeFiles --progress-num=$(CMAKE_PROGRESS_10) "Building CXX object CMakeFiles/BeagleRescue.dir/src/game/Main.cpp.o"
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/ayoungblood/Projects/BeagleRescue/CMakeFiles --progress-num=$(CMAKE_PROGRESS_11) "Building CXX object CMakeFiles/BeagleRescue.dir/src/game/Main.cpp.o"
|
||||
/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -MD -MT CMakeFiles/BeagleRescue.dir/src/game/Main.cpp.o -MF CMakeFiles/BeagleRescue.dir/src/game/Main.cpp.o.d -o CMakeFiles/BeagleRescue.dir/src/game/Main.cpp.o -c /home/ayoungblood/Projects/BeagleRescue/src/game/Main.cpp
|
||||
|
||||
CMakeFiles/BeagleRescue.dir/src/game/Main.cpp.i: cmake_force
|
||||
@ -212,7 +226,7 @@ CMakeFiles/BeagleRescue.dir/src/game/Main.cpp.s: cmake_force
|
||||
CMakeFiles/BeagleRescue.dir/src/game/StateMachine.cpp.o: CMakeFiles/BeagleRescue.dir/flags.make
|
||||
CMakeFiles/BeagleRescue.dir/src/game/StateMachine.cpp.o: src/game/StateMachine.cpp
|
||||
CMakeFiles/BeagleRescue.dir/src/game/StateMachine.cpp.o: CMakeFiles/BeagleRescue.dir/compiler_depend.ts
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/ayoungblood/Projects/BeagleRescue/CMakeFiles --progress-num=$(CMAKE_PROGRESS_11) "Building CXX object CMakeFiles/BeagleRescue.dir/src/game/StateMachine.cpp.o"
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/ayoungblood/Projects/BeagleRescue/CMakeFiles --progress-num=$(CMAKE_PROGRESS_12) "Building CXX object CMakeFiles/BeagleRescue.dir/src/game/StateMachine.cpp.o"
|
||||
/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -MD -MT CMakeFiles/BeagleRescue.dir/src/game/StateMachine.cpp.o -MF CMakeFiles/BeagleRescue.dir/src/game/StateMachine.cpp.o.d -o CMakeFiles/BeagleRescue.dir/src/game/StateMachine.cpp.o -c /home/ayoungblood/Projects/BeagleRescue/src/game/StateMachine.cpp
|
||||
|
||||
CMakeFiles/BeagleRescue.dir/src/game/StateMachine.cpp.i: cmake_force
|
||||
@ -226,7 +240,7 @@ CMakeFiles/BeagleRescue.dir/src/game/StateMachine.cpp.s: cmake_force
|
||||
CMakeFiles/BeagleRescue.dir/src/game/Vector2D.cpp.o: CMakeFiles/BeagleRescue.dir/flags.make
|
||||
CMakeFiles/BeagleRescue.dir/src/game/Vector2D.cpp.o: src/game/Vector2D.cpp
|
||||
CMakeFiles/BeagleRescue.dir/src/game/Vector2D.cpp.o: CMakeFiles/BeagleRescue.dir/compiler_depend.ts
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/ayoungblood/Projects/BeagleRescue/CMakeFiles --progress-num=$(CMAKE_PROGRESS_12) "Building CXX object CMakeFiles/BeagleRescue.dir/src/game/Vector2D.cpp.o"
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/ayoungblood/Projects/BeagleRescue/CMakeFiles --progress-num=$(CMAKE_PROGRESS_13) "Building CXX object CMakeFiles/BeagleRescue.dir/src/game/Vector2D.cpp.o"
|
||||
/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -MD -MT CMakeFiles/BeagleRescue.dir/src/game/Vector2D.cpp.o -MF CMakeFiles/BeagleRescue.dir/src/game/Vector2D.cpp.o.d -o CMakeFiles/BeagleRescue.dir/src/game/Vector2D.cpp.o -c /home/ayoungblood/Projects/BeagleRescue/src/game/Vector2D.cpp
|
||||
|
||||
CMakeFiles/BeagleRescue.dir/src/game/Vector2D.cpp.i: cmake_force
|
||||
@ -240,7 +254,7 @@ CMakeFiles/BeagleRescue.dir/src/game/Vector2D.cpp.s: cmake_force
|
||||
CMakeFiles/BeagleRescue.dir/src/ui/UINineSlice.cpp.o: CMakeFiles/BeagleRescue.dir/flags.make
|
||||
CMakeFiles/BeagleRescue.dir/src/ui/UINineSlice.cpp.o: src/ui/UINineSlice.cpp
|
||||
CMakeFiles/BeagleRescue.dir/src/ui/UINineSlice.cpp.o: CMakeFiles/BeagleRescue.dir/compiler_depend.ts
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/ayoungblood/Projects/BeagleRescue/CMakeFiles --progress-num=$(CMAKE_PROGRESS_13) "Building CXX object CMakeFiles/BeagleRescue.dir/src/ui/UINineSlice.cpp.o"
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/ayoungblood/Projects/BeagleRescue/CMakeFiles --progress-num=$(CMAKE_PROGRESS_14) "Building CXX object CMakeFiles/BeagleRescue.dir/src/ui/UINineSlice.cpp.o"
|
||||
/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -MD -MT CMakeFiles/BeagleRescue.dir/src/ui/UINineSlice.cpp.o -MF CMakeFiles/BeagleRescue.dir/src/ui/UINineSlice.cpp.o.d -o CMakeFiles/BeagleRescue.dir/src/ui/UINineSlice.cpp.o -c /home/ayoungblood/Projects/BeagleRescue/src/ui/UINineSlice.cpp
|
||||
|
||||
CMakeFiles/BeagleRescue.dir/src/ui/UINineSlice.cpp.i: cmake_force
|
||||
@ -254,7 +268,7 @@ CMakeFiles/BeagleRescue.dir/src/ui/UINineSlice.cpp.s: cmake_force
|
||||
CMakeFiles/BeagleRescue.dir/src/ui/UIText.cpp.o: CMakeFiles/BeagleRescue.dir/flags.make
|
||||
CMakeFiles/BeagleRescue.dir/src/ui/UIText.cpp.o: src/ui/UIText.cpp
|
||||
CMakeFiles/BeagleRescue.dir/src/ui/UIText.cpp.o: CMakeFiles/BeagleRescue.dir/compiler_depend.ts
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/ayoungblood/Projects/BeagleRescue/CMakeFiles --progress-num=$(CMAKE_PROGRESS_14) "Building CXX object CMakeFiles/BeagleRescue.dir/src/ui/UIText.cpp.o"
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/ayoungblood/Projects/BeagleRescue/CMakeFiles --progress-num=$(CMAKE_PROGRESS_15) "Building CXX object CMakeFiles/BeagleRescue.dir/src/ui/UIText.cpp.o"
|
||||
/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -MD -MT CMakeFiles/BeagleRescue.dir/src/ui/UIText.cpp.o -MF CMakeFiles/BeagleRescue.dir/src/ui/UIText.cpp.o.d -o CMakeFiles/BeagleRescue.dir/src/ui/UIText.cpp.o -c /home/ayoungblood/Projects/BeagleRescue/src/ui/UIText.cpp
|
||||
|
||||
CMakeFiles/BeagleRescue.dir/src/ui/UIText.cpp.i: cmake_force
|
||||
@ -270,6 +284,7 @@ BeagleRescue_OBJECTS = \
|
||||
"CMakeFiles/BeagleRescue.dir/src/cjson/cJSON.c.o" \
|
||||
"CMakeFiles/BeagleRescue.dir/src/assetmgr/AssetManager.cpp.o" \
|
||||
"CMakeFiles/BeagleRescue.dir/src/assetmgr/GameObject.cpp.o" \
|
||||
"CMakeFiles/BeagleRescue.dir/src/assetmgr/Map.cpp.o" \
|
||||
"CMakeFiles/BeagleRescue.dir/src/assetmgr/MusicManager.cpp.o" \
|
||||
"CMakeFiles/BeagleRescue.dir/src/assetmgr/TextureManager.cpp.o" \
|
||||
"CMakeFiles/BeagleRescue.dir/src/ecs/ECS.cpp.o" \
|
||||
@ -288,6 +303,7 @@ BeagleRescue_EXTERNAL_OBJECTS =
|
||||
BeagleRescue: CMakeFiles/BeagleRescue.dir/src/cjson/cJSON.c.o
|
||||
BeagleRescue: CMakeFiles/BeagleRescue.dir/src/assetmgr/AssetManager.cpp.o
|
||||
BeagleRescue: CMakeFiles/BeagleRescue.dir/src/assetmgr/GameObject.cpp.o
|
||||
BeagleRescue: CMakeFiles/BeagleRescue.dir/src/assetmgr/Map.cpp.o
|
||||
BeagleRescue: CMakeFiles/BeagleRescue.dir/src/assetmgr/MusicManager.cpp.o
|
||||
BeagleRescue: CMakeFiles/BeagleRescue.dir/src/assetmgr/TextureManager.cpp.o
|
||||
BeagleRescue: CMakeFiles/BeagleRescue.dir/src/ecs/ECS.cpp.o
|
||||
@ -301,7 +317,7 @@ BeagleRescue: CMakeFiles/BeagleRescue.dir/src/ui/UINineSlice.cpp.o
|
||||
BeagleRescue: CMakeFiles/BeagleRescue.dir/src/ui/UIText.cpp.o
|
||||
BeagleRescue: CMakeFiles/BeagleRescue.dir/build.make
|
||||
BeagleRescue: CMakeFiles/BeagleRescue.dir/link.txt
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --bold --progress-dir=/home/ayoungblood/Projects/BeagleRescue/CMakeFiles --progress-num=$(CMAKE_PROGRESS_15) "Linking CXX executable BeagleRescue"
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --bold --progress-dir=/home/ayoungblood/Projects/BeagleRescue/CMakeFiles --progress-num=$(CMAKE_PROGRESS_16) "Linking CXX executable BeagleRescue"
|
||||
$(CMAKE_COMMAND) -E cmake_link_script CMakeFiles/BeagleRescue.dir/link.txt --verbose=$(VERBOSE)
|
||||
|
||||
# Rule to build all files generated by this target.
|
||||
|
||||
@ -5,6 +5,8 @@ file(REMOVE_RECURSE
|
||||
"CMakeFiles/BeagleRescue.dir/src/assetmgr/AssetManager.cpp.o.d"
|
||||
"CMakeFiles/BeagleRescue.dir/src/assetmgr/GameObject.cpp.o"
|
||||
"CMakeFiles/BeagleRescue.dir/src/assetmgr/GameObject.cpp.o.d"
|
||||
"CMakeFiles/BeagleRescue.dir/src/assetmgr/Map.cpp.o"
|
||||
"CMakeFiles/BeagleRescue.dir/src/assetmgr/Map.cpp.o.d"
|
||||
"CMakeFiles/BeagleRescue.dir/src/assetmgr/MusicManager.cpp.o"
|
||||
"CMakeFiles/BeagleRescue.dir/src/assetmgr/MusicManager.cpp.o.d"
|
||||
"CMakeFiles/BeagleRescue.dir/src/assetmgr/TextureManager.cpp.o"
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -13,5 +13,5 @@ CXX_DEFINES =
|
||||
|
||||
CXX_INCLUDES = -I/home/ayoungblood/Projects/BeagleRescue/BeagleRescue -I/usr/include/SDL2 -I/usr/include/libpng16 -I/usr/include/glib-2.0 -I/usr/lib/aarch64-linux-gnu/glib-2.0/include -I/usr/include/opus -I/usr/include/dbus-1.0 -I/usr/lib/aarch64-linux-gnu/dbus-1.0/include -I/usr/include/libinstpatch-2
|
||||
|
||||
CXX_FLAGS = -O3 -DNDEBUG -Wall -std=gnu++11
|
||||
CXX_FLAGS = -O3 -DNDEBUG -Wall -std=gnu++17
|
||||
|
||||
|
||||
@ -1 +1 @@
|
||||
/usr/bin/c++ -O3 -DNDEBUG CMakeFiles/BeagleRescue.dir/src/cjson/cJSON.c.o CMakeFiles/BeagleRescue.dir/src/assetmgr/AssetManager.cpp.o CMakeFiles/BeagleRescue.dir/src/assetmgr/GameObject.cpp.o CMakeFiles/BeagleRescue.dir/src/assetmgr/MusicManager.cpp.o CMakeFiles/BeagleRescue.dir/src/assetmgr/TextureManager.cpp.o CMakeFiles/BeagleRescue.dir/src/ecs/ECS.cpp.o CMakeFiles/BeagleRescue.dir/src/game/Collision.cpp.o CMakeFiles/BeagleRescue.dir/src/game/Game.cpp.o CMakeFiles/BeagleRescue.dir/src/game/GameStateManager.cpp.o CMakeFiles/BeagleRescue.dir/src/game/Main.cpp.o CMakeFiles/BeagleRescue.dir/src/game/StateMachine.cpp.o CMakeFiles/BeagleRescue.dir/src/game/Vector2D.cpp.o CMakeFiles/BeagleRescue.dir/src/ui/UINineSlice.cpp.o CMakeFiles/BeagleRescue.dir/src/ui/UIText.cpp.o -o BeagleRescue -lSDL2 -lSDL2_image -lSDL2 -lSDL2_mixer -lSDL2 -lSDL2_image -lSDL2_mixer
|
||||
/usr/bin/c++ -O3 -DNDEBUG CMakeFiles/BeagleRescue.dir/src/cjson/cJSON.c.o CMakeFiles/BeagleRescue.dir/src/assetmgr/AssetManager.cpp.o CMakeFiles/BeagleRescue.dir/src/assetmgr/GameObject.cpp.o CMakeFiles/BeagleRescue.dir/src/assetmgr/Map.cpp.o CMakeFiles/BeagleRescue.dir/src/assetmgr/MusicManager.cpp.o CMakeFiles/BeagleRescue.dir/src/assetmgr/TextureManager.cpp.o CMakeFiles/BeagleRescue.dir/src/ecs/ECS.cpp.o CMakeFiles/BeagleRescue.dir/src/game/Collision.cpp.o CMakeFiles/BeagleRescue.dir/src/game/Game.cpp.o CMakeFiles/BeagleRescue.dir/src/game/GameStateManager.cpp.o CMakeFiles/BeagleRescue.dir/src/game/Main.cpp.o CMakeFiles/BeagleRescue.dir/src/game/StateMachine.cpp.o CMakeFiles/BeagleRescue.dir/src/game/Vector2D.cpp.o CMakeFiles/BeagleRescue.dir/src/ui/UINineSlice.cpp.o CMakeFiles/BeagleRescue.dir/src/ui/UIText.cpp.o -o BeagleRescue -lSDL2 -lSDL2_image -lSDL2 -lSDL2_mixer -lSDL2 -lSDL2_image -lSDL2_mixer
|
||||
|
||||
@ -13,4 +13,5 @@ CMAKE_PROGRESS_12 = 12
|
||||
CMAKE_PROGRESS_13 = 13
|
||||
CMAKE_PROGRESS_14 = 14
|
||||
CMAKE_PROGRESS_15 = 15
|
||||
CMAKE_PROGRESS_16 = 16
|
||||
|
||||
|
||||
@ -81,12 +81,12 @@ clean: CMakeFiles/BeagleRescue.dir/clean
|
||||
CMakeFiles/BeagleRescue.dir/all:
|
||||
$(MAKE) $(MAKESILENT) -f CMakeFiles/BeagleRescue.dir/build.make CMakeFiles/BeagleRescue.dir/depend
|
||||
$(MAKE) $(MAKESILENT) -f CMakeFiles/BeagleRescue.dir/build.make CMakeFiles/BeagleRescue.dir/build
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/ayoungblood/Projects/BeagleRescue/CMakeFiles --progress-num=1,2,3,4,5,6,7,8,9,10,11,12,13,14,15 "Built target BeagleRescue"
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/ayoungblood/Projects/BeagleRescue/CMakeFiles --progress-num=1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16 "Built target BeagleRescue"
|
||||
.PHONY : CMakeFiles/BeagleRescue.dir/all
|
||||
|
||||
# Build rule for subdir invocation for target.
|
||||
CMakeFiles/BeagleRescue.dir/rule: cmake_check_build_system
|
||||
$(CMAKE_COMMAND) -E cmake_progress_start /home/ayoungblood/Projects/BeagleRescue/CMakeFiles 15
|
||||
$(CMAKE_COMMAND) -E cmake_progress_start /home/ayoungblood/Projects/BeagleRescue/CMakeFiles 16
|
||||
$(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 CMakeFiles/BeagleRescue.dir/all
|
||||
$(CMAKE_COMMAND) -E cmake_progress_start /home/ayoungblood/Projects/BeagleRescue/CMakeFiles 0
|
||||
.PHONY : CMakeFiles/BeagleRescue.dir/rule
|
||||
|
||||
@ -1 +1 @@
|
||||
15
|
||||
16
|
||||
|
||||
@ -1,7 +1,8 @@
|
||||
cmake_minimum_required(VERSION 3.14)
|
||||
project(BeagleRescue VERSION 1.0.0 )
|
||||
|
||||
set(CMAKE_CXX_STANDARD 11)
|
||||
#set(CMAKE_CXX_STANDARD 11) # old requirements
|
||||
set(CMAKE_CXX_STANDARD 17) # new requirements for tileson
|
||||
set(CMAKE_CXX_REQUIRED ON)
|
||||
|
||||
include(FetchContent)
|
||||
|
||||
27
Makefile
27
Makefile
@ -222,6 +222,30 @@ src/assetmgr/GameObject.cpp.s:
|
||||
$(MAKE) $(MAKESILENT) -f CMakeFiles/BeagleRescue.dir/build.make CMakeFiles/BeagleRescue.dir/src/assetmgr/GameObject.cpp.s
|
||||
.PHONY : src/assetmgr/GameObject.cpp.s
|
||||
|
||||
src/assetmgr/Map.o: src/assetmgr/Map.cpp.o
|
||||
.PHONY : src/assetmgr/Map.o
|
||||
|
||||
# target to build an object file
|
||||
src/assetmgr/Map.cpp.o:
|
||||
$(MAKE) $(MAKESILENT) -f CMakeFiles/BeagleRescue.dir/build.make CMakeFiles/BeagleRescue.dir/src/assetmgr/Map.cpp.o
|
||||
.PHONY : src/assetmgr/Map.cpp.o
|
||||
|
||||
src/assetmgr/Map.i: src/assetmgr/Map.cpp.i
|
||||
.PHONY : src/assetmgr/Map.i
|
||||
|
||||
# target to preprocess a source file
|
||||
src/assetmgr/Map.cpp.i:
|
||||
$(MAKE) $(MAKESILENT) -f CMakeFiles/BeagleRescue.dir/build.make CMakeFiles/BeagleRescue.dir/src/assetmgr/Map.cpp.i
|
||||
.PHONY : src/assetmgr/Map.cpp.i
|
||||
|
||||
src/assetmgr/Map.s: src/assetmgr/Map.cpp.s
|
||||
.PHONY : src/assetmgr/Map.s
|
||||
|
||||
# target to generate assembly for a file
|
||||
src/assetmgr/Map.cpp.s:
|
||||
$(MAKE) $(MAKESILENT) -f CMakeFiles/BeagleRescue.dir/build.make CMakeFiles/BeagleRescue.dir/src/assetmgr/Map.cpp.s
|
||||
.PHONY : src/assetmgr/Map.cpp.s
|
||||
|
||||
src/assetmgr/MusicManager.o: src/assetmgr/MusicManager.cpp.o
|
||||
.PHONY : src/assetmgr/MusicManager.o
|
||||
|
||||
@ -529,6 +553,9 @@ help:
|
||||
@echo "... src/assetmgr/GameObject.o"
|
||||
@echo "... src/assetmgr/GameObject.i"
|
||||
@echo "... src/assetmgr/GameObject.s"
|
||||
@echo "... src/assetmgr/Map.o"
|
||||
@echo "... src/assetmgr/Map.i"
|
||||
@echo "... src/assetmgr/Map.s"
|
||||
@echo "... src/assetmgr/MusicManager.o"
|
||||
@echo "... src/assetmgr/MusicManager.i"
|
||||
@echo "... src/assetmgr/MusicManager.s"
|
||||
|
||||
@ -6,67 +6,72 @@
|
||||
},
|
||||
{
|
||||
"directory": "/home/ayoungblood/Projects/BeagleRescue",
|
||||
"command": "/usr/bin/c++ -I/home/ayoungblood/Projects/BeagleRescue/BeagleRescue -I/usr/include/SDL2 -I/usr/include/libpng16 -I/usr/include/glib-2.0 -I/usr/lib/aarch64-linux-gnu/glib-2.0/include -I/usr/include/opus -I/usr/include/dbus-1.0 -I/usr/lib/aarch64-linux-gnu/dbus-1.0/include -I/usr/include/libinstpatch-2 -O3 -DNDEBUG -Wall -std=gnu++11 -o CMakeFiles/BeagleRescue.dir/src/assetmgr/AssetManager.cpp.o -c /home/ayoungblood/Projects/BeagleRescue/src/assetmgr/AssetManager.cpp",
|
||||
"command": "/usr/bin/c++ -I/home/ayoungblood/Projects/BeagleRescue/BeagleRescue -I/usr/include/SDL2 -I/usr/include/libpng16 -I/usr/include/glib-2.0 -I/usr/lib/aarch64-linux-gnu/glib-2.0/include -I/usr/include/opus -I/usr/include/dbus-1.0 -I/usr/lib/aarch64-linux-gnu/dbus-1.0/include -I/usr/include/libinstpatch-2 -O3 -DNDEBUG -Wall -std=gnu++17 -o CMakeFiles/BeagleRescue.dir/src/assetmgr/AssetManager.cpp.o -c /home/ayoungblood/Projects/BeagleRescue/src/assetmgr/AssetManager.cpp",
|
||||
"file": "/home/ayoungblood/Projects/BeagleRescue/src/assetmgr/AssetManager.cpp"
|
||||
},
|
||||
{
|
||||
"directory": "/home/ayoungblood/Projects/BeagleRescue",
|
||||
"command": "/usr/bin/c++ -I/home/ayoungblood/Projects/BeagleRescue/BeagleRescue -I/usr/include/SDL2 -I/usr/include/libpng16 -I/usr/include/glib-2.0 -I/usr/lib/aarch64-linux-gnu/glib-2.0/include -I/usr/include/opus -I/usr/include/dbus-1.0 -I/usr/lib/aarch64-linux-gnu/dbus-1.0/include -I/usr/include/libinstpatch-2 -O3 -DNDEBUG -Wall -std=gnu++11 -o CMakeFiles/BeagleRescue.dir/src/assetmgr/GameObject.cpp.o -c /home/ayoungblood/Projects/BeagleRescue/src/assetmgr/GameObject.cpp",
|
||||
"command": "/usr/bin/c++ -I/home/ayoungblood/Projects/BeagleRescue/BeagleRescue -I/usr/include/SDL2 -I/usr/include/libpng16 -I/usr/include/glib-2.0 -I/usr/lib/aarch64-linux-gnu/glib-2.0/include -I/usr/include/opus -I/usr/include/dbus-1.0 -I/usr/lib/aarch64-linux-gnu/dbus-1.0/include -I/usr/include/libinstpatch-2 -O3 -DNDEBUG -Wall -std=gnu++17 -o CMakeFiles/BeagleRescue.dir/src/assetmgr/GameObject.cpp.o -c /home/ayoungblood/Projects/BeagleRescue/src/assetmgr/GameObject.cpp",
|
||||
"file": "/home/ayoungblood/Projects/BeagleRescue/src/assetmgr/GameObject.cpp"
|
||||
},
|
||||
{
|
||||
"directory": "/home/ayoungblood/Projects/BeagleRescue",
|
||||
"command": "/usr/bin/c++ -I/home/ayoungblood/Projects/BeagleRescue/BeagleRescue -I/usr/include/SDL2 -I/usr/include/libpng16 -I/usr/include/glib-2.0 -I/usr/lib/aarch64-linux-gnu/glib-2.0/include -I/usr/include/opus -I/usr/include/dbus-1.0 -I/usr/lib/aarch64-linux-gnu/dbus-1.0/include -I/usr/include/libinstpatch-2 -O3 -DNDEBUG -Wall -std=gnu++11 -o CMakeFiles/BeagleRescue.dir/src/assetmgr/MusicManager.cpp.o -c /home/ayoungblood/Projects/BeagleRescue/src/assetmgr/MusicManager.cpp",
|
||||
"command": "/usr/bin/c++ -I/home/ayoungblood/Projects/BeagleRescue/BeagleRescue -I/usr/include/SDL2 -I/usr/include/libpng16 -I/usr/include/glib-2.0 -I/usr/lib/aarch64-linux-gnu/glib-2.0/include -I/usr/include/opus -I/usr/include/dbus-1.0 -I/usr/lib/aarch64-linux-gnu/dbus-1.0/include -I/usr/include/libinstpatch-2 -O3 -DNDEBUG -Wall -std=gnu++17 -o CMakeFiles/BeagleRescue.dir/src/assetmgr/Map.cpp.o -c /home/ayoungblood/Projects/BeagleRescue/src/assetmgr/Map.cpp",
|
||||
"file": "/home/ayoungblood/Projects/BeagleRescue/src/assetmgr/Map.cpp"
|
||||
},
|
||||
{
|
||||
"directory": "/home/ayoungblood/Projects/BeagleRescue",
|
||||
"command": "/usr/bin/c++ -I/home/ayoungblood/Projects/BeagleRescue/BeagleRescue -I/usr/include/SDL2 -I/usr/include/libpng16 -I/usr/include/glib-2.0 -I/usr/lib/aarch64-linux-gnu/glib-2.0/include -I/usr/include/opus -I/usr/include/dbus-1.0 -I/usr/lib/aarch64-linux-gnu/dbus-1.0/include -I/usr/include/libinstpatch-2 -O3 -DNDEBUG -Wall -std=gnu++17 -o CMakeFiles/BeagleRescue.dir/src/assetmgr/MusicManager.cpp.o -c /home/ayoungblood/Projects/BeagleRescue/src/assetmgr/MusicManager.cpp",
|
||||
"file": "/home/ayoungblood/Projects/BeagleRescue/src/assetmgr/MusicManager.cpp"
|
||||
},
|
||||
{
|
||||
"directory": "/home/ayoungblood/Projects/BeagleRescue",
|
||||
"command": "/usr/bin/c++ -I/home/ayoungblood/Projects/BeagleRescue/BeagleRescue -I/usr/include/SDL2 -I/usr/include/libpng16 -I/usr/include/glib-2.0 -I/usr/lib/aarch64-linux-gnu/glib-2.0/include -I/usr/include/opus -I/usr/include/dbus-1.0 -I/usr/lib/aarch64-linux-gnu/dbus-1.0/include -I/usr/include/libinstpatch-2 -O3 -DNDEBUG -Wall -std=gnu++11 -o CMakeFiles/BeagleRescue.dir/src/assetmgr/TextureManager.cpp.o -c /home/ayoungblood/Projects/BeagleRescue/src/assetmgr/TextureManager.cpp",
|
||||
"command": "/usr/bin/c++ -I/home/ayoungblood/Projects/BeagleRescue/BeagleRescue -I/usr/include/SDL2 -I/usr/include/libpng16 -I/usr/include/glib-2.0 -I/usr/lib/aarch64-linux-gnu/glib-2.0/include -I/usr/include/opus -I/usr/include/dbus-1.0 -I/usr/lib/aarch64-linux-gnu/dbus-1.0/include -I/usr/include/libinstpatch-2 -O3 -DNDEBUG -Wall -std=gnu++17 -o CMakeFiles/BeagleRescue.dir/src/assetmgr/TextureManager.cpp.o -c /home/ayoungblood/Projects/BeagleRescue/src/assetmgr/TextureManager.cpp",
|
||||
"file": "/home/ayoungblood/Projects/BeagleRescue/src/assetmgr/TextureManager.cpp"
|
||||
},
|
||||
{
|
||||
"directory": "/home/ayoungblood/Projects/BeagleRescue",
|
||||
"command": "/usr/bin/c++ -I/home/ayoungblood/Projects/BeagleRescue/BeagleRescue -I/usr/include/SDL2 -I/usr/include/libpng16 -I/usr/include/glib-2.0 -I/usr/lib/aarch64-linux-gnu/glib-2.0/include -I/usr/include/opus -I/usr/include/dbus-1.0 -I/usr/lib/aarch64-linux-gnu/dbus-1.0/include -I/usr/include/libinstpatch-2 -O3 -DNDEBUG -Wall -std=gnu++11 -o CMakeFiles/BeagleRescue.dir/src/ecs/ECS.cpp.o -c /home/ayoungblood/Projects/BeagleRescue/src/ecs/ECS.cpp",
|
||||
"command": "/usr/bin/c++ -I/home/ayoungblood/Projects/BeagleRescue/BeagleRescue -I/usr/include/SDL2 -I/usr/include/libpng16 -I/usr/include/glib-2.0 -I/usr/lib/aarch64-linux-gnu/glib-2.0/include -I/usr/include/opus -I/usr/include/dbus-1.0 -I/usr/lib/aarch64-linux-gnu/dbus-1.0/include -I/usr/include/libinstpatch-2 -O3 -DNDEBUG -Wall -std=gnu++17 -o CMakeFiles/BeagleRescue.dir/src/ecs/ECS.cpp.o -c /home/ayoungblood/Projects/BeagleRescue/src/ecs/ECS.cpp",
|
||||
"file": "/home/ayoungblood/Projects/BeagleRescue/src/ecs/ECS.cpp"
|
||||
},
|
||||
{
|
||||
"directory": "/home/ayoungblood/Projects/BeagleRescue",
|
||||
"command": "/usr/bin/c++ -I/home/ayoungblood/Projects/BeagleRescue/BeagleRescue -I/usr/include/SDL2 -I/usr/include/libpng16 -I/usr/include/glib-2.0 -I/usr/lib/aarch64-linux-gnu/glib-2.0/include -I/usr/include/opus -I/usr/include/dbus-1.0 -I/usr/lib/aarch64-linux-gnu/dbus-1.0/include -I/usr/include/libinstpatch-2 -O3 -DNDEBUG -Wall -std=gnu++11 -o CMakeFiles/BeagleRescue.dir/src/game/Collision.cpp.o -c /home/ayoungblood/Projects/BeagleRescue/src/game/Collision.cpp",
|
||||
"command": "/usr/bin/c++ -I/home/ayoungblood/Projects/BeagleRescue/BeagleRescue -I/usr/include/SDL2 -I/usr/include/libpng16 -I/usr/include/glib-2.0 -I/usr/lib/aarch64-linux-gnu/glib-2.0/include -I/usr/include/opus -I/usr/include/dbus-1.0 -I/usr/lib/aarch64-linux-gnu/dbus-1.0/include -I/usr/include/libinstpatch-2 -O3 -DNDEBUG -Wall -std=gnu++17 -o CMakeFiles/BeagleRescue.dir/src/game/Collision.cpp.o -c /home/ayoungblood/Projects/BeagleRescue/src/game/Collision.cpp",
|
||||
"file": "/home/ayoungblood/Projects/BeagleRescue/src/game/Collision.cpp"
|
||||
},
|
||||
{
|
||||
"directory": "/home/ayoungblood/Projects/BeagleRescue",
|
||||
"command": "/usr/bin/c++ -I/home/ayoungblood/Projects/BeagleRescue/BeagleRescue -I/usr/include/SDL2 -I/usr/include/libpng16 -I/usr/include/glib-2.0 -I/usr/lib/aarch64-linux-gnu/glib-2.0/include -I/usr/include/opus -I/usr/include/dbus-1.0 -I/usr/lib/aarch64-linux-gnu/dbus-1.0/include -I/usr/include/libinstpatch-2 -O3 -DNDEBUG -Wall -std=gnu++11 -o CMakeFiles/BeagleRescue.dir/src/game/Game.cpp.o -c /home/ayoungblood/Projects/BeagleRescue/src/game/Game.cpp",
|
||||
"command": "/usr/bin/c++ -I/home/ayoungblood/Projects/BeagleRescue/BeagleRescue -I/usr/include/SDL2 -I/usr/include/libpng16 -I/usr/include/glib-2.0 -I/usr/lib/aarch64-linux-gnu/glib-2.0/include -I/usr/include/opus -I/usr/include/dbus-1.0 -I/usr/lib/aarch64-linux-gnu/dbus-1.0/include -I/usr/include/libinstpatch-2 -O3 -DNDEBUG -Wall -std=gnu++17 -o CMakeFiles/BeagleRescue.dir/src/game/Game.cpp.o -c /home/ayoungblood/Projects/BeagleRescue/src/game/Game.cpp",
|
||||
"file": "/home/ayoungblood/Projects/BeagleRescue/src/game/Game.cpp"
|
||||
},
|
||||
{
|
||||
"directory": "/home/ayoungblood/Projects/BeagleRescue",
|
||||
"command": "/usr/bin/c++ -I/home/ayoungblood/Projects/BeagleRescue/BeagleRescue -I/usr/include/SDL2 -I/usr/include/libpng16 -I/usr/include/glib-2.0 -I/usr/lib/aarch64-linux-gnu/glib-2.0/include -I/usr/include/opus -I/usr/include/dbus-1.0 -I/usr/lib/aarch64-linux-gnu/dbus-1.0/include -I/usr/include/libinstpatch-2 -O3 -DNDEBUG -Wall -std=gnu++11 -o CMakeFiles/BeagleRescue.dir/src/game/GameStateManager.cpp.o -c /home/ayoungblood/Projects/BeagleRescue/src/game/GameStateManager.cpp",
|
||||
"command": "/usr/bin/c++ -I/home/ayoungblood/Projects/BeagleRescue/BeagleRescue -I/usr/include/SDL2 -I/usr/include/libpng16 -I/usr/include/glib-2.0 -I/usr/lib/aarch64-linux-gnu/glib-2.0/include -I/usr/include/opus -I/usr/include/dbus-1.0 -I/usr/lib/aarch64-linux-gnu/dbus-1.0/include -I/usr/include/libinstpatch-2 -O3 -DNDEBUG -Wall -std=gnu++17 -o CMakeFiles/BeagleRescue.dir/src/game/GameStateManager.cpp.o -c /home/ayoungblood/Projects/BeagleRescue/src/game/GameStateManager.cpp",
|
||||
"file": "/home/ayoungblood/Projects/BeagleRescue/src/game/GameStateManager.cpp"
|
||||
},
|
||||
{
|
||||
"directory": "/home/ayoungblood/Projects/BeagleRescue",
|
||||
"command": "/usr/bin/c++ -I/home/ayoungblood/Projects/BeagleRescue/BeagleRescue -I/usr/include/SDL2 -I/usr/include/libpng16 -I/usr/include/glib-2.0 -I/usr/lib/aarch64-linux-gnu/glib-2.0/include -I/usr/include/opus -I/usr/include/dbus-1.0 -I/usr/lib/aarch64-linux-gnu/dbus-1.0/include -I/usr/include/libinstpatch-2 -O3 -DNDEBUG -Wall -std=gnu++11 -o CMakeFiles/BeagleRescue.dir/src/game/Main.cpp.o -c /home/ayoungblood/Projects/BeagleRescue/src/game/Main.cpp",
|
||||
"command": "/usr/bin/c++ -I/home/ayoungblood/Projects/BeagleRescue/BeagleRescue -I/usr/include/SDL2 -I/usr/include/libpng16 -I/usr/include/glib-2.0 -I/usr/lib/aarch64-linux-gnu/glib-2.0/include -I/usr/include/opus -I/usr/include/dbus-1.0 -I/usr/lib/aarch64-linux-gnu/dbus-1.0/include -I/usr/include/libinstpatch-2 -O3 -DNDEBUG -Wall -std=gnu++17 -o CMakeFiles/BeagleRescue.dir/src/game/Main.cpp.o -c /home/ayoungblood/Projects/BeagleRescue/src/game/Main.cpp",
|
||||
"file": "/home/ayoungblood/Projects/BeagleRescue/src/game/Main.cpp"
|
||||
},
|
||||
{
|
||||
"directory": "/home/ayoungblood/Projects/BeagleRescue",
|
||||
"command": "/usr/bin/c++ -I/home/ayoungblood/Projects/BeagleRescue/BeagleRescue -I/usr/include/SDL2 -I/usr/include/libpng16 -I/usr/include/glib-2.0 -I/usr/lib/aarch64-linux-gnu/glib-2.0/include -I/usr/include/opus -I/usr/include/dbus-1.0 -I/usr/lib/aarch64-linux-gnu/dbus-1.0/include -I/usr/include/libinstpatch-2 -O3 -DNDEBUG -Wall -std=gnu++11 -o CMakeFiles/BeagleRescue.dir/src/game/StateMachine.cpp.o -c /home/ayoungblood/Projects/BeagleRescue/src/game/StateMachine.cpp",
|
||||
"command": "/usr/bin/c++ -I/home/ayoungblood/Projects/BeagleRescue/BeagleRescue -I/usr/include/SDL2 -I/usr/include/libpng16 -I/usr/include/glib-2.0 -I/usr/lib/aarch64-linux-gnu/glib-2.0/include -I/usr/include/opus -I/usr/include/dbus-1.0 -I/usr/lib/aarch64-linux-gnu/dbus-1.0/include -I/usr/include/libinstpatch-2 -O3 -DNDEBUG -Wall -std=gnu++17 -o CMakeFiles/BeagleRescue.dir/src/game/StateMachine.cpp.o -c /home/ayoungblood/Projects/BeagleRescue/src/game/StateMachine.cpp",
|
||||
"file": "/home/ayoungblood/Projects/BeagleRescue/src/game/StateMachine.cpp"
|
||||
},
|
||||
{
|
||||
"directory": "/home/ayoungblood/Projects/BeagleRescue",
|
||||
"command": "/usr/bin/c++ -I/home/ayoungblood/Projects/BeagleRescue/BeagleRescue -I/usr/include/SDL2 -I/usr/include/libpng16 -I/usr/include/glib-2.0 -I/usr/lib/aarch64-linux-gnu/glib-2.0/include -I/usr/include/opus -I/usr/include/dbus-1.0 -I/usr/lib/aarch64-linux-gnu/dbus-1.0/include -I/usr/include/libinstpatch-2 -O3 -DNDEBUG -Wall -std=gnu++11 -o CMakeFiles/BeagleRescue.dir/src/game/Vector2D.cpp.o -c /home/ayoungblood/Projects/BeagleRescue/src/game/Vector2D.cpp",
|
||||
"command": "/usr/bin/c++ -I/home/ayoungblood/Projects/BeagleRescue/BeagleRescue -I/usr/include/SDL2 -I/usr/include/libpng16 -I/usr/include/glib-2.0 -I/usr/lib/aarch64-linux-gnu/glib-2.0/include -I/usr/include/opus -I/usr/include/dbus-1.0 -I/usr/lib/aarch64-linux-gnu/dbus-1.0/include -I/usr/include/libinstpatch-2 -O3 -DNDEBUG -Wall -std=gnu++17 -o CMakeFiles/BeagleRescue.dir/src/game/Vector2D.cpp.o -c /home/ayoungblood/Projects/BeagleRescue/src/game/Vector2D.cpp",
|
||||
"file": "/home/ayoungblood/Projects/BeagleRescue/src/game/Vector2D.cpp"
|
||||
},
|
||||
{
|
||||
"directory": "/home/ayoungblood/Projects/BeagleRescue",
|
||||
"command": "/usr/bin/c++ -I/home/ayoungblood/Projects/BeagleRescue/BeagleRescue -I/usr/include/SDL2 -I/usr/include/libpng16 -I/usr/include/glib-2.0 -I/usr/lib/aarch64-linux-gnu/glib-2.0/include -I/usr/include/opus -I/usr/include/dbus-1.0 -I/usr/lib/aarch64-linux-gnu/dbus-1.0/include -I/usr/include/libinstpatch-2 -O3 -DNDEBUG -Wall -std=gnu++11 -o CMakeFiles/BeagleRescue.dir/src/ui/UINineSlice.cpp.o -c /home/ayoungblood/Projects/BeagleRescue/src/ui/UINineSlice.cpp",
|
||||
"command": "/usr/bin/c++ -I/home/ayoungblood/Projects/BeagleRescue/BeagleRescue -I/usr/include/SDL2 -I/usr/include/libpng16 -I/usr/include/glib-2.0 -I/usr/lib/aarch64-linux-gnu/glib-2.0/include -I/usr/include/opus -I/usr/include/dbus-1.0 -I/usr/lib/aarch64-linux-gnu/dbus-1.0/include -I/usr/include/libinstpatch-2 -O3 -DNDEBUG -Wall -std=gnu++17 -o CMakeFiles/BeagleRescue.dir/src/ui/UINineSlice.cpp.o -c /home/ayoungblood/Projects/BeagleRescue/src/ui/UINineSlice.cpp",
|
||||
"file": "/home/ayoungblood/Projects/BeagleRescue/src/ui/UINineSlice.cpp"
|
||||
},
|
||||
{
|
||||
"directory": "/home/ayoungblood/Projects/BeagleRescue",
|
||||
"command": "/usr/bin/c++ -I/home/ayoungblood/Projects/BeagleRescue/BeagleRescue -I/usr/include/SDL2 -I/usr/include/libpng16 -I/usr/include/glib-2.0 -I/usr/lib/aarch64-linux-gnu/glib-2.0/include -I/usr/include/opus -I/usr/include/dbus-1.0 -I/usr/lib/aarch64-linux-gnu/dbus-1.0/include -I/usr/include/libinstpatch-2 -O3 -DNDEBUG -Wall -std=gnu++11 -o CMakeFiles/BeagleRescue.dir/src/ui/UIText.cpp.o -c /home/ayoungblood/Projects/BeagleRescue/src/ui/UIText.cpp",
|
||||
"command": "/usr/bin/c++ -I/home/ayoungblood/Projects/BeagleRescue/BeagleRescue -I/usr/include/SDL2 -I/usr/include/libpng16 -I/usr/include/glib-2.0 -I/usr/lib/aarch64-linux-gnu/glib-2.0/include -I/usr/include/opus -I/usr/include/dbus-1.0 -I/usr/lib/aarch64-linux-gnu/dbus-1.0/include -I/usr/include/libinstpatch-2 -O3 -DNDEBUG -Wall -std=gnu++17 -o CMakeFiles/BeagleRescue.dir/src/ui/UIText.cpp.o -c /home/ayoungblood/Projects/BeagleRescue/src/ui/UIText.cpp",
|
||||
"file": "/home/ayoungblood/Projects/BeagleRescue/src/ui/UIText.cpp"
|
||||
}
|
||||
]
|
||||
@ -1,76 +0,0 @@
|
||||
/*
|
||||
* Map.cpp
|
||||
*
|
||||
* Created on: Feb 13, 2020
|
||||
* Author: ayoungblood
|
||||
*/
|
||||
|
||||
#include "Map.h"
|
||||
#include "../game/Game.hpp"
|
||||
#include <fstream>
|
||||
#include "../ecs/ECS.h"
|
||||
#include "../ecs/Components.h"
|
||||
#include <string>
|
||||
#include <iostream>
|
||||
|
||||
extern Manager manager;
|
||||
|
||||
Map::Map(std::string tID, int ms, int ts) : texID(tID), mapScale(ms), tileSize(ts)
|
||||
{
|
||||
scaledSize = ms* ts;
|
||||
width = 0;
|
||||
height = 0;
|
||||
tSize = ts;
|
||||
}
|
||||
|
||||
Map::~Map()
|
||||
{
|
||||
}
|
||||
|
||||
void Map::LoadMap(std::string path, int sizeX, int sizeY, int scale)
|
||||
{
|
||||
char c;
|
||||
std::fstream mapFile;
|
||||
mapFile.open(path);
|
||||
int srcX, srcY;
|
||||
|
||||
width = tSize*scale*sizeX;
|
||||
height = tSize*scale*sizeY;
|
||||
|
||||
for (int y = 0; y < sizeY; y++)
|
||||
{
|
||||
for (int x = 0; x < sizeX; x++)
|
||||
{
|
||||
mapFile.get(c);
|
||||
srcY = atoi(&c) * tileSize;
|
||||
mapFile.get(c);
|
||||
srcX = atoi(&c) * tileSize;
|
||||
mapFile.ignore(2,',');
|
||||
}
|
||||
}
|
||||
|
||||
mapFile.ignore();
|
||||
// colliders
|
||||
for (int y =0; y < sizeY; y++)
|
||||
{
|
||||
for (int x = 0; x < sizeX; x++)
|
||||
{
|
||||
mapFile.get(c);
|
||||
if (c == '1')
|
||||
{
|
||||
auto& tcol(manager.addEntity());
|
||||
tcol.addComponent<ColliderComponent>("terrain",x*scaledSize,y*scaledSize,tileSize,scale,texID);
|
||||
tcol.addGroup(Game::groupColliders);
|
||||
}
|
||||
mapFile.ignore(2,',');
|
||||
}
|
||||
}
|
||||
mapFile.close();
|
||||
}
|
||||
|
||||
void Map::AddTile(int srcX, int srcY, int xpos, int ypos)
|
||||
{
|
||||
auto& tile(manager.addEntity());
|
||||
tile.addComponent<TileComponent>(srcX,srcY,xpos,ypos,tileSize, mapScale, texID);
|
||||
tile.addGroup(Game::groupMap);
|
||||
}
|
||||
@ -1,33 +0,0 @@
|
||||
/*
|
||||
* Map.h
|
||||
*
|
||||
* Created on: Feb 13, 2020
|
||||
* Author: ayoungblood
|
||||
*/
|
||||
|
||||
#ifndef SRC_MAP_H_
|
||||
#define SRC_MAP_H_
|
||||
|
||||
#include <string>
|
||||
|
||||
class Map
|
||||
{
|
||||
public:
|
||||
Map(std::string tID, int ms, int ts);
|
||||
~Map();
|
||||
|
||||
void LoadMap(std::string path, int sizeX, int sizeY, int scale);
|
||||
void AddTile(int srcX, int srcY, int xpos, int ypos);
|
||||
|
||||
int width;
|
||||
int height;
|
||||
int tSize;
|
||||
|
||||
private:
|
||||
std::string texID;
|
||||
int mapScale;
|
||||
int tileSize;
|
||||
int scaledSize;
|
||||
};
|
||||
|
||||
#endif /* SRC_MAP_H_ */
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"GameName":"Beagle Rescue",
|
||||
"Developers": "Alan Youngblood, Simon Zaleski, Daniel Rinaldi",
|
||||
"LibraryDevelopers": "Sam Lantinga, Dave Gamble, Carl Birch, Job Vranish, David Lafreniere, Bayle Jonathan",
|
||||
"LibraryDevelopers": "Sam Lantinga, Dave Gamble, Carl Birch, Job Vranish, David Lafreniere, Bayle Jonathan, Robin Berg Pettersen",
|
||||
"SpecialThanks":"Nic Allen, Brian Lhota, Rodrigo Monteiro"
|
||||
}
|
||||
|
||||
@ -15,6 +15,7 @@
|
||||
#include <iostream>
|
||||
#include <string>
|
||||
#include <tuple>
|
||||
#include "../tileson/tileson.hpp"
|
||||
//#include "../../libtmx-parser/src/tmxparser.h"
|
||||
|
||||
class TileMapComponent : public Component
|
||||
@ -23,6 +24,7 @@ public:
|
||||
SDL_Texture* texture;
|
||||
SDL_Rect srcRect, destRect;
|
||||
//tmxparser::TmxMap map;
|
||||
//tileson::Tileson map;
|
||||
int globalScale;
|
||||
std::vector<SDL_Rect> tileSet;
|
||||
std::vector<SDL_Rect> destRects;
|
||||
@ -40,8 +42,23 @@ public:
|
||||
SDL_DestroyTexture(texture);
|
||||
}
|
||||
|
||||
TileMapComponent(/*tmxparser::TmxMap loadedMap,*/ int gScale, int offsetX, int offsetY)
|
||||
TileMapComponent(/*tileson::Tileson loadedMap,*/ int gScale, int offsetX, int offsetY)
|
||||
{
|
||||
// ***********************************************************************************
|
||||
// TILESON ~~~~~~~~~~~
|
||||
|
||||
tson::Tileson t;
|
||||
std::unique_ptr<tson::Map> map = t.parse(fs::path("../../assets/maps/testmap.json"));
|
||||
|
||||
if(map->getStatus() == tson::ParseStatus::OK)
|
||||
{
|
||||
printf("Parsed the map file okay.");
|
||||
//Gets the layer called "Object Layer" from the "ultimate_demo.json map
|
||||
tson::Layer *objectLayer = map->getLayer("Object Layer"); //This is an Object Layer
|
||||
|
||||
|
||||
}
|
||||
// *******************************************************************************************
|
||||
/*map = loadedMap;
|
||||
std::string texturePath = "assets/textures/tiles/" + loadedMap.tilesetCollection[0].name + ".png";
|
||||
Game::assets->AddTexture(map.tilesetCollection[0].name, texturePath.c_str());
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
#include "Game.hpp"
|
||||
#include "../assetmgr/TextureManager.h"
|
||||
// #include "../assetmgr/Map.h"
|
||||
#include "../assetmgr/Map.h"
|
||||
#include "../ecs/Components.h"
|
||||
#include "Collision.h"
|
||||
#include <string>
|
||||
@ -21,9 +21,11 @@
|
||||
#include "../ui/UIText.h"
|
||||
#include "../ui/UINineSlice.h"
|
||||
#include "../cjson/cJSON.h"
|
||||
#include "../tileson/tileson.hpp"
|
||||
#include <cmath>
|
||||
|
||||
// tmxparser::TmxMap map;
|
||||
//tileson::Tileson map;
|
||||
Manager manager;
|
||||
UINineSlice* my9Slice;
|
||||
UINineSlice* scoreboard9Slice;
|
||||
@ -77,6 +79,9 @@ int diff_time;
|
||||
int Game::pTileX = 0;
|
||||
int Game::pTileY = 0;
|
||||
|
||||
tson::Tileson t;
|
||||
std::unique_ptr<tson::Map> map = t.parse(std::filesystem::path("../../assets/maps/testmap.json"));
|
||||
|
||||
std::string Game::BoolToString(bool b) {
|
||||
std::string myString;
|
||||
if (b) {
|
||||
@ -132,7 +137,7 @@ void Game::init(const char *title, int width, int height, bool fullscreen, int g
|
||||
SDL_LogError(SDL_LOG_CATEGORY_ERROR, "Couldn't initialize SDL audio mixer!, Error: %s", SDL_GetError());
|
||||
}
|
||||
|
||||
|
||||
// ---------------------------------------
|
||||
// Trying out the halsafar/libtmx-parser
|
||||
/* tmxparser::TmxReturn error;
|
||||
tmxparser::TmxMap map;
|
||||
@ -186,7 +191,7 @@ void Game::init(const char *title, int width, int height, bool fullscreen, int g
|
||||
|
||||
uiInfo.addComponent<TransformComponent>(camera.w/gScale-94,10,72*gScale,96*gScale,gScale);
|
||||
// uiInfo.addComponent<UITextComponent>("font", "CollisionHori: Vert: Jump: P.y : P.dy: YVec: ", 8, 12, 1);
|
||||
uiInfo.addComponent<UITextComponent>("font", "Player PTiX: PTiY: P.x: P.y : coll: Px2 bnd ", 8, 12, gScale);
|
||||
uiInfo.addComponent<UITextComponent>("font", "Player PTiX: PTiY: P.x: P.y : coll: Px2 tson: ", 8, 12, gScale);
|
||||
uiInfo.addGroup(groupUI_Layer3);
|
||||
|
||||
uiCamXInfo.addComponent<TransformComponent>(camera.w/gScale-48,23,40*gScale,12*gScale,gScale);
|
||||
@ -240,6 +245,33 @@ void Game::init(const char *title, int width, int height, bool fullscreen, int g
|
||||
gameScene.addComponent<TileMapComponent>(/*map,*/gScale,player.getComponent<TransformComponent>().position.x+player.getComponent<TransformComponent>().width/2,player.getComponent<TransformComponent>().position.y+player.getComponent<TransformComponent>().height/2); //150,100
|
||||
gameScene.addGroup(groupMap);
|
||||
|
||||
// ---------------------------------------
|
||||
// Tileson tryout
|
||||
printf("Trying out Tileson, does it work?");
|
||||
if(map->getStatus() == tson::ParseStatus::OK)
|
||||
{
|
||||
printf("Tileson successfully parsed the tilemap");
|
||||
//Gets the layer called "Object Layer" from the "ultimate_demo.json map
|
||||
tson::Layer *tileLayer = map->getLayer("Tile Layer 1"); //This is an Object Layer
|
||||
|
||||
//Example from a Tile Layer
|
||||
//I know for a fact that this is a Tile Layer, but you can check it this way to be sure.
|
||||
if(tileLayer->getType() == tson::LayerType::TileLayer)
|
||||
{
|
||||
//pos = position in tile units
|
||||
printf("Tileson found layer of tiles");
|
||||
/*for(auto &[pos, tileObject] : tileLayer->getTileObjects()) //Loops through absolutely all existing tileObjects
|
||||
{
|
||||
tson::Tileset *tileset = tileObject.getTile()->getTileset();
|
||||
tson::Rect drawingRect = tileObject.getDrawingRect();
|
||||
tson::Vector2f position = tileObject.getPosition();
|
||||
}*/
|
||||
}
|
||||
|
||||
} else {
|
||||
printf("Failed to load Tileson map");
|
||||
}
|
||||
|
||||
playerPosition = Vector2D().Zero();
|
||||
pVel = Vector2D().Zero();
|
||||
|
||||
@ -294,8 +326,8 @@ void Game::update()
|
||||
|
||||
if (Mix_PlayingMusic() == 0 && gsm->currentState == GameStateManager::ST_COREGAME)
|
||||
{
|
||||
// std::cout << "Play Music Now" << std::endl;
|
||||
// Mix_PlayMusic(assets->GetMusicTrack("simonZ"), -1);
|
||||
std::cout << "Play Music Now" << std::endl;
|
||||
Mix_PlayMusic(assets->GetMusicTrack("simonZ"), -1);
|
||||
}
|
||||
if (Mix_PlayingMusic() != 0 && gsm->currentState != GameStateManager::ST_COREGAME)
|
||||
{
|
||||
@ -324,6 +356,8 @@ void Game::update()
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
// Gravity
|
||||
// if (gravityOnPlayer){
|
||||
// player.getComponent<TransformComponent>().position.y += 3*gScale;
|
||||
@ -429,10 +463,10 @@ void Game::render()
|
||||
t->draw();
|
||||
} */
|
||||
|
||||
for (auto& c : colliders)
|
||||
/*for (auto& c : colliders)
|
||||
{
|
||||
c->draw();
|
||||
}
|
||||
}*/
|
||||
|
||||
for (auto& o : objects)
|
||||
{
|
||||
@ -492,7 +526,7 @@ void Game::drawLine(Vector2D srcpt, Vector2D destpt, int red, int green, int blu
|
||||
int * Game::predictCollisions(){
|
||||
static int boundaries[3];
|
||||
// ===== LEFT =====
|
||||
if (player.getComponent<TransformComponent>().velocity.x<0){
|
||||
/*if (player.getComponent<TransformComponent>().velocity.x<0){
|
||||
// ====== For Each Row ====
|
||||
int i = 0;
|
||||
for (int r=Game::pTileY-1;r<=Game::pTileY+1;r++){
|
||||
@ -507,7 +541,7 @@ int * Game::predictCollisions(){
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}*/
|
||||
/*
|
||||
// ====== RIGHT ====
|
||||
if (player.getComponent<TransformComponent>().velocity.x>0){
|
||||
|
||||
Loading…
Reference in New Issue
Block a user