Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
OpenFlipper-Free
OpenFlipper
Commits
85ac7336
Commit
85ac7336
authored
May 16, 2019
by
Jan Möbius
Browse files
Merge branch 'clippingnode-worldspace' into 'master'
ClippingNode: Operate in world coordinates See merge request
!148
parents
05dd27d2
cf015c66
Changes
2
Hide whitespace changes
Inline
Side-by-side
libs_required/ACG/Scenegraph/ClippingNode.cc
View file @
85ac7336
...
...
@@ -205,10 +205,10 @@ void ClippingNode::ClippingShaderModifier::modifyVertexIO(ShaderGenerator* _shad
}
void
ClippingNode
::
ClippingShaderModifier
::
modifyVertex
Begin
Code
(
QStringList
*
_code
)
void
ClippingNode
::
ClippingShaderModifier
::
modifyVertex
End
Code
(
QStringList
*
_code
)
{
for
(
int
i
=
0
;
i
<
numClipPlanes_
;
++
i
)
_code
->
push_back
(
QString
(
"gl_ClipDistance[%1] = dot(
SG_INPUT_POSO
S, g_SlicePlane%1);"
).
arg
(
i
));
_code
->
push_back
(
QString
(
"gl_ClipDistance[%1] = dot(
inverse(g_mWV) * sg_vPosV
S, g_SlicePlane%1);"
).
arg
(
i
));
}
//=============================================================================
...
...
libs_required/ACG/Scenegraph/ClippingNode.hh
View file @
85ac7336
...
...
@@ -174,7 +174,7 @@ private:
void
modifyVertexIO
(
ShaderGenerator
*
_shader
);
void
modifyVertex
Begin
Code
(
QStringList
*
_code
);
void
modifyVertex
End
Code
(
QStringList
*
_code
);
private:
...
...
Write
Preview
Supports
Markdown
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