Skip to content
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

Removal of Bezier High Order elements from the basic SOFA distribution #14

Closed
wants to merge 7 commits into from
Closed

Removal of Bezier High Order elements from the basic SOFA distribution #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bb64520
update : remove Bezier Topology files
hdeling Aug 27, 2016
393ab45
REMOVE : Test for BezierTetrahedronTopology
hdeling Aug 28, 2016
9fddff5
REMOVE : test for BezierTetrahedron Topology
hdeling Aug 28, 2016
7e4d744
UPDATE : Removed the definition of Bezier Surface and Bezier Volume (…
hdeling Aug 28, 2016
d3a91b1
UPDATE : removed mesh mass matrix defined for High Order tetrahedron …
hdeling Aug 28, 2016
a11e3fe
REMOVE : removed toplogy mapping defined for High Order tetrahedron …
hdeling Aug 28, 2016
b79a42a
FIX : add "_d" to load plugin on MSVC in debug version
hdeling Aug 28, 2016
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
3 changes: 3 additions & 0 deletions SofaKernel/framework/sofa/helper/system/PluginManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,9 @@ std::string PluginManager::findPlugin(const std::string& pluginName, bool ignore
std::string name(pluginName);
#ifdef SOFA_LIBSUFFIX
name += sofa_tostring(SOFA_LIBSUFFIX);
#endif
#if defined(_DEBUG) && defined(_MSC_VER)
name += "_d";
#endif
const std::string libName = DynamicLibrary::prefix + name + "." + DynamicLibrary::extension;

Expand Down
320 changes: 0 additions & 320 deletions SofaKernel/modules/SofaBaseTopology/SofaBaseTopology_test/BezierTetrahedronTopology_test.cpp
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion SofaKernel/modules/SofaBaseTopology/SofaBaseTopology_test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ cmake_minimum_required(VERSION 2.8.12)
project(SofaBaseTopology_test)

set(SOURCE_FILES
BezierTetrahedronTopology_test.cpp
TetrahedronNumericalIntegration_test.cpp)

add_definitions("-DSOFABASETOPOLOGY_TEST_SCENES_DIR=\"${CMAKE_CURRENT_SOURCE_DIR}/scenes\"")
Expand Down
14 changes: 0 additions & 14 deletions ...ernel/modules/SofaBaseTopology/SofaBaseTopology_test/scenes/BezierTetrahedronTopology.scn
View file
Open in desktop

This file was deleted.

8 changes: 1 addition & 7 deletions modules/SofaGeneralEngine/GenerateCylinder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,13 +90,7 @@ class GenerateCylinder : public core::DataEngine
Data<VecCoord> f_outputTrianglesPositions; ///< ouput triangle positions
Data<SeqTetrahedra> f_tetrahedra; ///< output tetrahedra
Data<SeqTriangles> f_triangles; ///< output triangles
Data<sofa::helper::vector<Real> > f_bezierTriangleWeight; /// output weight for rational Bezier triangles
Data<sofa::helper::vector<bool> > f_isBezierTriangleRational; /// for each Bezier triangle indicates if it is rational or integral
Data<size_t> f_bezierTriangleDegree; /// degree of Bezier triangles
Data<sofa::helper::vector<Real> > f_bezierTetrahedronWeight; /// output weight for rational Bezier triangles
Data<sofa::helper::vector<bool> > f_isBezierTetrahedronRational; /// for each Bezier tetrahedron indicates if it is rational
Data<size_t> f_bezierTetrahedronDegree; /// degree of Bezier tetrahedron
Data<Real > f_radius; /// radius of cylinder
Data<Real > f_radius; /// radius of cylinder
Data<Real > f_height; /// height of cylinder
Data<Coord> f_origin; /// origin
Data<bool> f_openSurface; /// if the triangulated surface is open or not
Expand Down
Loading