Fixing minor bugs

This commit is contained in:
Vladislav Khorev committed 2026-11-10 19:48:03 +06:00
1 parent 6b8aa0efec
commit f3cafd2bf7
3 files changed
+13 -3

No files matched your search

+5
View File
@@ -174,6 +174,11 @@ if(WIN32)
../src/game_server/RemoteGameServerHost.h
../src/game_server/RemoteGameServerHost.cpp
)
if(MSVC)
set_source_files_properties(
../src/game_server/WebsocketGameClient.cpp
PROPERTIES COMPILE_OPTIONS "/bigobj")
endif()
target_link_libraries(
ShadowOverBishkekDemo PRIVATE opengl32 ws2_32 mswsock)
endif()
+5
View File
@@ -163,6 +163,11 @@ if(BUILD_TESTING)
target_compile_definitions(
GameServerWebsocketLockstepTests PRIVATE
NETWORK WIN32_LEAN_AND_MEAN _WIN32_WINNT=0x0A00)
if(MSVC)
set_source_files_properties(
"${GAME_ROOT}/src/game_server/WebsocketGameClient.cpp"
PROPERTIES COMPILE_OPTIONS "/bigobj")
endif()
target_link_libraries(
GameServerWebsocketLockstepTests PRIVATE
game_server_core ws2_32 mswsock)
+3 -3
View File
@@ -890,11 +890,11 @@ namespace FRG
}
Character* Location::raycastNpcs(const Eigen::Vector3f& rayOrigin, const Eigen::Vector3f& rayDir, float maxDistance) {
// Every NPC is treated as a vertical cylinder: radius 0.25m, height 1.6m,
// Every NPC is treated as a vertical cylinder
// base at npc->position (the model's foot). Intersection = circle hit in the
// XZ plane, then clip the entry/exit t against the [yFoot, yFoot+height] slab.
static constexpr float NPC_CLICK_RADIUS = 0.25f;
static constexpr float NPC_CLICK_HEIGHT = 1.6f;
static constexpr float NPC_CLICK_RADIUS = 0.35f;
static constexpr float NPC_CLICK_HEIGHT = 1.8f;
static constexpr float NPC_PICK_EPSILON = 1e-6f;
Character* closestNpc = nullptr;