Skip to content

Commit 5317f9d

Browse files
authored
Fix windows build error due to windows header definition leakage (#270)
* Fix windows build error due to windows header definition leakage * Remove undef of near on windows and rename parameters with Distance postfix --------- Co-authored-by: Josef <[email protected]>
1 parent 1cc5bec commit 5317f9d

File tree

4 files changed

+15
-13
lines changed

4 files changed

+15
-13
lines changed

include/rgl/api/core.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -644,14 +644,14 @@ RGL_API rgl_status_t rgl_node_raytrace_configure_distortion(rgl_node_t node, boo
644644
* Modifies RaytraceNode to set non-hit values for distance.
645645
* Default non-hit value for the RGL_FIELD_DISTANCE_F32 field is set to infinity.
646646
* This function allows to set custom values:
647-
* - for non-hits closer than a minimum range (`near`),
648-
* - for non-hits beyond a maximum range (`far`).
647+
* - for non-hits closer than a minimum range (`nearDistance`),
648+
* - for non-hits beyond a maximum range (`farDistance`).
649649
* Concurrently, it computes the RGL_FIELD_XYZ_VEC3_F32 field for these non-hit scenarios based on these distances, along with ray origin and direction.
650650
* @param node RaytraceNode to modify.
651-
* @param near Distance value for non-hits closer than minimum range.
652-
* @param far Distance value for non-hits beyond maximum range.
651+
* @param nearDistance Distance value for non-hits closer than minimum range.
652+
* @param farDistance Distance value for non-hits beyond maximum range.
653653
*/
654-
RGL_API rgl_status_t rgl_node_raytrace_configure_non_hits(rgl_node_t node, float near, float far);
654+
RGL_API rgl_status_t rgl_node_raytrace_configure_non_hits(rgl_node_t node, float nearDistance, float farDistance);
655655

656656
/**
657657
* Creates or modifies FormatPointsNode.

src/api/apiCore.cpp

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -869,15 +869,17 @@ void TapeCore::tape_node_raytrace_configure_distortion(const YAML::Node& yamlNod
869869
rgl_node_raytrace_configure_distortion(node, yamlNode[1].as<bool>());
870870
}
871871

872-
RGL_API rgl_status_t rgl_node_raytrace_configure_non_hits(rgl_node_t node, float near, float far)
872+
RGL_API rgl_status_t rgl_node_raytrace_configure_non_hits(rgl_node_t node, float nearDistance,
873+
float farDistance)
873874
{
874875
auto status = rglSafeCall([&]() {
875-
RGL_API_LOG("rgl_node_raytrace_configure_non_hits(node={}, near={}, far={})", repr(node), near, far);
876+
RGL_API_LOG("rgl_node_raytrace_configure_non_hits(node={}, nearDistance={}, farDistance={})",
877+
repr(node), nearDistance, farDistance);
876878
CHECK_ARG(node != nullptr);
877879
RaytraceNode::Ptr raytraceNode = Node::validatePtr<RaytraceNode>(node);
878-
raytraceNode->setNonHitDistanceValues(near, far);
880+
raytraceNode->setNonHitDistanceValues(nearDistance, farDistance);
879881
});
880-
TAPE_HOOK(node, near, far);
882+
TAPE_HOOK(node, nearDistance, farDistance);
881883
return status;
882884
}
883885

src/graph/NodesCore.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ struct RaytraceNode : IPointsNode
125125
// RaytraceNode specific
126126
void setVelocity(const Vec3f& linearVelocity, const Vec3f& angularVelocity);
127127
void enableRayDistortion(bool enabled) { doApplyDistortion = enabled; }
128-
void setNonHitDistanceValues(float near, float far);
128+
void setNonHitDistanceValues(float nearDistance, float farDistance);
129129

130130
private:
131131
IRaysNode::Ptr raysNode;

src/graph/RaytraceNode.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,8 @@ void RaytraceNode::setVelocity(const Vec3f& linearVelocity, const Vec3f& angular
172172
sensorAngularVelocityRPY = angularVelocity;
173173
}
174174

175-
void RaytraceNode::setNonHitDistanceValues(float near, float far)
175+
void RaytraceNode::setNonHitDistanceValues(float nearDistance, float farDistance)
176176
{
177-
nearNonHitDistance = near;
178-
farNonHitDistance = far;
177+
nearNonHitDistance = nearDistance;
178+
farNonHitDistance = farDistance;
179179
}

0 commit comments

Comments
 (0)