Skip to content

Refactorize includes to fix compilation #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bakpaul wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Refactorize includes to fix compilation #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b31d56
Refactorize includes to fix compilation
bakpaul Jul 16, 2026
cfff5aa
Fix compilation
bakpaul Jul 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 30 additions & 26 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,41 +7,43 @@ if(NOT TARGET Sofa.Framework)
endif()
sofa_find_package(Sofa.Component.Topology.Container.Constant REQUIRED)

set(SOFAIMPLICITFIELD_SRC "src/${PROJECT_NAME}")

set(HEADER_FILES
config.h.in
initSofaImplicitField.h
MarchingCube.h
${SOFAIMPLICITFIELD_SRC}/config.h.in
${SOFAIMPLICITFIELD_SRC}/initSofaImplicitField.h
${SOFAIMPLICITFIELD_SRC}/MarchingCube.h

# This is backward compatibility
deprecated/SphereSurface.h
deprecated/ImplicitSurfaceContainer.h # This is a backward compatibility file toward ScalarField
deprecated/InterpolatedImplicitSurface.h # This is a backward compatibility file toward DiscreteGridField
${SOFAIMPLICITFIELD_SRC}/deprecated/SphereSurface.h
${SOFAIMPLICITFIELD_SRC}/deprecated/ImplicitSurfaceContainer.h # This is a backward compatibility file toward ScalarField
${SOFAIMPLICITFIELD_SRC}/deprecated/InterpolatedImplicitSurface.h # This is a backward compatibility file toward DiscreteGridField

components/engine/FieldToSurfaceMesh.h
components/geometry/BottleField.h
components/geometry/DiscreteGridField.h
components/geometry/SphericalField.h
components/geometry/ScalarField.h
components/geometry/StarShapedField.h
components/mapping/ImplicitSurfaceMapping.h
components/mapping/ImplicitSurfaceMapping.inl
${SOFAIMPLICITFIELD_SRC}/components/engine/FieldToSurfaceMesh.h
${SOFAIMPLICITFIELD_SRC}/components/geometry/BottleField.h
${SOFAIMPLICITFIELD_SRC}/components/geometry/DiscreteGridField.h
${SOFAIMPLICITFIELD_SRC}/components/geometry/SphericalField.h
${SOFAIMPLICITFIELD_SRC}/components/geometry/ScalarField.h
${SOFAIMPLICITFIELD_SRC}/components/geometry/StarShapedField.h
${SOFAIMPLICITFIELD_SRC}/components/mapping/ImplicitSurfaceMapping.h
${SOFAIMPLICITFIELD_SRC}/components/mapping/ImplicitSurfaceMapping.inl
)

set(SOURCE_FILES
initSofaImplicitField.cpp
MarchingCube.cpp
${SOFAIMPLICITFIELD_SRC}/initSofaImplicitField.cpp
${SOFAIMPLICITFIELD_SRC}/MarchingCube.cpp

## This is a backward compatibility..
deprecated/SphereSurface.cpp
deprecated/InterpolatedImplicitSurface.cpp

components/engine/FieldToSurfaceMesh.cpp
components/geometry/BottleField.cpp
components/geometry/ScalarField.cpp
components/geometry/DiscreteGridField.cpp
components/geometry/SphericalField.cpp
components/geometry/StarShapedField.cpp
components/mapping/ImplicitSurfaceMapping.cpp
${SOFAIMPLICITFIELD_SRC}/deprecated/SphereSurface.cpp
${SOFAIMPLICITFIELD_SRC}/deprecated/InterpolatedImplicitSurface.cpp
${SOFAIMPLICITFIELD_SRC}/components/engine/FieldToSurfaceMesh.cpp
${SOFAIMPLICITFIELD_SRC}/components/geometry/BottleField.cpp
${SOFAIMPLICITFIELD_SRC}/components/geometry/ScalarField.cpp
${SOFAIMPLICITFIELD_SRC}/components/geometry/DiscreteGridField.cpp
${SOFAIMPLICITFIELD_SRC}/components/geometry/SphericalField.cpp
${SOFAIMPLICITFIELD_SRC}/components/geometry/StarShapedField.cpp
${SOFAIMPLICITFIELD_SRC}/components/mapping/ImplicitSurfaceMapping.cpp
)

