Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Simox
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Terraform modules
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Florian Leander Singer
Simox
Commits
2273db53
Commit
2273db53
authored
5 years ago
by
Raphael Grimm
Browse files
Options
Downloads
Patches
Plain Diff
Add verbosity flag to AssimpReader
parent
a5624312
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
VirtualRobot/Import/MeshImport/AssimpReader.cpp
+8
-4
8 additions, 4 deletions
VirtualRobot/Import/MeshImport/AssimpReader.cpp
VirtualRobot/Import/MeshImport/AssimpReader.h
+2
-1
2 additions, 1 deletion
VirtualRobot/Import/MeshImport/AssimpReader.h
with
10 additions
and
5 deletions
VirtualRobot/Import/MeshImport/AssimpReader.cpp
+
8
−
4
View file @
2273db53
...
...
@@ -77,7 +77,10 @@ namespace
error_log
<<
" has no normals (and none were generated when loading it)
\n
"
;
return
false
;
}
error_log
<<
" has no normals (and none were generated when loading it) (ignoring this)
\n
"
;
if
(
param
.
verbose
)
{
error_log
<<
" has no normals (and none were generated when loading it) (ignoring this)
\n
"
;
}
meta
.
regeneratedNormals
=
true
;
}
...
...
@@ -96,9 +99,10 @@ namespace
const
auto
&
f
=
m
.
mFaces
[
i
];
if
(
f
.
mNumIndices
!=
3
)
{
error_log
<<
" has face (# "
<<
i
<<
") with the wrong number of vertices ("
<<
f
.
mNumIndices
<<
")
\n
"
;
if
(
param
.
verbose
||
!
param
.
skipInvalidFaces
)
error_log
<<
" has face (# "
<<
i
<<
") with the wrong number of vertices ("
<<
f
.
mNumIndices
<<
")
\n
"
;
if
(
param
.
skipInvalidFaces
)
{
++
meta
.
skippedFaces
;
...
...
This diff is collapsed.
Click to expand it.
VirtualRobot/Import/MeshImport/AssimpReader.h
+
2
−
1
View file @
2273db53
...
...
@@ -30,7 +30,7 @@ namespace VirtualRobot
ManipulationObjectPtr
readFileAsManipulationObject
(
const
std
::
string
&
filename
,
const
std
::
string
&
name
=
""
);
ManipulationObjectPtr
readBufferAsManipulationObject
(
const
std
::
string_view
&
v
,
const
std
::
string
&
name
=
""
);
struct
Parameters
{
float
scaling
=
1
;
...
...
@@ -39,6 +39,7 @@ namespace VirtualRobot
bool
mergeMultipleMeshes
=
false
;
bool
ignoreMissingNormals
=
false
;
bool
skipInvalidFaces
=
false
;
bool
verbose
=
true
;
};
Parameters
parameters
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment