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
Open sidebar
OpenWalnut
OpenWalnut Core
Commits
cfec9404
Commit
cfec9404
authored
Sep 20, 2010
by
Sebastian Eichelbaum
Browse files
[STYLE]
parent
4c252831
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
8 deletions
+5
-8
src/graphicsEngine/WGETextureHud.cpp
src/graphicsEngine/WGETextureHud.cpp
+3
-7
src/modules/imageSpaceLIC/WMImageSpaceLIC.cpp
src/modules/imageSpaceLIC/WMImageSpaceLIC.cpp
+2
-1
No files found.
src/graphicsEngine/WGETextureHud.cpp
View file @
cfec9404
...
...
@@ -23,6 +23,7 @@
//---------------------------------------------------------------------------
#include <iostream>
#include <string>
#include <osg/Camera>
#include <osg/Geode>
...
...
@@ -135,11 +136,6 @@ void WGETextureHud::coupleViewportWithTextureViewport( bool couple )
m_coupleTexViewport
=
couple
;
}
class
TexCoordUpdate
:
public
osg
::
StateAttribute
::
Callback
{
};
WGETextureHud
::
WGETextureHudEntry
::
WGETextureHudEntry
(
osg
::
ref_ptr
<
osg
::
Texture2D
>
texture
,
std
::
string
name
,
bool
transparency
)
:
osg
::
MatrixTransform
(),
m_texture
(
texture
),
...
...
@@ -198,8 +194,8 @@ WGETextureHud::WGETextureHudEntry::WGETextureHudEntry( osg::ref_ptr< osg::Textur
// enable texture coordinate manipulation via texture matrices
m_texMat
=
new
osg
::
TexMat
;
m_texMat
->
setMatrix
(
osg
::
Matrixd
::
identity
()
);
state
->
setTextureAttributeAndModes
(
0
,
m_texMat
,
osg
::
StateAttribute
::
ON
);
m_texMat
->
setMatrix
(
osg
::
Matrixd
::
identity
()
);
state
->
setTextureAttributeAndModes
(
0
,
m_texMat
,
osg
::
StateAttribute
::
ON
);
// This disables colorblending of the texture with the underlying quad
// osg::TexEnv* decalState = new osg::TexEnv();
...
...
src/modules/imageSpaceLIC/WMImageSpaceLIC.cpp
View file @
cfec9404
...
...
@@ -175,7 +175,8 @@ void WMImageSpaceLIC::moduleMain()
{
for
(
unsigned
int
y
=
0
;
y
<
resY
;
y
++
)
{
randomLuminance
[
(
y
*
resY
)
+
x
]
=
(
unsigned
char
)(
std
::
rand
()
%
255
);
randomLuminance
[
(
y
*
resY
)
+
x
]
=
(
unsigned
char
)(
std
::
rand
()
%
255
);
// NOLINT - stylechecker says "use rand_r" but I
// am not sure about portability.
}
}
...
...
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