Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
acgl
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
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
ACGL
acgl
Commits
ee341708
Commit
ee341708
authored
11 years ago
by
Janis Born
Browse files
Options
Downloads
Patches
Plain Diff
loadTexture2D now also loads DDS files based on file ending
parent
f1e32bf8
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/ACGL/OpenGL/Data/TextureLoadStore.cc
+18
-9
18 additions, 9 deletions
src/ACGL/OpenGL/Data/TextureLoadStore.cc
with
18 additions
and
9 deletions
src/ACGL/OpenGL/Data/TextureLoadStore.cc
+
18
−
9
View file @
ee341708
...
...
@@ -5,6 +5,7 @@
**********************************************************************/
#include
<ACGL/OpenGL/Data/TextureLoadStore.hh>
#include
<ACGL/Base/FileHelpers.hh>
using
namespace
ACGL
;
using
namespace
ACGL
::
OpenGL
;
...
...
@@ -14,6 +15,13 @@ namespace ACGL{
namespace
OpenGL
{
SharedTexture2D
loadTexture2D
(
const
std
::
string
&
_filename
)
{
std
::
string
fileEnding
=
Base
::
FileHelpers
::
getFileEnding
(
_filename
);
if
(
fileEnding
==
"dds"
)
{
return
loadTexture2DFromDDS
(
_filename
);
}
else
{
SharedTexture2D
texture
=
SharedTexture2D
(
new
Texture2D
()
);
SharedTextureData
data
=
loadTextureData
(
_filename
);
...
...
@@ -27,6 +35,7 @@ SharedTexture2D loadTexture2D( const std::string &_filename )
return
texture
;
}
}
}
}
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