Merge branch 'fix_v15/rename_global_epsilon_to_GLOBAL_EPSILON' of https://github.com/Geode-solutions/OpenGeode-inspector into fix_v15/rename_global_epsilon_to_GLOBAL_EPSILON

benoit2776 · benoit2776 · commit b3f36cf3a06d · 2024-07-12T13:51:35.000+02:00
diff --git a/src/geode/inspector/criterion/intersections/model_intersections.cpp b/src/geode/inspector/criterion/intersections/model_intersections.cpp
@@ -92,7 +92,7 @@ namespace
               mesh2_( same_surface_
                           ? mesh1_
                           : surface2_.template mesh<
-                                geode::TriangulatedSurface< Model::dim > >() )
+                              geode::TriangulatedSurface< Model::dim > >() )
         {
         }
 
@@ -170,7 +170,7 @@ namespace
             const geode::uuid& surface_id1,
             const geode::uuid& surface_id2 )
             : ModelSurfacesIntersectionBase< Model >(
-                  model, surface_id1, surface_id2 ),
+                model, surface_id1, surface_id2 ),
               same_surface_{ surface_id1 == surface_id2 }
         {
         }
@@ -208,7 +208,7 @@ namespace
             const geode::uuid& surface_id1,
             const geode::uuid& surface_id2 )
             : ModelSurfacesIntersectionBase< Model >(
-                  model, surface_id1, surface_id2 ),
+                model, surface_id1, surface_id2 ),
               same_surface_{ surface_id1 == surface_id2 }
         {
         }

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ namespace`
`92`	`92`	`mesh2_( same_surface_`
`93`	`93`	`? mesh1_`
`94`	`94`	`: surface2_.template mesh<`
`95`		`- geode::TriangulatedSurface< Model::dim > >() )`
	`95`	`+ geode::TriangulatedSurface< Model::dim > >() )`
`96`	`96`	`{`
`97`	`97`	`}`
`98`	`98`
`@@ -170,7 +170,7 @@ namespace`
`170`	`170`	`const geode::uuid& surface_id1,`
`171`	`171`	`const geode::uuid& surface_id2 )`
`172`	`172`	`: ModelSurfacesIntersectionBase< Model >(`
`173`		`- model, surface_id1, surface_id2 ),`
	`173`	`+ model, surface_id1, surface_id2 ),`
`174`	`174`	`same_surface_{ surface_id1 == surface_id2 }`
`175`	`175`	`{`
`176`	`176`	`}`
`@@ -208,7 +208,7 @@ namespace`
`208`	`208`	`const geode::uuid& surface_id1,`
`209`	`209`	`const geode::uuid& surface_id2 )`
`210`	`210`	`: ModelSurfacesIntersectionBase< Model >(`
`211`		`- model, surface_id1, surface_id2 ),`
	`211`	`+ model, surface_id1, surface_id2 ),`
`212`	`212`	`same_surface_{ surface_id1 == surface_id2 }`
`213`	`213`	`{`
`214`	`214`	`}`