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
febc633d
Commit
febc633d
authored
Apr 09, 2010
by
Alexander Wiebel
Browse files
[ADD] colormaps for textures are updated for isosurfaces now
parent
1f4a6a8d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
0 deletions
+15
-0
src/modules/marchingCubes/WMMarchingCubes.cpp
src/modules/marchingCubes/WMMarchingCubes.cpp
+14
-0
src/modules/marchingCubes/WMMarchingCubes.h
src/modules/marchingCubes/WMMarchingCubes.h
+1
-0
No files found.
src/modules/marchingCubes/WMMarchingCubes.cpp
View file @
febc633d
...
...
@@ -751,12 +751,24 @@ void WMMarchingCubes::renderMesh( boost::shared_ptr< WTriangleMesh2 > mesh )
m_samplerUniforms
.
push_back
(
osg
::
ref_ptr
<
osg
::
Uniform
>
(
new
osg
::
Uniform
(
"tex8"
,
8
)
)
);
m_samplerUniforms
.
push_back
(
osg
::
ref_ptr
<
osg
::
Uniform
>
(
new
osg
::
Uniform
(
"tex9"
,
9
)
)
);
m_cmapUniforms
.
push_back
(
osg
::
ref_ptr
<
osg
::
Uniform
>
(
new
osg
::
Uniform
(
"useCmap0"
,
0
)
)
);
m_cmapUniforms
.
push_back
(
osg
::
ref_ptr
<
osg
::
Uniform
>
(
new
osg
::
Uniform
(
"useCmap1"
,
0
)
)
);
m_cmapUniforms
.
push_back
(
osg
::
ref_ptr
<
osg
::
Uniform
>
(
new
osg
::
Uniform
(
"useCmap2"
,
0
)
)
);
m_cmapUniforms
.
push_back
(
osg
::
ref_ptr
<
osg
::
Uniform
>
(
new
osg
::
Uniform
(
"useCmap3"
,
0
)
)
);
m_cmapUniforms
.
push_back
(
osg
::
ref_ptr
<
osg
::
Uniform
>
(
new
osg
::
Uniform
(
"useCmap4"
,
0
)
)
);
m_cmapUniforms
.
push_back
(
osg
::
ref_ptr
<
osg
::
Uniform
>
(
new
osg
::
Uniform
(
"useCmap5"
,
0
)
)
);
m_cmapUniforms
.
push_back
(
osg
::
ref_ptr
<
osg
::
Uniform
>
(
new
osg
::
Uniform
(
"useCmap6"
,
0
)
)
);
m_cmapUniforms
.
push_back
(
osg
::
ref_ptr
<
osg
::
Uniform
>
(
new
osg
::
Uniform
(
"useCmap7"
,
0
)
)
);
m_cmapUniforms
.
push_back
(
osg
::
ref_ptr
<
osg
::
Uniform
>
(
new
osg
::
Uniform
(
"useCmap8"
,
0
)
)
);
m_cmapUniforms
.
push_back
(
osg
::
ref_ptr
<
osg
::
Uniform
>
(
new
osg
::
Uniform
(
"useCmap9"
,
0
)
)
);
for
(
int
i
=
0
;
i
<
10
;
++
i
)
{
state
->
addUniform
(
m_typeUniforms
[
i
]
);
state
->
addUniform
(
m_thresholdUniforms
[
i
]
);
state
->
addUniform
(
m_alphaUniforms
[
i
]
);
state
->
addUniform
(
m_samplerUniforms
[
i
]
);
state
->
addUniform
(
m_cmapUniforms
[
i
]
);
}
// TODO(wiebel): used? Not used? Replace by new Property please
...
...
@@ -1038,10 +1050,12 @@ void WMMarchingCubes::updateTextures()
// set threshold/opacity as uniforms
float
t
=
(
*
iter
)
->
getThreshold
()
/
255.0
;
float
a
=
(
*
iter
)
->
getAlpha
();
int
cmap
=
(
*
iter
)
->
getSelectedColormap
();
m_typeUniforms
[
c
]
->
set
(
(
*
iter
)
->
getDataType
()
);
m_thresholdUniforms
[
c
]
->
set
(
t
);
m_alphaUniforms
[
c
]
->
set
(
a
);
m_cmapUniforms
[
c
]
->
set
(
cmap
);
++
c
;
}
...
...
src/modules/marchingCubes/WMMarchingCubes.h
View file @
febc633d
...
...
@@ -313,6 +313,7 @@ private:
std
::
vector
<
osg
::
ref_ptr
<
osg
::
Uniform
>
>
m_alphaUniforms
;
//!< uniforms for opacities of textures in shader
std
::
vector
<
osg
::
ref_ptr
<
osg
::
Uniform
>
>
m_thresholdUniforms
;
//!< uniforms for thresholds of textures in shader
std
::
vector
<
osg
::
ref_ptr
<
osg
::
Uniform
>
>
m_samplerUniforms
;
//!< uniforms for ids of textures in shader
std
::
vector
<
osg
::
ref_ptr
<
osg
::
Uniform
>
>
m_cmapUniforms
;
//!< uniforms for color maps per texture in shader
};
/**
...
...
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