From 5c571578dd9040fc9d7cdf07b1b176663a086f71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D1=8C=D0=B1=D0=B5=D1=80=D1=82=20=D0=93=D0=B0?= =?UTF-8?q?=D0=B4=D0=B8=D0=B5=D0=B2?= Date: Sun, 2 Mar 2025 22:09:25 +0600 Subject: [PATCH] da --- BoundaryBox.h | 1 + GameObjectManager.cpp | 2 +- GameObjectManager.h | 5 +++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/BoundaryBox.h b/BoundaryBox.h index d90c672..05f1a71 100644 --- a/BoundaryBox.h +++ b/BoundaryBox.h @@ -80,6 +80,7 @@ public: bool checkCollision(const Vector3f& position) const { // Проверяем границы комнаты + std::cout << "checkCollision" << std::endl; if (roomBoundary && !roomBoundary->isInside(position)) { return true; } diff --git a/GameObjectManager.cpp b/GameObjectManager.cpp index bbb59e3..1e64150 100644 --- a/GameObjectManager.cpp +++ b/GameObjectManager.cpp @@ -370,7 +370,7 @@ void GameObjectManager::handleEvent(const SDL_Event& event) { Environment::cameraAlpha = 0.9 * M_PI / 2.0; } } - else { + else {checkCollision lastMouseX = event.motion.x; lastMouseY = event.motion.y; } diff --git a/GameObjectManager.h b/GameObjectManager.h index 2b4c05c..c21b989 100644 --- a/GameObjectManager.h +++ b/GameObjectManager.h @@ -4,6 +4,7 @@ #include "AudioPlayerAsync.h" #include #include +#include // Добавляем include для std::list #include "ActiveObject.h" #include "Room.h" #include "BoundaryBox.h" // Добавляем включение @@ -45,8 +46,8 @@ public: ZL::VertexDataStruct textMesh; ZL::VertexRenderStruct textMeshMutable; - //ZL::VertexDataStruct coneMesh; - //ZL::VertexRenderStruct coneMeshMutable; + ZL::VertexDataStruct coneMesh; // Раскомментировали + ZL::VertexRenderStruct coneMeshMutable; // Раскомментировали std::vector activeObjects; std::vector rooms;