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
A
acgl
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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ACGL
acgl
Commits
25d5c229
Commit
25d5c229
authored
Feb 18, 2013
by
Robert Menzel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed missing include, compatibility of ShaderProgram with new texture classes
parent
7415723c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
include/ACGL/OpenGL/Objects/ShaderProgram.hh
include/ACGL/OpenGL/Objects/ShaderProgram.hh
+2
-2
src/ACGL/OpenGL/Data/TextureDataLoadStore.cc
src/ACGL/OpenGL/Data/TextureDataLoadStore.cc
+5
-0
No files found.
include/ACGL/OpenGL/Objects/ShaderProgram.hh
View file @
25d5c229
...
...
@@ -306,8 +306,8 @@ public:
inline
void
setProgramUniform
(
GLint
_location
,
const
glm
::
dmat4x3
&
_v
,
GLboolean
_transpose
=
GL_FALSE
)
const
{
glProgramUniformMatrix4x3dv
(
mObjectName
,
_location
,
1
,
_transpose
,
glm
::
value_ptr
(
_v
));
}
inline
void
setProgramUniform
(
GLint
_location
,
const
glm
::
dmat4
&
_v
,
GLboolean
_transpose
=
GL_FALSE
)
const
{
glProgramUniformMatrix4dv
(
mObjectName
,
_location
,
1
,
_transpose
,
glm
::
value_ptr
(
_v
));
}
inline
void
setProgramTexture
(
GLint
_location
,
const
ConstSharedTexture
&
_texture
,
GLint
_unit
)
const
{
glProgramUniform1i
(
mObjectName
,
_location
,
_unit
);
_texture
->
bind
(
_unit
);
}
inline
void
setProgramTexture
(
const
std
::
string
&
_nameInShader
,
const
ConstSharedTexture
&
_texture
,
GLint
_unit
)
const
{
setProgramUniform
(
getUniformLocation
(
_nameInShader
),
(
GLint
)
_unit
);
_texture
->
bind
(
_unit
);
}
inline
void
setProgramTexture
(
GLint
_location
,
const
ConstSharedTexture
Base
&
_texture
,
GLint
_unit
)
const
{
glProgramUniform1i
(
mObjectName
,
_location
,
_unit
);
_texture
->
bind
(
_unit
);
}
inline
void
setProgramTexture
(
const
std
::
string
&
_nameInShader
,
const
ConstSharedTexture
Base
&
_texture
,
GLint
_unit
)
const
{
setProgramUniform
(
getUniformLocation
(
_nameInShader
),
(
GLint
)
_unit
);
_texture
->
bind
(
_unit
);
}
#endif
...
...
src/ACGL/OpenGL/Data/TextureDataLoadStore.cc
View file @
25d5c229
...
...
@@ -16,6 +16,11 @@
#include <fstream>
#include "lodepng/lodepng.h"
#ifdef ACGL_COMPILE_WITH_QT
#include <QImage>
#include <QGLWidget>
#endif
using
namespace
ACGL
;
using
namespace
ACGL
::
OpenGL
;
using
namespace
ACGL
::
Utils
;
...
...
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