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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Hurstel
CGoGN
Commits
a932841f
Commit
a932841f
authored
Dec 08, 2011
by
Pierre Kraemer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
correct apps_cmake.txt
parent
0dc114ac
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
10 additions
and
32 deletions
+10
-32
apps_cmake.txt
apps_cmake.txt
+1
-6
include/Algo/Decimation/lightfieldApproximator.hpp
include/Algo/Decimation/lightfieldApproximator.hpp
+2
-2
include/Algo/Export/export.h
include/Algo/Export/export.h
+0
-6
include/Algo/Export/export.hpp
include/Algo/Export/export.hpp
+0
-14
include/Algo/Filtering/bilateral.h
include/Algo/Filtering/bilateral.h
+4
-1
include/Algo/Geometry/normalization.h
include/Algo/Geometry/normalization.h
+1
-1
include/Topology/generic/mapBrowser.h
include/Topology/generic/mapBrowser.h
+2
-2
No files found.
apps_cmake.txt
View file @
a932841f
...
...
@@ -72,11 +72,8 @@ ENDIF (WITH_QT)
IF (WITH_NUMERICAL)
add_definitions(-DWITH_NUMERICAL)
# SET (NUMERICAL_INCLUDES ${CGoGN_ROOT_DIR}/ThirdParty/Numerical ${CGoGN_ROOT_DIR}/ThirdParty/Numerical/UFconfig)
# SET (NUMERICAL_LIBS f2c blas numerical lapack)
SET (COMMON_INCLUDES ${COMMON_INCLUDES} ${CGoGN_ROOT_DIR}/ThirdParty/Numerical ${CGoGN_ROOT_DIR}/ThirdParty/Numerical/UFconfig)
SET (COMMON_LIBS ${COMMON_LIBS}
f2c blas numerical lapack
)
SET (COMMON_LIBS ${COMMON_LIBS}
numerical lapack blas f2c
)
ENDIF (WITH_NUMERICAL)
...
...
@@ -102,5 +99,3 @@ SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/bin)
SET(CGoGN_LIBS_D topologyD algoD containerD utilsD)
SET(CGoGN_LIBS_R topology algo container utils)
include/Algo/Decimation/lightfieldApproximator.hpp
View file @
a932841f
...
...
@@ -53,7 +53,7 @@ bool Approximator_RGBfunctionsHalf<PFP>::init()
m_approxFrame
=
this
->
m_map
.
template
getAttribute
<
MATRIX33
>(
EDGE
,
"approx_frame"
)
;
m_quadricRGBfunctions
=
this
->
m_map
.
template
getAttribute
<
QuadricRGBfunctions
<
REAL
>
>
(
EDGE
,
"quadricRGBfunctions"
)
;
MapBrowserLinked
Auto
<
typename
PFP
::
MAP
>
mb
(
this
->
m_map
)
;
MapBrowserLinked
<
typename
PFP
::
MAP
>
mb
(
this
->
m_map
)
;
this
->
m_map
.
foreach_orbit
(
EDGE
,
mb
)
;
// create quadric embedding for computing and set them to 0
...
...
@@ -196,7 +196,7 @@ bool Approximator_RGBfunctions<PFP>::init()
m_approxFrame
=
this
->
m_map
.
template
getAttribute
<
MATRIX33
>(
EDGE
,
"approx_frame"
)
;
m_quadricRGBfunctions
=
this
->
m_map
.
template
getAttribute
<
QuadricRGBfunctions
<
REAL
>
>
(
EDGE
,
"quadricRGBfunctions"
)
;
MapBrowserLinked
Auto
<
typename
PFP
::
MAP
>
mb
(
this
->
m_map
)
;
MapBrowserLinked
<
typename
PFP
::
MAP
>
mb
(
this
->
m_map
)
;
this
->
m_map
.
foreach_orbit
(
EDGE
,
mb
)
;
// create quadric embedding for computing and set them to 0
...
...
include/Algo/Export/export.h
View file @
a932841f
...
...
@@ -90,12 +90,6 @@ bool exportPlyPTMgeneric(typename PFP::MAP& map, const char* filename, const typ
template
<
typename
PFP
>
bool
exportPLYPTM
(
typename
PFP
::
MAP
&
map
,
const
char
*
filename
,
const
typename
PFP
::
TVEC3
&
position
,
const
typename
PFP
::
TVEC3
frame
[
3
],
const
typename
PFP
::
TVEC3
colorPTM
[
6
],
const
FunctorSelect
&
good
)
;
/**
* export pout l'InESS
*/
template
<
typename
PFP
>
bool
exportInESS
(
typename
PFP
::
MAP
&
map
,
const
char
*
filename
,
const
typename
PFP
::
TVEC3
&
position
);
}
// namespace Export
}
// namespace Algo
...
...
include/Algo/Export/export.hpp
View file @
a932841f
...
...
@@ -434,20 +434,6 @@ bool exportPLYPTM(typename PFP::MAP& map, const char* filename, const typename P
return
true
;
}
template
<
typename
PFP
>
bool
exportInESS
(
typename
PFP
::
MAP
&
map
,
const
char
*
filename
,
const
typename
PFP
::
TVEC3
&
position
)
{
typedef
typename
PFP
::
MAP
MAP
;
typedef
typename
PFP
::
VEC3
VEC3
;
std
::
ofstream
out
(
filename
,
std
::
ios
::
out
)
;
if
(
!
out
.
good
())
{
CGoGNerr
<<
"Unable to open file "
<<
CGoGNendl
;
return
false
;
}
}
}
// namespace Export
}
// namespace Algo
...
...
include/Algo/Filtering/bilateral.h
View file @
a932841f
...
...
@@ -69,6 +69,9 @@ void filterBilateral(typename PFP::MAP& map, const typename PFP::TVEC3& position
{
if
(
!
map
.
isBoundaryVertex
(
d
))
{
// get normal of vertex
const
VEC3
&
normal_d
=
normal
[
d
]
;
// traversal of incident edges
float
sum
=
0.0
f
,
normalizer
=
0.0
f
;
Traversor2VE
<
typename
PFP
::
MAP
>
te
(
map
,
d
)
;
...
...
@@ -82,7 +85,7 @@ void filterBilateral(typename PFP::MAP& map, const typename PFP::TVEC3& position
normalizer
+=
wcs
;
}
position2
[
d
]
=
position
[
d
]
+
((
sum
/
normalizer
)
*
normal
[
d
]
)
;
position2
[
d
]
=
position
[
d
]
+
((
sum
/
normalizer
)
*
normal
_d
)
;
}
else
position2
[
d
]
=
position
[
d
]
;
...
...
include/Algo/Geometry/normalization.h
View file @
a932841f
...
...
@@ -43,7 +43,7 @@ typename PFP::REAL normalizeLength(typename PFP::MAP & the_map, typename PFP::TV
typename
PFP
::
REAL
sum
=
0
;
int
count
=
0
;
MapBrowserLinked
Auto
<
typename
PFP
::
MAP
>
mb
(
the_map
)
;
MapBrowserLinked
<
typename
PFP
::
MAP
>
mb
(
the_map
)
;
the_map
.
foreach_orbit
(
m_attr
.
getOrbit
(),
mb
)
;
for
(
Dart
d
=
mb
.
begin
();
d
!=
mb
.
end
();
mb
.
next
(
d
))
...
...
include/Topology/generic/mapBrowser.h
View file @
a932841f
...
...
@@ -74,7 +74,7 @@ public:
* a foreach_cell which adds darts in the list
*/
template
<
typename
MAP
>
class
MapBrowserLinked
:
public
MapBrowser
,
public
FunctorType
class
MapBrowserLinked
:
public
MapBrowser
,
public
FunctorType
{
protected:
// The browsed map
...
...
@@ -181,6 +181,6 @@ public:
}
}
;
}
//
end
namespace CGoGN
}
// namespace CGoGN
#endif
/* MAPBROWSER_H_ */
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