set(EXTRA_FILES
Expand All @@ -65,5 +67,7 @@ sofa_create_package_with_targets(
PACKAGE_NAME ${PROJECT_NAME}
PACKAGE_VERSION ${PROJECT_VERSION}
TARGETS ${PROJECT_NAME} AUTO_SET_TARGET_PROPERTIES
INCLUDE_SOURCE_DIR "src"
INCLUDE_INSTALL_DIR "${PROJECT_NAME}"
RELOCATABLE "plugins"
)
0 MarchingCube.cpp → src/SofaImplicitField/MarchingCube.cpp
View file
Open in desktop
File renamed without changes.
0 MarchingCube.h → src/SofaImplicitField/MarchingCube.h
View file
Open in desktop
File renamed without changes.
0 components/engine/FieldToSurfaceMesh.cpp → .../components/engine/FieldToSurfaceMesh.cpp
View file
Open in desktop
File renamed without changes.
0 components/engine/FieldToSurfaceMesh.h → ...ld/components/engine/FieldToSurfaceMesh.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion components/geometry/BottleField.cpp → ...Field/components/geometry/BottleField.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include <sofa/core/ObjectFactory.h>
using sofa::core::RegisterObject ;

#include "BottleField.h"
#include <SofaImplicitField/components/geometry/BottleField.h>

namespace sofa::component::geometry::_BottleField_
{
Expand Down
2 changes: 1 addition & 1 deletion components/geometry/BottleField.h → ...itField/components/geometry/BottleField.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
******************************************************************************/
#pragma once

#include "ScalarField.h"
#include <SofaImplicitField/components/geometry/ScalarField.h>
#include <sofa/type/Mat.h>
namespace sofa::component::geometry
{
Expand Down
2 changes: 1 addition & 1 deletion components/geometry/DiscreteGridField.cpp → ...components/geometry/DiscreteGridField.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include <sofa/core/ObjectFactory.h>
using sofa::core::RegisterObject ;

#include "DiscreteGridField.h"
#include <SofaImplicitField/components/geometry/DiscreteGridField.h>


namespace sofa::component::geometry::_discretegrid_
Expand Down
0 components/geometry/DiscreteGridField.h → ...d/components/geometry/DiscreteGridField.h
View file
Open in desktop
File renamed without changes.
3 changes: 2 additions & 1 deletion components/geometry/ScalarField.cpp → ...Field/components/geometry/ScalarField.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@


#include <sofa/core/ObjectFactory.h>
#include "ScalarField.h"
#include <SofaImplicitField/components/geometry/ScalarField.h>

namespace sofa
{

Expand Down
0 components/geometry/ScalarField.h → ...itField/components/geometry/ScalarField.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion components/geometry/SphericalField.cpp → ...ld/components/geometry/SphericalField.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include <sofa/core/ObjectFactory.h>
using sofa::core::RegisterObject ;

#include "SphericalField.h"
#include <SofaImplicitField/components/geometry/SphericalField.h>

namespace sofa::component::geometry::_sphericalfield_
{
Expand Down
2 changes: 1 addition & 1 deletion components/geometry/SphericalField.h → ...ield/components/geometry/SphericalField.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#ifndef SOFA_IMPLICIT_SPHERICALFIELD_H
#define SOFA_IMPLICIT_SPHERICALFIELD_H

#include "ScalarField.h"
#include <SofaImplicitField/components/geometry/ScalarField.h>

namespace sofa
{
Expand Down
2 changes: 1 addition & 1 deletion components/geometry/StarShapedField.cpp → ...d/components/geometry/StarShapedField.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include <sofa/core/ObjectFactory.h>
using sofa::core::RegisterObject ;

#include "StarShapedField.h"
#include <SofaImplicitField/components/geometry/StarShapedField.h>

namespace sofa::component::geometry::_StarShapedField_
{
Expand Down
2 changes: 1 addition & 1 deletion components/geometry/StarShapedField.h → ...eld/components/geometry/StarShapedField.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
******************************************************************************/
#pragma once

#include "ScalarField.h"
#include <SofaImplicitField/components/geometry/ScalarField.h>
#include <sofa/type/Mat.h>

namespace sofa::component::geometry
Expand Down
2 changes: 1 addition & 1 deletion ...onents/mapping/ImplicitSurfaceMapping.cpp → ...onents/mapping/ImplicitSurfaceMapping.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#define SOFA_COMPONENT_MAPPING_IMPLICITSURFACEMAPPING_CPP
#include <SofaImplicitField/config.h>
#include <sofa/core/ObjectFactory.h>
#include "ImplicitSurfaceMapping.inl"
#include <SofaImplicitField/components/mapping/ImplicitSurfaceMapping.inl>

namespace sofaimplicitfield::mapping
{
Expand Down
0 components/mapping/ImplicitSurfaceMapping.h → ...mponents/mapping/ImplicitSurfaceMapping.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...onents/mapping/ImplicitSurfaceMapping.inl → ...onents/mapping/ImplicitSurfaceMapping.inl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
******************************************************************************/
#pragma once

#include "ImplicitSurfaceMapping.h"
#include <SofaImplicitField/components/mapping/ImplicitSurfaceMapping.h>
#include <sofa/core/visual/VisualParams.h>
#include <sofa/helper/rmath.h>
#include <map>
Expand Down
0 config.h.in → src/SofaImplicitField/config.h.in
View file
Open in desktop
File renamed without changes.
0 deprecated/ImplicitSurfaceContainer.h → ...eld/deprecated/ImplicitSurfaceContainer.h
View file
Open in desktop
File renamed without changes.
0 deprecated/ImplicitSurfaceMapping.h → ...Field/deprecated/ImplicitSurfaceMapping.h
View file
Open in desktop
File renamed without changes.
0 deprecated/ImplicitSurfaceMapping.inl → ...eld/deprecated/ImplicitSurfaceMapping.inl
View file
Open in desktop
File renamed without changes.
0 deprecated/InterpolatedImplicitSurface.cpp → ...eprecated/InterpolatedImplicitSurface.cpp
View file
Open in desktop
File renamed without changes.
0 deprecated/InterpolatedImplicitSurface.h → .../deprecated/InterpolatedImplicitSurface.h
View file
Open in desktop
File renamed without changes.
0 deprecated/SphereSurface.cpp → ...mplicitField/deprecated/SphereSurface.cpp
View file
Open in desktop
File renamed without changes.
0 deprecated/SphereSurface.h → ...aImplicitField/deprecated/SphereSurface.h
View file
Open in desktop
File renamed without changes.
0 initSofaImplicitField.cpp → ...faImplicitField/initSofaImplicitField.cpp
View file
Open in desktop
File renamed without changes.
0 initSofaImplicitField.h → ...SofaImplicitField/initSofaImplicitField.h
View file
Open in desktop
File renamed without changes.
Loading