Skip to content
GitLab
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
227b1c2c
Commit
227b1c2c
authored
Jul 04, 2017
by
Jan Möbius
Browse files
Merge branch 'supportIntelCompiler' into 'master'
Support intel compiler See merge request
!23
parents
3a0e576e
6bef7215
Changes
2
Hide whitespace changes
Inline
Side-by-side
libs_required/ACG/Scenegraph/ClippingNode.hh
View file @
227b1c2c
...
...
@@ -166,7 +166,7 @@ private:
// modifiers for RenderObject based rendering
class
ClippingShaderModifier
:
public
ShaderModifier
class
ACGDLLEXPORT
ClippingShaderModifier
:
public
ShaderModifier
{
public:
// this modifier computes the vertex distance to the clip planes and writes them to the gl_ClipDistancei outputs
...
...
@@ -187,7 +187,7 @@ private:
int
numClipPlanes_
;
};
class
ClippingObjectModifier
:
public
RenderObjectModifier
class
ACGDLLEXPORT
ClippingObjectModifier
:
public
RenderObjectModifier
{
public:
explicit
ClippingObjectModifier
(
const
ClippingNode
*
_node
);
...
...
libs_required/ACG/Scenegraph/LightSourceNode.cc
View file @
227b1c2c
...
...
@@ -108,7 +108,7 @@ void LightSourceNode::enter(GLState& _state, const DrawModes::DrawMode& /* _draw
// correct Position for fixed Lights
if
(
lights_
[
i
].
fixedPosition
)
lights_
[
i
].
realPosition
=
_state
.
inverse_modelview
()
*
lights_
[
i
].
position
;
_state
.
inverse_modelview
()
*
lights_
[
i
].
position
;
else
lights_
[
i
].
realPosition
=
lights_
[
i
].
position
;
ACG
::
GLState
::
enable
(
index2gl
(
i
));
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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