Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
glow-extras
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jonathan Kunstwald
glow-extras
Commits
74d2d2e9
Commit
74d2d2e9
authored
6 years ago
by
Jonathan Kunstwald
Browse files
Options
Downloads
Patches
Plain Diff
Reintroduce file check in instance load method
parent
90c87333
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
assimp/glow-extras/assimp/Importer.cc
+11
-0
11 additions, 0 deletions
assimp/glow-extras/assimp/Importer.cc
assimp/glow-extras/assimp/Importer.hh
+2
-1
2 additions, 1 deletion
assimp/glow-extras/assimp/Importer.hh
with
13 additions
and
1 deletion
assimp/glow-extras/assimp/Importer.cc
+
11
−
0
View file @
74d2d2e9
...
...
@@ -24,6 +24,17 @@ glow::assimp::Importer::Importer() {}
glow
::
SharedVertexArray
glow
::
assimp
::
Importer
::
load
(
const
std
::
string
&
filename
)
{
GLOW_ACTION
();
using
namespace
assimp
;
if
(
!
std
::
ifstream
(
filename
).
good
())
{
error
()
<<
"Error loading `"
<<
filename
<<
"' with Assimp."
;
error
()
<<
" File not found/not readable"
;
return
nullptr
;
}
uint32_t
flags
=
aiProcess_SortByPType
;
if
(
mTriangulate
)
...
...
This diff is collapsed.
Click to expand it.
assimp/glow-extras/assimp/Importer.hh
+
2
−
1
View file @
74d2d2e9
...
...
@@ -156,7 +156,8 @@ public:
/// Each attribute gets their own buffer.
static
SharedVertexArray
LoadAndCreateMesh
(
std
::
string
const
&
filename
,
uint32_t
flags
=
importDefaultFlags
);
/// Creates a VA from MeshData, requires OGL context and initialized GLOW on the same thread
/// Creates a VA from MeshData
/// Requires OGL context and initialized GLOW on the same thread
static
SharedVertexArray
CreateMeshFromData
(
const
MeshData
&
data
);
/// Loads MeshData from a given filename with the given importer flags
...
...
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