From e347215f115970d65e5553622ea17fdc3578210e Mon Sep 17 00:00:00 2001 From: Vectozavr <60608292+vectozavr@users.noreply.github.com> Date: Thu, 4 Nov 2021 03:00:19 +0700 Subject: [PATCH] HitBox added. acceleration of collision detection in 20 times. --- CMakeLists.txt | 13 ++++++++++++- shooter.vcxproj | 2 ++ shooter.vcxproj.filters | 6 ++++++ 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 67bfc6e..e48d99f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,6 +26,8 @@ add_executable(shooter Shooter.cpp Shooter.h ShooterConsts.h + ShooterMsgType.h + ShooterMsgType.cpp # 3d engine: engine/Consts.h engine/Vec4D.h @@ -46,6 +48,8 @@ add_executable(shooter engine/utils/Log.cpp engine/utils/Time.h engine/utils/Time.cpp + engine/utils/Timer.cpp + engine/utils/Timer.h engine/ResourceManager.h engine/ResourceManager.cpp engine/World.h @@ -73,6 +77,8 @@ add_executable(shooter engine/physics/RigidBody.cpp engine/physics/RigidBody.h engine/physics/Simplex.h + engine/physics/HitBox.cpp + engine/physics/HitBox.h engine/Object.cpp engine/Object.h engine/gui/Button.cpp @@ -91,7 +97,12 @@ add_executable(shooter engine/network/UDPConnection.h engine/network/UDPSocket.cpp engine/network/UDPSocket.h - engine/SoundController.cpp engine/SoundController.h ShooterMsgType.h ShooterMsgType.cpp engine/animation/AAttractToPoint.h engine/animation/ARotateRelativePoint.h engine/animation/ARotateLeft.h engine/utils/Timer.cpp engine/utils/Timer.h engine/physics/HitBox.cpp engine/physics/HitBox.h) + engine/SoundController.cpp + engine/SoundController.h + engine/animation/AAttractToPoint.h + engine/animation/ARotateRelativePoint.h + engine/animation/ARotateLeft.h + ) if(APPLE OR UNIX) include_directories(/usr/local/include) diff --git a/shooter.vcxproj b/shooter.vcxproj index 901692d..e491300 100644 --- a/shooter.vcxproj +++ b/shooter.vcxproj @@ -177,6 +177,7 @@ + @@ -230,6 +231,7 @@ + diff --git a/shooter.vcxproj.filters b/shooter.vcxproj.filters index 0a26f2b..5b5c343 100644 --- a/shooter.vcxproj.filters +++ b/shooter.vcxproj.filters @@ -138,6 +138,9 @@ Исходные файлы\engine\physics + + Исходные файлы\engine\physics + Исходные файлы\engine @@ -335,6 +338,9 @@ Файлы заголовков\engine\physics + + Файлы заголовков\engine\physics + Файлы заголовков\engine\animation