Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
OpenFlipper-Free
OpenFlipper
Commits
543d6e4b
Commit
543d6e4b
authored
Feb 19, 2019
by
Martin Heistermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Implement alpha clipping for core renderers
parent
129a63f9
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
1 deletion
+9
-1
libs_required/ACG/GL/IRenderer.cc
libs_required/ACG/GL/IRenderer.cc
+6
-1
libs_required/ACG/GL/RenderObject.cc
libs_required/ACG/GL/RenderObject.cc
+1
-0
libs_required/ACG/GL/ShaderGenerator.cc
libs_required/ACG/GL/ShaderGenerator.cc
+2
-0
No files found.
libs_required/ACG/GL/IRenderer.cc
View file @
543d6e4b
...
...
@@ -925,7 +925,12 @@ void IRenderer::bindObjectUniforms( ACG::RenderObject* _obj, GLSL::Program* _pro
_prog
->
setUniform
(
"g_cAmbient"
,
_obj
->
ambient
);
_prog
->
setUniform
(
"g_cSpecular"
,
_obj
->
specular
);
ACG
::
Vec4f
materialParams
(
_obj
->
shininess
,
_obj
->
alpha
,
0.0
f
,
0.0
f
);
float
alphaRef
=
0.
f
;
if
(
_obj
->
alphaTest
&&
_obj
->
alphaFunc
==
GL_GREATER
)
{
alphaRef
=
_obj
->
alphaRef
;
}
ACG
::
Vec4f
materialParams
(
_obj
->
shininess
,
_obj
->
alpha
,
alphaRef
,
0.0
f
);
_prog
->
setUniform
(
"g_vMaterial"
,
materialParams
);
_prog
->
setUniform
(
"g_cLightModelAmbient"
,
globalLightModelAmbient_
);
...
...
libs_required/ACG/GL/RenderObject.cc
View file @
543d6e4b
...
...
@@ -189,6 +189,7 @@ void RenderObject::setMaterial( const SceneGraph::Material* _mat )
// material node sets the alpha test function to GL_GREATER
alphaFunc
=
GL_GREATER
;
alphaTest
=
_mat
->
alphaTest
();
alphaRef
=
_mat
->
alphaValue
();
}
...
...
libs_required/ACG/GL/ShaderGenerator.cc
View file @
543d6e4b
...
...
@@ -1073,6 +1073,7 @@ void ShaderProgGenerator::initGenDefines(ShaderGenerator* _gen)
}
_gen
->
addDefine
(
"SG_ALPHA g_vMaterial.y"
);
_gen
->
addDefine
(
"SG_MINALPHA g_vMaterial.z"
);
_gen
->
addMacros
(
desc_
.
macros
);
...
...
@@ -1834,6 +1835,7 @@ void ShaderProgGenerator::addFragmentBeginCode(QStringList* _code)
(
ioDesc_
.
passColor_
&&
(
desc_
.
shadeMode
==
SG_SHADE_UNLIT
||
desc_
.
colorMaterialMode
==
GL_EMISSION
)))
_code
->
push_back
(
QString
(
"sg_cColor = "
)
+
ShaderGenerator
::
keywords
.
macro_inputVertexColor
+
QString
(
";"
));
_code
->
push_back
(
QString
(
"if (sg_cColor.a < SG_MINALPHA) discard;"
));
if
(
desc_
.
shadeMode
==
SG_SHADE_PHONG
)
addLightingCode
(
_code
);
...
...
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