Commit 227b1c2c authored by Jan Möbius's avatar Jan Möbius
Browse files

Merge branch 'supportIntelCompiler' into 'master'

Support intel compiler

See merge request !23
parents 3a0e576e 6bef7215
...@@ -166,7 +166,7 @@ private: ...@@ -166,7 +166,7 @@ private:
// modifiers for RenderObject based rendering // modifiers for RenderObject based rendering
class ClippingShaderModifier : public ShaderModifier class ACGDLLEXPORT ClippingShaderModifier : public ShaderModifier
{ {
public: public:
// this modifier computes the vertex distance to the clip planes and writes them to the gl_ClipDistancei outputs // this modifier computes the vertex distance to the clip planes and writes them to the gl_ClipDistancei outputs
...@@ -187,7 +187,7 @@ private: ...@@ -187,7 +187,7 @@ private:
int numClipPlanes_; int numClipPlanes_;
}; };
class ClippingObjectModifier : public RenderObjectModifier class ACGDLLEXPORT ClippingObjectModifier : public RenderObjectModifier
{ {
public: public:
explicit ClippingObjectModifier(const ClippingNode* _node); explicit ClippingObjectModifier(const ClippingNode* _node);
......
...@@ -108,7 +108,7 @@ void LightSourceNode::enter(GLState& _state, const DrawModes::DrawMode& /* _draw ...@@ -108,7 +108,7 @@ void LightSourceNode::enter(GLState& _state, const DrawModes::DrawMode& /* _draw
// correct Position for fixed Lights // correct Position for fixed Lights
if(lights_[i].fixedPosition) if(lights_[i].fixedPosition)
lights_[i].realPosition = lights_[i].realPosition =
_state.inverse_modelview()*lights_[i].position; _state.inverse_modelview() * lights_[i].position;
else lights_[i].realPosition = lights_[i].position; else lights_[i].realPosition = lights_[i].position;
ACG::GLState::enable(index2gl(i)); ACG::GLState::enable(index2gl(i));
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment