Commit ff3636ba authored by Emeric Verschuur's avatar Emeric Verschuur

Petites mise à jour...

parent a0dfcb54
#ifndef _LRENTITY_H
#define _LRENTITY_H
#include "config.h"
// structure intersection
class LrEntity
{
};
#endif
......@@ -16,11 +16,10 @@
* @author Emeric VERSCHUUR <contact@mr-ti.com>, (C) 2008
*/
#ifndef LROBJECT3D_H
#define LROBJECT3D_H
#ifndef LRGEOMETRY_H
#define LRGEOMETRY_H
#include "config.h"
#include "LrMatrix.h"
#include "LrPoint3d.h"
#include "LrHit.h"
#include "LrRay.h"
/**
......
......@@ -16,12 +16,9 @@
* @author Emeric VERSCHUUR <contact@mr-ti.com>, (C) 2008
*/
#ifndef LROBJECT3D_H
#define LROBJECT3D_H
#include "config.h"
#include "LrMatrix.h"
#include "LrPoint3d.h"
#include "LrRay.h"
#ifndef LRGEOMETRYPOINT_H
#define LRGEOMETRYPOINT_H
#include "LrGeometry.h"
/**
* This class can manage a point (geometry).
......
......@@ -16,12 +16,9 @@
* @author Emeric VERSCHUUR <contact@mr-ti.com>, (C) 2008
*/
#ifndef LROBJECT3D_H
#define LROBJECT3D_H
#include "config.h"
#include "LrMatrix.h"
#include "LrPoint3d.h"
#include "LrRay.h"
#ifndef LRGEOMETRYQUADRANGLE_H
#define LRGEOMETRYQUADRANGLE_H
#include "LrGeometry.h"
/**
* This class can manage a 3D quadrangle (geometry).
......
......@@ -16,12 +16,9 @@
* @author Emeric VERSCHUUR <contact@mr-ti.com>, (C) 2008
*/
#ifndef LROBJECT3D_H
#define LROBJECT3D_H
#include "config.h"
#include "LrMatrix.h"
#include "LrPoint3d.h"
#include "LrRay.h"
#ifndef LRGEOMETRYSPHERE_H
#define LRGEOMETRYSPHERE_H
#include "LrGeometry.h"
/**
* This class can manage a sphere (geometry).
......
......@@ -16,12 +16,9 @@
* @author Emeric VERSCHUUR <contact@mr-ti.com>, (C) 2008
*/
#ifndef LROBJECT3D_H
#define LROBJECT3D_H
#include "config.h"
#include "LrMatrix.h"
#include "LrPoint3d.h"
#include "LrRay.h"
#ifndef LRGEOMETRYTRIANGLE_H
#define LRGEOMETRYTRIANGLE_H
#include "LrGeometry.h"
/**
* This class can manage a triangle (geometry).
......
......@@ -39,7 +39,7 @@ LrOptic::clone() const
return new LrOptic(*this);
}
LrOptic::LrOptic(REAL luminance, REAL transparency, LrColor color)
LrOptic::LrOptic(Real luminance, Real transparency, LrColor color)
:
m_luminance(luminance),
m_transparency(transparency),
......@@ -90,26 +90,26 @@ operator != (const LrOptic &lhs, const LrOptic &rhs)
/*---------------------------------------------------------------------------*
* accessors *
*---------------------------------------------------------------------------*/
REAL
Real
LrOptic::getLuminance() const
{
return m_luminance;
}
void
LrOptic::setLuminance(REAL luminance)
LrOptic::setLuminance(Real luminance)
{
m_luminance = luminance;
}
REAL
Real
LrOptic::getTransparency() const
{
return m_transparency;
}
void
LrOptic::setTransparency(REAL transparency)
LrOptic::setTransparency(Real transparency)
{
m_transparency = transparency;
}
......
......@@ -10,6 +10,7 @@
#ifndef LROPTIC_H
#define LROPTIC_H
#include "LrColor.h"
class LrOptic
......@@ -34,11 +35,11 @@ public:
LrOptic * clone() const;
/**
* @brief LrRay personnal constructor
* @param luminance REAL object reference.
* @param transparency REAL object reference.
* @param luminance Real object reference.
* @param transparency Real object reference.
* @param color LrColor object reference.
*/
LrOptic(REAL luminance, REAL transparency, LrColor color);
LrOptic(Real luminance, Real transparency, LrColor color);
/**
* @brief LrOptic destructor
......@@ -60,11 +61,11 @@ public:
/**
* @brief accessors
*/
REAL getLuminance() const;
void setLuminance(REAL luminance);
Real getLuminance() const;
void setLuminance(Real luminance);
REAL getTransparency() const;
void setTransparency(REAL transparency);
Real getTransparency() const;
void setTransparency(Real transparency);
LrColor getColor() const;
void setColor(LrColor color);
......@@ -75,8 +76,8 @@ private:
// data
// ****
REAL m_luminance;
REAL m_transparency;
Real m_luminance;
Real m_transparency;
LrColor m_color;
};
......
......@@ -84,4 +84,3 @@ static LrPoint translate( const LrPoint &p, const LrVector &v)
point.z = z + v.getCompo(Z);
return point;
}
\ No newline at end of file
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