Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VTK
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
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
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
Sean McBride
VTK
Commits
bc2c4c30
Commit
bc2c4c30
authored
1 month ago
by
Mathieu Westphal (Kitware)
Browse files
Options
Downloads
Patches
Plain Diff
OBJImporter: Use ImageReaderFactory for textures
parent
f06914d6
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
IO/Import/vtkOBJImporterInternals.cxx
+22
-61
22 additions, 61 deletions
IO/Import/vtkOBJImporterInternals.cxx
with
22 additions
and
61 deletions
IO/Import/vtkOBJImporterInternals.cxx
+
22
−
61
View file @
bc2c4c30
// SPDX-FileCopyrightText: Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen
// SPDX-License-Identifier: BSD-3-Clause
#include
"vtkOBJImporterInternals.h"
#include
"vtk
BMP
Reader.h"
#include
"vtk
JPEG
Reader.h"
#include
"vtk
Image
Reader
2
.h"
#include
"vtk
Image
Reader
2Factory
.h"
#include
"vtkOBJImporter.h"
#include
"vtkPNGReader.h"
#include
"vtkPolyDataMapper.h"
#include
"vtkProperty.h"
#include
"vtkRenderWindow.h"
#include
"vtkRenderer.h"
#include
"vtkSmartPointer.h"
#include
"vtkTIFFReader.h"
#include
"vtkTexture.h"
#include
"vtkTransform.h"
#include
"vtksys/FStream.hxx"
...
...
@@ -402,71 +400,34 @@ bool bindTexturedPolydataToRenderWindow(vtkRenderWindow* renderWindow, vtkRender
// For each named material, load and bind the texture, add it to the renderer
std
::
string
textureFilename
=
reader
->
GetTextureFilename
(
port_idx
);
auto
kti
=
knownTextures
.
find
(
textureFilename
);
if
(
kti
==
knownTextures
.
end
())
if
(
!
textureFilename
.
empty
())
{
vtkSmartPointer
<
vtkTIFFReader
>
tex_tiff_Loader
=
vtkSmartPointer
<
vtkTIFFReader
>::
New
();
vtkSmartPointer
<
vtkBMPReader
>
tex_bmp_Loader
=
vtkSmartPointer
<
vtkBMPReader
>::
New
();
vtkSmartPointer
<
vtkJPEGReader
>
tex_jpg_Loader
=
vtkSmartPointer
<
vtkJPEGReader
>::
New
();
vtkSmartPointer
<
vtkPNGReader
>
tex_png_Loader
=
vtkSmartPointer
<
vtkPNGReader
>::
New
();
int
bIsReadableBMP
=
tex_bmp_Loader
->
CanReadFile
(
textureFilename
.
c_str
());
int
bIsReadableJPEG
=
tex_jpg_Loader
->
CanReadFile
(
textureFilename
.
c_str
());
int
bIsReadablePNG
=
tex_png_Loader
->
CanReadFile
(
textureFilename
.
c_str
());
int
bIsReadableTIFF
=
tex_tiff_Loader
->
CanReadFile
(
textureFilename
.
c_str
());
if
(
!
textureFilename
.
empty
())
auto
kti
=
knownTextures
.
find
(
textureFilename
);
if
(
kti
==
knownTextures
.
end
())
{
if
(
bIsReadableJPEG
)
{
tex_jpg_Loader
->
SetFileName
(
textureFilename
.
c_str
());
tex_jpg_Loader
->
Update
();
vtkSmartPointer
<
vtkTexture
>
vtk_texture
=
vtkSmartPointer
<
vtkTexture
>::
New
();
vtk_texture
->
AddInputConnection
(
tex_jpg_Loader
->
GetOutputPort
());
actor
->
SetTexture
(
vtk_texture
);
knownTextures
[
textureFilename
]
=
vtk_texture
;
}
else
if
(
bIsReadablePNG
)
{
tex_png_Loader
->
SetFileName
(
textureFilename
.
c_str
());
tex_png_Loader
->
Update
();
vtkSmartPointer
<
vtkTexture
>
vtk_texture
=
vtkSmartPointer
<
vtkTexture
>::
New
();
vtk_texture
->
AddInputConnection
(
tex_png_Loader
->
GetOutputPort
());
actor
->
SetTexture
(
vtk_texture
);
knownTextures
[
textureFilename
]
=
vtk_texture
;
}
else
if
(
bIsReadableBMP
)
{
tex_bmp_Loader
->
SetFileName
(
textureFilename
.
c_str
());
tex_bmp_Loader
->
Update
();
vtkSmartPointer
<
vtkTexture
>
vtk_texture
=
vtkSmartPointer
<
vtkTexture
>::
New
();
vtk_texture
->
AddInputConnection
(
tex_bmp_Loader
->
GetOutputPort
());
actor
->
SetTexture
(
vtk_texture
);
knownTextures
[
textureFilename
]
=
vtk_texture
;
}
else
if
(
bIsReadableTIFF
)
vtkSmartPointer
<
vtkImageReader2
>
imgReader
;
imgReader
.
TakeReference
(
vtkImageReader2Factory
::
CreateImageReader2
(
textureFilename
.
c_str
()));
if
(
!
imgReader
)
{
tex_tiff_Loader
->
SetFileName
(
textureFilename
.
c_str
());
tex_tiff_Loader
->
Update
();
vtkSmartPointer
<
vtkTexture
>
vtk_texture
=
vtkSmartPointer
<
vtkTexture
>::
New
();
vtk_texture
->
AddInputConnection
(
tex_tiff_Loader
->
GetOutputPort
());
actor
->
SetTexture
(
vtk_texture
);
knownTextures
[
textureFilename
]
=
vtk_texture
;
vtkErrorWithObjectMacro
(
reader
,
"Cannot instantiate image reader for texture: "
<<
textureFilename
);
}
else
{
i
f
(
!
textureFilename
.
empty
())
// OK to have no texture image, but if its not empty it ought to exist.
{
vtkErrorWithObjectMacro
(
reader
,
"Nonexistent texture image type!? imagefile: "
<<
textureFilenam
e
);
}
i
mgReader
->
SetFileName
(
textureFilename
.
c_str
());
vtkSmartPointer
<
vtkTexture
>
vTexture
=
vtkSmartPointer
<
vtkTexture
>::
New
();
vTexture
->
SetInputConnection
(
imgReader
->
GetOutputPort
());
actor
->
SetTexture
(
vTextur
e
);
knownTextures
[
textureFilename
]
=
vTexture
;
}
}
}
else
// this is a texture we already have seen
{
actor
->
SetTexture
(
kti
->
second
);
else
// this is a texture we already have seen
{
actor
->
SetTexture
(
kti
->
second
);
}
}
vtkSmartPointer
<
vtkProperty
>
properties
=
vtkSmartPointer
<
vtkProperty
>::
New
();
...
...
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