Refactor usage of deprecated rgl_node_points_compact (#251)

nebraszka · web-flow · commit 09dba1532d5b · 2024-02-13T14:16:08.000+01:00
diff --git a/test/src/TapeTest.cpp b/test/src/TapeTest.cpp
@@ -239,7 +239,7 @@ TEST_F(TapeTest, RecordPlayAllCalls)
 	EXPECT_RGL_SUCCESS(rgl_node_points_format(&yield, fields.data(), fields.size()));
 
 	rgl_node_t compact = nullptr;
-	EXPECT_RGL_SUCCESS(rgl_node_points_compact(&compact));
+	EXPECT_RGL_SUCCESS(rgl_node_points_compact_by_field(&compact, RGL_FIELD_IS_HIT_I32));
 
 	rgl_node_t compactByField = nullptr;
 	EXPECT_RGL_SUCCESS(rgl_node_points_compact_by_field(&compactByField, IS_HIT_I32));
diff --git a/test/src/graph/DistanceFieldTest.cpp b/test/src/graph/DistanceFieldTest.cpp
@@ -65,7 +65,7 @@ class DistanceFieldTest : public RGLTestWithParam<float>
 		ASSERT_RGL_SUCCESS(rgl_node_rays_set_range(&setRangeNode, &raytraceRange, 1));
 		ASSERT_RGL_SUCCESS(rgl_node_raytrace(&raytraceNode, nullptr));
 		ASSERT_RGL_SUCCESS(rgl_node_points_yield(&yieldPointsNode, fields.data(), fields.size()));
-		//		ASSERT_RGL_SUCCESS(rgl_node_points_compact(&compactPointsNode));
+		//		ASSERT_RGL_SUCCESS(rgl_node_points_compact_by_field(&compactPointsNode, RGL_FIELD_IS_HIT_I32));
 	}
 
 	void getResults(rgl_node_t node = nullptr)
diff --git a/test/src/graph/asyncStressTest.cpp b/test/src/graph/asyncStressTest.cpp
@@ -52,7 +52,7 @@ struct RandomGraph
 		rgl_mat3x4f dummyRay = Mat3x4f::identity().toRGL();
 		EXPECT_RGL_SUCCESS(rgl_node_rays_from_mat3x4f(&useRaysNode, &dummyRay, 1));
 		EXPECT_RGL_SUCCESS(rgl_node_raytrace(&raytraceNode, nullptr));
-		EXPECT_RGL_SUCCESS(rgl_node_points_compact(&compactNode));
+		EXPECT_RGL_SUCCESS(rgl_node_points_compact_by_field(&compactNode, RGL_FIELD_IS_HIT_I32));
 
 		rgl_mat3x4f identity = Mat3x4f::identity().toRGL();
 
diff --git a/test/src/graph/fullLinearTest.cpp b/test/src/graph/fullLinearTest.cpp
@@ -26,7 +26,7 @@ TEST_F(GraphFullLinearTest, FullLinear)
 	EXPECT_RGL_SUCCESS(rgl_node_rays_from_mat3x4f(&useRays, rays.data(), rays.size()));
 	EXPECT_RGL_SUCCESS(rgl_node_rays_transform(&lidarPose, &lidarPoseTf));
 	EXPECT_RGL_SUCCESS(rgl_node_raytrace(&raytrace, nullptr));
-	EXPECT_RGL_SUCCESS(rgl_node_points_compact(&compact));
+	EXPECT_RGL_SUCCESS(rgl_node_points_compact_by_field(&compact, RGL_FIELD_IS_HIT_I32));
 	EXPECT_RGL_SUCCESS(rgl_node_points_transform(&shear, &shearTf));
 
 #if RGL_BUILD_PCL_EXTENSION
