Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
CGoGN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
KennethVanhoey
CGoGN
Commits
2112a0e2
Commit
2112a0e2
authored
Aug 21, 2014
by
Sauvage
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' of icube-forge.unistra.fr:sauvage/cgogn into develop
parents
60996323
6d660a62
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
9 deletions
+10
-9
apps_cmake.txt
apps_cmake.txt
+8
-7
include/Algo/Geometry/curvature.hpp
include/Algo/Geometry/curvature.hpp
+2
-2
No files found.
apps_cmake.txt
View file @
2112a0e2
...
...
@@ -132,13 +132,6 @@ ENDIF()
SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/bin/${CMAKE_BUILD_TYPE})
IF(WIN32)
link_directories( ${CGoGN_ROOT_DIR}/lib/${ConfigurationName} ${Boost_LIBRARY_DIRS})
SET(EXECUTABLE_OUTPUT_PATH ${CGoGN_ROOT_DIR}/bin/) # Release/Debug added automatically by visual
ELSE ()
link_directories( ${CGoGN_ROOT_DIR}/lib/${CMAKE_BUILD_TYPE})
SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/bin/${CMAKE_BUILD_TYPE})
ENDIF ()
IF(NOT CMAKE_BUILD_TYPE)
IF (${CMAKE_CURRENT_BINARY_DIR} MATCHES "(.*)Debug|(.*)debug")
...
...
@@ -147,3 +140,11 @@ IF(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE "Release" CACHE STRING "options are: Debug Release RelWithDebInfo MinSizeRel." FORCE)
ENDIF()
ENDIF()
IF(WIN32)
link_directories( ${CGoGN_ROOT_DIR}/lib/${ConfigurationName} ${Boost_LIBRARY_DIRS})
SET(EXECUTABLE_OUTPUT_PATH ${CGoGN_ROOT_DIR}/bin/) # Release/Debug added automatically by visual
ELSE ()
link_directories( ${CGoGN_ROOT_DIR}/lib/${CMAKE_BUILD_TYPE})
SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/bin/${CMAKE_BUILD_TYPE})
ENDIF ()
include/Algo/Geometry/curvature.hpp
View file @
2112a0e2
...
...
@@ -148,7 +148,7 @@ void vertexQuadraticFitting(
nlBegin
(
NL_MATRIX
)
;
foreach_adjacent2
<
EDGE
>
(
map
,
v
,
[
&
]
(
Vertex
it
)
{
typename
PFP
::
VEC3
itp
=
position
[
it
]
;
quadraticFittingAddVertexPos
<
PFP
>
(
v
,
itp
,
localFrame
)
;
//
quadraticFittingAddVertexPos<PFP>(v, itp, localFrame) ;
typename
PFP
::
VEC3
itn
=
normal
[
it
]
;
quadraticFittingAddVertexNormal
<
PFP
>
(
itp
,
itn
,
p
,
localFrame
)
;
});
...
...
@@ -711,7 +711,7 @@ void computeCurvatureVertices_QuadraticFitting(
{
CGoGN
::
Parallel
::
foreach_cell
<
VERTEX
>
(
map
,
[
&
]
(
Vertex
v
,
unsigned
int
threadID
)
{
computeCurvatureVertex_QuadraticFitting
<
PFP
>
(
map
,
v
,
position
,
normal
,
kmax
,
kmin
,
Kmax
,
Kmin
,
threadID
)
;
computeCurvatureVertex_QuadraticFitting
<
PFP
>
(
map
,
v
,
position
,
normal
,
kmax
,
kmin
,
Kmax
,
Kmin
)
;
},
FORCE_CELL_MARKING
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment