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
965a1a05
Commit
965a1a05
authored
Mar 26, 2012
by
Pierre Kraemer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mini corrections (some warnings)
parent
0ff930b2
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
6 additions
and
8 deletions
+6
-8
include/Algo/Import/import2tables.h
include/Algo/Import/import2tables.h
+2
-3
include/Algo/Import/import2tablesVolume.hpp
include/Algo/Import/import2tablesVolume.hpp
+2
-2
include/Utils/textures.hpp
include/Utils/textures.hpp
+1
-1
src/Algo/Import/importPlyData.cpp
src/Algo/Import/importPlyData.cpp
+1
-1
src/Utils/Qt/qtSimple.cpp
src/Utils/Qt/qtSimple.cpp
+0
-1
No files found.
include/Algo/Import/import2tables.h
View file @
965a1a05
...
...
@@ -184,10 +184,9 @@ public:
inline
unsigned
int
getEmbIdx
(
int
i
)
{
return
m_emb
[
i
];
}
bool
importMesh
(
const
std
::
string
&
filename
,
std
::
vector
<
std
::
string
>&
attrNames
,
ImportVolumique
::
ImportType
kind
,
float
scaleFactor
);
bool
importTet
(
const
std
::
string
&
filename
,
std
::
vector
<
std
::
string
>&
attrNames
,
float
scaleFactor
);
bool
importMesh
(
const
std
::
string
&
filename
,
std
::
vector
<
std
::
string
>&
attrNames
,
ImportVolumique
::
ImportType
kind
,
float
scaleFactor
=
1.0
f
);
bool
importTet
(
const
std
::
string
&
filename
,
std
::
vector
<
std
::
string
>&
attrNames
,
float
scaleFactor
=
1.0
f
);
MeshTablesVolume
(
typename
PFP
::
MAP
&
map
)
:
m_map
(
map
)
...
...
include/Algo/Import/import2tablesVolume.hpp
View file @
965a1a05
...
...
@@ -47,7 +47,7 @@ ImportVolumique::ImportType MeshTablesVolume<PFP>::getFileType(const std::string
}
template
<
typename
PFP
>
bool
MeshTablesVolume
<
PFP
>::
importMesh
(
const
std
::
string
&
filename
,
std
::
vector
<
std
::
string
>&
attrNames
,
ImportVolumique
::
ImportType
kind
,
float
scaleFactor
=
1.0
f
)
bool
MeshTablesVolume
<
PFP
>::
importMesh
(
const
std
::
string
&
filename
,
std
::
vector
<
std
::
string
>&
attrNames
,
ImportVolumique
::
ImportType
kind
,
float
scaleFactor
)
{
if
(
kind
==
ImportVolumique
::
UNKNOWNVOLUME
)
kind
=
getFileType
(
filename
);
...
...
@@ -69,7 +69,7 @@ bool MeshTablesVolume<PFP>::importMesh(const std::string& filename, std::vector<
}
template
<
typename
PFP
>
bool
MeshTablesVolume
<
PFP
>::
importTet
(
const
std
::
string
&
filename
,
std
::
vector
<
std
::
string
>&
attrNames
,
float
scaleFactor
=
1.0
f
)
bool
MeshTablesVolume
<
PFP
>::
importTet
(
const
std
::
string
&
filename
,
std
::
vector
<
std
::
string
>&
attrNames
,
float
scaleFactor
)
{
AttributeHandler
<
VEC3
>
positions
=
m_map
.
template
getAttribute
<
VEC3
>(
VERTEX
,
"position"
)
;
...
...
include/Utils/textures.hpp
View file @
965a1a05
...
...
@@ -863,7 +863,7 @@ Filter<DIM>* Filter<DIM>::createGaussian(int radius, double sigma)
break
;
case
2
:
{
double
tot
=
0.0
;
//
double tot=0.0;
double
coef
=
1.0
/
(
sig2
*
M_PI
);
for
(
int
j
=
0
;
j
<
sz
;
++
j
)
for
(
int
i
=
0
;
i
<
sz
;
++
i
)
...
...
src/Algo/Import/importPlyData.cpp
View file @
965a1a05
...
...
@@ -60,8 +60,8 @@ PlyImportData::PlyImportData():
flist
(
NULL
),
vert_other
(
NULL
),
face_other
(
NULL
),
per_vertex_color_uint8
(
0
),
per_vertex_color_float32
(
0
),
per_vertex_color_uint8
(
0
),
has_normals
(
0
)
{
}
...
...
src/Utils/Qt/qtSimple.cpp
View file @
965a1a05
...
...
@@ -112,7 +112,6 @@ SimpleQT::SimpleQT() :
SimpleQT
::
SimpleQT
(
const
SimpleQT
&
sqt
)
:
m_dock
(
NULL
),
m_mat
(
m_mat
),
m_projection_matrix
(
m_mat
.
m_matrices
[
0
]),
m_modelView_matrix
(
m_mat
.
m_matrices
[
1
]),
m_transfo_matrix
(
m_mat
.
m_matrices
[
2
])
...
...
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