diff --git a/test/src/graph/nodeInputImpactTest.cpp b/test/src/graph/nodeInputImpactTest.cpp
@@ -12,7 +12,7 @@ class GraphNodeInputImpactTest : public RGLTest
 TEST_F(GraphNodeInputImpactTest, DetectMissingInput)
 {
 	rgl_node_t compact = nullptr; // Simplest to construct Node requiring Input
-	ASSERT_RGL_SUCCESS(rgl_node_points_compact(&compact));
+	ASSERT_RGL_SUCCESS(rgl_node_points_compact_by_field(&compact, RGL_FIELD_IS_HIT_I32));
 	EXPECT_RGL_STATUS(rgl_graph_run(compact), RGL_INVALID_PIPELINE);
 }
 
diff --git a/test/src/graph/nodeRemovalTest.cpp b/test/src/graph/nodeRemovalTest.cpp
@@ -34,7 +34,7 @@ TEST_F(GraphNodeRemovalTest, NodeRemoval)
 	EXPECT_RGL_SUCCESS(rgl_node_rays_from_mat3x4f(&useRays, rays.data(), rays.size()));
 	EXPECT_RGL_SUCCESS(rgl_node_rays_transform(&lidarPose, &lidarPoseTf));
 	EXPECT_RGL_SUCCESS(rgl_node_raytrace(&raytrace, nullptr));
-	EXPECT_RGL_SUCCESS(rgl_node_points_compact(&compact));
+	EXPECT_RGL_SUCCESS(rgl_node_points_compact_by_field(&compact, RGL_FIELD_IS_HIT_I32));
 	EXPECT_RGL_SUCCESS(rgl_node_points_transform(&transformPts, &zeroTf));
 	EXPECT_RGL_SUCCESS(rgl_node_points_temporal_merge(&temporalMerge, tMergeFields.data(), tMergeFields.size()));
 
diff --git a/test/src/graph/nodes/FormatPointsNodeTest.cpp b/test/src/graph/nodes/FormatPointsNodeTest.cpp
@@ -316,7 +316,7 @@ TEST_F(FormatPointsNodeTest, changing_required_fields_between_runs)
 
 	ASSERT_RGL_SUCCESS(rgl_node_rays_from_mat3x4f(&useRays, rays.data(), rays.size()));
 	ASSERT_RGL_SUCCESS(rgl_node_raytrace(&raytrace, nullptr));
-	ASSERT_RGL_SUCCESS(rgl_node_points_compact(&compact));
+	ASSERT_RGL_SUCCESS(rgl_node_points_compact_by_field(&compact, RGL_FIELD_IS_HIT_I32));
 	ASSERT_RGL_SUCCESS(rgl_node_points_format(&format, subsequentFormatFields[0].data(), subsequentFormatFields[0].size()));
 
 	ASSERT_RGL_SUCCESS(rgl_graph_node_add_child(useRays, raytrace));
diff --git a/test/src/graph/nodes/SpatialMergePointsNodeTest.cpp b/test/src/graph/nodes/SpatialMergePointsNodeTest.cpp
@@ -68,7 +68,7 @@ TEST_F(SpatialMergePointsNodeTest, spatial_merge_from_transforms)
 	EXPECT_RGL_SUCCESS(rgl_node_rays_from_mat3x4f(&useRays, rays.data(), rays.size()));
 	EXPECT_RGL_SUCCESS(rgl_node_rays_transform(&lidarPose, &lidarPoseTf));
 	EXPECT_RGL_SUCCESS(rgl_node_raytrace(&raytrace, nullptr));
-	EXPECT_RGL_SUCCESS(rgl_node_points_compact(&compact));
+	EXPECT_RGL_SUCCESS(rgl_node_points_compact_by_field(&compact, RGL_FIELD_IS_HIT_I32));
 	EXPECT_RGL_SUCCESS(rgl_node_points_transform(&transformPtsZero, &zeroTf));
 	EXPECT_RGL_SUCCESS(rgl_node_points_transform(&transformPtsY, &translateYTf));
 	EXPECT_RGL_SUCCESS(rgl_node_points_spatial_merge(&spatialMerge, sMergeFields.data(), sMergeFields.size()));
