diff --git a/src/Shaders/DistanceFieldVector.h b/src/Shaders/DistanceFieldVector.h index 544557fd0..06bd4c8dc 100644 --- a/src/Shaders/DistanceFieldVector.h +++ b/src/Shaders/DistanceFieldVector.h @@ -49,7 +49,7 @@ template class MAGNUM_SHADERS_EXPORT DistanceFieldVector DistanceFieldVector(); /** @brief Set transformation and projection matrix */ - inline DistanceFieldVector* setTransformationProjectionMatrix(const typename DimensionTraits::MatrixType& matrix) { + DistanceFieldVector* setTransformationProjectionMatrix(const typename DimensionTraits::MatrixType& matrix) { AbstractShaderProgram::setUniform(transformationProjectionMatrixUniform, matrix); return this; } @@ -60,7 +60,7 @@ template class MAGNUM_SHADERS_EXPORT DistanceFieldVector * * @see setOutlineColor() */ - inline DistanceFieldVector* setColor(const Color4<>& color) { + DistanceFieldVector* setColor(const Color4<>& color) { AbstractShaderProgram::setUniform(colorUniform, color); return this; } @@ -71,7 +71,7 @@ template class MAGNUM_SHADERS_EXPORT DistanceFieldVector * * @see setOutlineRange(), setColor() */ - inline DistanceFieldVector* setOutlineColor(const Color4<>& color) { + DistanceFieldVector* setOutlineColor(const Color4<>& color) { AbstractShaderProgram::setUniform(outlineColorUniform, color); return this; } @@ -90,7 +90,7 @@ template class MAGNUM_SHADERS_EXPORT DistanceFieldVector * * @see setOutlineColor() */ - inline DistanceFieldVector* setOutlineRange(Float start, Float end) { + DistanceFieldVector* setOutlineRange(Float start, Float end) { AbstractShaderProgram::setUniform(outlineRangeUniform, Vector2(start, end)); return this; } @@ -103,7 +103,7 @@ template class MAGNUM_SHADERS_EXPORT DistanceFieldVector * values will make them look more crisp (but possibly aliased). Initial * value is `0.04f`. */ - inline DistanceFieldVector* setSmoothness(Float value) { + DistanceFieldVector* setSmoothness(Float value) { AbstractShaderProgram::setUniform(smoothnessUniform, value); return this; } diff --git a/src/Shaders/MeshVisualizer.h b/src/Shaders/MeshVisualizer.h index e962a503f..b009e67f4 100644 --- a/src/Shaders/MeshVisualizer.h +++ b/src/Shaders/MeshVisualizer.h @@ -71,7 +71,7 @@ class MAGNUM_SHADERS_EXPORT MeshVisualizer: public AbstractShaderProgram { * @brief Set transformation and projection matrix * @return Pointer to self (for method chaining) */ - inline MeshVisualizer* setTransformationProjectionMatrix(const Matrix4& matrix) { + MeshVisualizer* setTransformationProjectionMatrix(const Matrix4& matrix) { setUniform(transformationProjectionMatrixUniform, matrix); return this; } @@ -82,7 +82,7 @@ class MAGNUM_SHADERS_EXPORT MeshVisualizer: public AbstractShaderProgram { * * Has effect only if @ref Flag "Flag::Wireframe" is enabled. */ - inline MeshVisualizer* setViewportSize(const Vector2& size) { + MeshVisualizer* setViewportSize(const Vector2& size) { setUniform(viewportSizeUniform, size); return this; } @@ -93,7 +93,7 @@ class MAGNUM_SHADERS_EXPORT MeshVisualizer: public AbstractShaderProgram { * * Initial value is fully opaque white. */ - inline MeshVisualizer* setColor(const Color4<>& color) { + MeshVisualizer* setColor(const Color4<>& color) { setUniform(colorUniform, color); return this; } @@ -105,7 +105,7 @@ class MAGNUM_SHADERS_EXPORT MeshVisualizer: public AbstractShaderProgram { * Initial value is fully opaque black. Has effect only if * @ref Flag "Flag::Wireframe" is enabled. */ - inline MeshVisualizer* setWireframeColor(const Color4<>& color) { + MeshVisualizer* setWireframeColor(const Color4<>& color) { if(flags & Flag::Wireframe) setUniform(wireframeColorUniform, color); return this; } @@ -117,7 +117,7 @@ class MAGNUM_SHADERS_EXPORT MeshVisualizer: public AbstractShaderProgram { * Initial value is `1.0f`. Has effect only if * @ref Flag "Flag::Wireframe" is enabled. */ - inline MeshVisualizer* setWireframeWidth(Float width) { + MeshVisualizer* setWireframeWidth(Float width) { if(flags & Flag::Wireframe) setUniform(wireframeWidthUniform, width); return this; } diff --git a/src/Shaders/Phong.h b/src/Shaders/Phong.h index 2768db0a2..7bce3636b 100644 --- a/src/Shaders/Phong.h +++ b/src/Shaders/Phong.h @@ -55,7 +55,7 @@ class MAGNUM_SHADERS_EXPORT Phong: public AbstractShaderProgram { * * If not set, default value is `(0.0f, 0.0f, 0.0f)`. */ - inline Phong* setAmbientColor(const Color3<>& color) { + Phong* setAmbientColor(const Color3<>& color) { setUniform(ambientColorUniform, color); return this; } @@ -64,7 +64,7 @@ class MAGNUM_SHADERS_EXPORT Phong: public AbstractShaderProgram { * @brief Set diffuse color * @return Pointer to self (for method chaining) */ - inline Phong* setDiffuseColor(const Color3<>& color) { + Phong* setDiffuseColor(const Color3<>& color) { setUniform(diffuseColorUniform, color); return this; } @@ -75,7 +75,7 @@ class MAGNUM_SHADERS_EXPORT Phong: public AbstractShaderProgram { * * If not set, default value is `(1.0f, 1.0f, 1.0f)`. */ - inline Phong* setSpecularColor(const Color3<>& color) { + Phong* setSpecularColor(const Color3<>& color) { setUniform(specularColorUniform, color); return this; } @@ -87,7 +87,7 @@ class MAGNUM_SHADERS_EXPORT Phong: public AbstractShaderProgram { * The larger value, the harder surface (smaller specular highlight). * If not set, default value is `80.0f`. */ - inline Phong* setShininess(Float shininess) { + Phong* setShininess(Float shininess) { setUniform(shininessUniform, shininess); return this; } @@ -96,7 +96,7 @@ class MAGNUM_SHADERS_EXPORT Phong: public AbstractShaderProgram { * @brief Set transformation and normal matrix * @return Pointer to self (for method chaining) */ - inline Phong* setTransformationMatrix(const Matrix4& matrix) { + Phong* setTransformationMatrix(const Matrix4& matrix) { setUniform(transformationMatrixUniform, matrix); setUniform(normalMatrixUniform, matrix.rotation()); return this; @@ -106,7 +106,7 @@ class MAGNUM_SHADERS_EXPORT Phong: public AbstractShaderProgram { * @brief Set projection matrix * @return Pointer to self (for method chaining) */ - inline Phong* setProjectionMatrix(const Matrix4& matrix) { + Phong* setProjectionMatrix(const Matrix4& matrix) { setUniform(projectionMatrixUniform, matrix); return this; } @@ -115,7 +115,7 @@ class MAGNUM_SHADERS_EXPORT Phong: public AbstractShaderProgram { * @brief Set light position * @return Pointer to self (for method chaining) */ - inline Phong* setLightPosition(const Vector3& light) { + Phong* setLightPosition(const Vector3& light) { setUniform(lightUniform, light); return this; } @@ -126,7 +126,7 @@ class MAGNUM_SHADERS_EXPORT Phong: public AbstractShaderProgram { * * If not set, default value is `(1.0f, 1.0f, 1.0f)`. */ - inline Phong* setLightColor(const Color3<>& color) { + Phong* setLightColor(const Color3<>& color) { setUniform(lightColorUniform, color); return this; } diff --git a/src/Shaders/Vector.h b/src/Shaders/Vector.h index 16539e02b..9c86a0f3e 100644 --- a/src/Shaders/Vector.h +++ b/src/Shaders/Vector.h @@ -51,7 +51,7 @@ template class MAGNUM_SHADERS_EXPORT Vector: public Abst * @brief Set transformation and projection matrix * @return Pointer to self (for method chaining) */ - inline Vector* setTransformationProjectionMatrix(const typename DimensionTraits::MatrixType& matrix) { + Vector* setTransformationProjectionMatrix(const typename DimensionTraits::MatrixType& matrix) { AbstractShaderProgram::setUniform(transformationProjectionMatrixUniform, matrix); return this; } @@ -60,7 +60,7 @@ template class MAGNUM_SHADERS_EXPORT Vector: public Abst * @brief Set fill color * @return Pointer to self (for method chaining) */ - inline Vector* setColor(const Color4<>& color) { + Vector* setColor(const Color4<>& color) { AbstractShaderProgram::setUniform(colorUniform, color); return this; } diff --git a/src/Shaders/VertexColor.h b/src/Shaders/VertexColor.h index 9d9b22c3c..e47630e46 100644 --- a/src/Shaders/VertexColor.h +++ b/src/Shaders/VertexColor.h @@ -60,7 +60,7 @@ template class MAGNUM_SHADERS_EXPORT VertexColor: public * * Default is identity matrix. */ - inline VertexColor* setTransformationProjectionMatrix(const typename DimensionTraits::MatrixType& matrix) { + VertexColor* setTransformationProjectionMatrix(const typename DimensionTraits::MatrixType& matrix) { setUniform(transformationProjectionMatrixUniform, matrix); return this; }