From 1d40e3b7abc60dcb0be2c7205ed4cb0905ecb1d4 Mon Sep 17 00:00:00 2001 From: Graham Pentheny Date: Mon, 2 Jun 2025 23:34:20 -0400 Subject: [PATCH] Rename parameter names for Sample::handleClick --- RecastDemo/Include/Sample.h | 4 ++-- RecastDemo/Source/Sample.cpp | 4 ++-- RecastDemo/Source/main.cpp | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/RecastDemo/Include/Sample.h b/RecastDemo/Include/Sample.h index 2c577081..3cfe107a 100644 --- a/RecastDemo/Include/Sample.h +++ b/RecastDemo/Include/Sample.h @@ -87,7 +87,7 @@ struct SampleTool virtual void init(Sample* sample) = 0; virtual void reset() = 0; virtual void handleMenu() = 0; - virtual void handleClick(const float* s, const float* p, bool shift) = 0; + virtual void handleClick(const float* rayStartPos, const float* rayHitPos, bool shift) = 0; virtual void handleRender() = 0; virtual void handleRenderOverlay(double* proj, double* model, int* view) = 0; virtual void handleToggle() = 0; @@ -163,7 +163,7 @@ public: virtual void handleSettings(); virtual void handleTools(); virtual void handleDebugMode(); - virtual void handleClick(const float* s, const float* p, bool shift); + virtual void handleClick(const float* rayStartPos, const float* rayHitPos, bool shift); virtual void handleToggle(); virtual void handleStep(); virtual void handleRender(); diff --git a/RecastDemo/Source/Sample.cpp b/RecastDemo/Source/Sample.cpp index a6ef0bb2..29952243 100644 --- a/RecastDemo/Source/Sample.cpp +++ b/RecastDemo/Source/Sample.cpp @@ -272,11 +272,11 @@ void Sample::handleCommonSettings() imguiSeparator(); } -void Sample::handleClick(const float* s, const float* p, bool shift) +void Sample::handleClick(const float* rayStartPos, const float* rayHitPos, bool shift) { if (tool) { - tool->handleClick(s, p, shift); + tool->handleClick(rayStartPos, rayHitPos, shift); } } diff --git a/RecastDemo/Source/main.cpp b/RecastDemo/Source/main.cpp index e4b81874..e2aef541 100644 --- a/RecastDemo/Source/main.cpp +++ b/RecastDemo/Source/main.cpp @@ -388,11 +388,11 @@ int main(int /*argc*/, char** /*argv*/) } else { - float pos[3]; - pos[0] = app.rayStart[0] + (app.rayEnd[0] - app.rayStart[0]) * hitTime; - pos[1] = app.rayStart[1] + (app.rayEnd[1] - app.rayStart[1]) * hitTime; - pos[2] = app.rayStart[2] + (app.rayEnd[2] - app.rayStart[2]) * hitTime; - app.sample->handleClick(app.rayStart, pos, processHitTestShift); + float hitPos[3]; + hitPos[0] = app.rayStart[0] + (app.rayEnd[0] - app.rayStart[0]) * hitTime; + hitPos[1] = app.rayStart[1] + (app.rayEnd[1] - app.rayStart[1]) * hitTime; + hitPos[2] = app.rayStart[2] + (app.rayEnd[2] - app.rayStart[2]) * hitTime; + app.sample->handleClick(app.rayStart, hitPos, processHitTestShift); } } else