diff --git a/test/src/graph/nodes/TemporalMergePointsNodeTest.cpp b/test/src/graph/nodes/TemporalMergePointsNodeTest.cpp
@@ -68,7 +68,7 @@ TEST_F(TemporalMergePointsNodeTest, temporal_merge)
 	EXPECT_RGL_SUCCESS(rgl_node_rays_from_mat3x4f(&useRays, rays.data(), rays.size()));
 	EXPECT_RGL_SUCCESS(rgl_node_rays_transform(&lidarPose, &lidarPoseTf));
 	EXPECT_RGL_SUCCESS(rgl_node_raytrace(&raytrace, nullptr));
-	EXPECT_RGL_SUCCESS(rgl_node_points_compact(&compact));
+	EXPECT_RGL_SUCCESS(rgl_node_points_compact_by_field(&compact, RGL_FIELD_IS_HIT_I32));
 	EXPECT_RGL_SUCCESS(rgl_node_points_transform(&transformPts, &zeroTf));
 	EXPECT_RGL_SUCCESS(rgl_node_points_temporal_merge(&temporalMerge, tMergeFields.data(), tMergeFields.size()));
 
diff --git a/test/src/graph/nodes/VisualizePointsNodeTest.cpp b/test/src/graph/nodes/VisualizePointsNodeTest.cpp
@@ -34,7 +34,7 @@
 //	EXPECT_RGL_SUCCESS(rgl_node_rays_from_mat3x4f(&useRays, rays.data(), rays.size()));
 //	EXPECT_RGL_SUCCESS(rgl_node_rays_transform(&lidarPose, &lidarPoseTf));
 //	EXPECT_RGL_SUCCESS(rgl_node_raytrace(&raytrace, nullptr));
-//	EXPECT_RGL_SUCCESS(rgl_node_points_compact(&compact));
+//	EXPECT_RGL_SUCCESS(rgl_node_points_compact_by_field(&compact, RGL_FIELD_IS_HIT_I32));
 //	EXPECT_RGL_SUCCESS(rgl_node_points_transform(&transformPts, &zeroTf));
 //	EXPECT_RGL_SUCCESS(rgl_node_points_visualize(&visualize,  "aaa", 800, 600, false));
 //	EXPECT_RGL_SUCCESS(rgl_node_points_visualize(&visualize2,  "bbb", 800, 600, false));
diff --git a/test/src/scene/entityVelocityTest.cpp b/test/src/scene/entityVelocityTest.cpp
@@ -153,7 +153,7 @@ TEST(EntityVelocity, Interactive)
 	EXPECT_RGL_SUCCESS(rgl_node_rays_from_mat3x4f(&rays, raysTf.data(), raysTf.size()));
 	EXPECT_RGL_SUCCESS(rgl_node_rays_transform(&rayTransform, &lidarPoseRGL));
 	EXPECT_RGL_SUCCESS(rgl_node_raytrace(&raytrace, nullptr));
-	EXPECT_RGL_SUCCESS(rgl_node_points_compact(&compact));
+	EXPECT_RGL_SUCCESS(rgl_node_points_compact_by_field(&compact, RGL_FIELD_IS_HIT_I32));
 	EXPECT_RGL_SUCCESS(rgl_node_points_transform(&transformPoints, &lidarPoseRGL));
 	EXPECT_RGL_SUCCESS(rgl_node_points_format(&format, fields.data(), fields.size()));
 	EXPECT_RGL_SUCCESS(rgl_node_points_ros2_publish(&publish, "EntityVelocityTest", "world"));
diff --git a/test/src/scene/rcsAngleDistributionTest.cpp b/test/src/scene/rcsAngleDistributionTest.cpp
@@ -34,7 +34,7 @@ TEST_F(RcsAngleDistributionTest, rotating_reflector_2d)
 	rgl_node_t raysNode = nullptr, raytraceNode = nullptr, compactNode = nullptr, formatNode = nullptr, ros2Node = nullptr;
 	EXPECT_RGL_SUCCESS(rgl_node_rays_from_mat3x4f(&raysNode, rays.data(), rays.size()));
 	EXPECT_RGL_SUCCESS(rgl_node_raytrace(&raytraceNode, nullptr));
