da
This commit is contained in:
parent
0aff255379
commit
5c571578dd
@ -80,6 +80,7 @@ public:
|
||||
|
||||
bool checkCollision(const Vector3f& position) const {
|
||||
// Проверяем границы комнаты
|
||||
std::cout << "checkCollision" << std::endl;
|
||||
if (roomBoundary && !roomBoundary->isInside(position)) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -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;
|
||||
}
|
||||
|
||||
@ -4,6 +4,7 @@
|
||||
#include "AudioPlayerAsync.h"
|
||||
#include <memory>
|
||||
#include <vector>
|
||||
#include <list> // Добавляем 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<ZL::ActiveObject> activeObjects;
|
||||
std::vector<ZL::Room> rooms;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user