-	EXPECT_RGL_SUCCESS(rgl_node_points_compact(&compactNode));
+	EXPECT_RGL_SUCCESS(rgl_node_points_compact_by_field(&compactNode, RGL_FIELD_IS_HIT_I32));
 	EXPECT_RGL_SUCCESS(rgl_node_points_format(&formatNode, fields.data(), fields.size()));
 	EXPECT_RGL_SUCCESS(rgl_node_points_ros2_publish(&ros2Node, "rgl_test_topic", "rgl_test_frame_id"));
 
diff --git a/test/src/scene/textureTest.cpp b/test/src/scene/textureTest.cpp
@@ -62,7 +62,7 @@ TEST_P(TextureTest, rgl_texture_reading)
 
 	EXPECT_RGL_SUCCESS(rgl_node_rays_from_mat3x4f(&useRaysNode, rays.data(), rays.size()));
 	EXPECT_RGL_SUCCESS(rgl_node_raytrace(&raytraceNode, nullptr));
-	EXPECT_RGL_SUCCESS(rgl_node_points_compact(&compactNode));
+	EXPECT_RGL_SUCCESS(rgl_node_points_compact_by_field(&compactNode, RGL_FIELD_IS_HIT_I32));
 	EXPECT_RGL_SUCCESS(rgl_node_points_yield(&yieldNode, yieldFields.data(), yieldFields.size()));
 
 	EXPECT_RGL_SUCCESS(rgl_graph_node_add_child(useRaysNode, raytraceNode));
diff --git a/test/src/synchronization/graphThreadSynchronization.cpp b/test/src/synchronization/graphThreadSynchronization.cpp
@@ -32,7 +32,7 @@ struct LinearGraph
 		EXPECT_RGL_SUCCESS(rgl_node_rays_from_mat3x4f(&useRaysNode, rays.data(), rays.size()));
 		EXPECT_RGL_SUCCESS(rgl_node_rays_transform(&transformRaysNode, &lidarPoseTf));
 		EXPECT_RGL_SUCCESS(rgl_node_raytrace(&raytraceNode, nullptr));
-		EXPECT_RGL_SUCCESS(rgl_node_points_compact(&compactNode));
+		EXPECT_RGL_SUCCESS(rgl_node_points_compact_by_field(&compactNode, RGL_FIELD_IS_HIT_I32));
 		EXPECT_RGL_SUCCESS(rgl_node_points_transform(&transformPointsNode, &shearTf));
 
 		EXPECT_RGL_SUCCESS(rgl_graph_node_add_child(useRaysNode, transformRaysNode));

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ class DistanceFieldTest : public RGLTestWithParam<float>`
`65`	`65`	`ASSERT_RGL_SUCCESS(rgl_node_rays_set_range(&setRangeNode, &raytraceRange, 1));`
`66`	`66`	`ASSERT_RGL_SUCCESS(rgl_node_raytrace(&raytraceNode, nullptr));`
`67`	`67`	`ASSERT_RGL_SUCCESS(rgl_node_points_yield(&yieldPointsNode, fields.data(), fields.size()));`
`68`		`- // ASSERT_RGL_SUCCESS(rgl_node_points_compact(&compactPointsNode));`
	`68`	`+ // ASSERT_RGL_SUCCESS(rgl_node_points_compact_by_field(&compactPointsNode, RGL_FIELD_IS_HIT_I32));`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`void getResults(rgl_node_t node = nullptr)`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ class GraphNodeInputImpactTest : public RGLTest`
`12`	`12`	`TEST_F(GraphNodeInputImpactTest, DetectMissingInput)`
`13`	`13`	`{`
`14`	`14`	`rgl_node_t compact = nullptr; // Simplest to construct Node requiring Input`
`15`		`- ASSERT_RGL_SUCCESS(rgl_node_points_compact(&compact));`
	`15`	`+ ASSERT_RGL_SUCCESS(rgl_node_points_compact_by_field(&compact, RGL_FIELD_IS_HIT_I32));`
`16`	`16`	`EXPECT_RGL_STATUS(rgl_graph_run(compact), RGL_INVALID_PIPELINE);`
`17`	`17`	`}`
`18`	`18`