Commit 9bb18fef authored by Emeric Verschuur's avatar Emeric Verschuur

Modification des entêtes des classes Object3D et Geometry

parent a9d6e4c6
/**
* @brief 3D composed object management.
* @file LrComposedObject3D.cpp
* @author Josselin Francois, Michael Nauge, Axel Richard, Hervé Souchaud, Emeric Verschuur
* @author Josselin Francois
* @author Michael Nauge
* @author Axel Richard
* @author Hervé Souchaud
* @author Emeric Verschuur
*/
#include "LrComposedObject3D.h"
......@@ -16,4 +20,10 @@ LrComposedObject3D::~LrComposedObject3D()
{
}
bool LrComposedObject3D::getIntersection(const LrRay &ray, LrHit *hit) const
{
}
/**
* @brief 3D composed object management.
* @file LrComposedObject3D.h
* @author Josselin Francois, Michael Nauge, Axel Richard, Hervé Souchaud, Emeric Verschuur
* @author Josselin Francois
* @author Michael Nauge
* @author Axel Richard
* @author Hervé Souchaud
* @author Emeric Verschuur
*/
#ifndef LRCOMPOSEDOBJECT3D_H
......@@ -32,7 +36,7 @@ public:
* @param ray LrRay object reference.
* @return un LrPoint3d object.
*/
virtual LrPoint3d getIntersection(const LrRay &ray) const;
virtual bool getIntersection(const LrRay &ray, LrHit *hit) const;
};
#endif
/**
* @brief 3D elementary object management.
* @file LrElementaryObject3D.cpp
* @author Josselin Francois, Michael Nauge, Axel Richard, Hervé Souchaud, Emeric Verschuur
* @author Josselin Francois
* @author Michael Nauge
* @author Axel Richard
* @author Hervé Souchaud
* @author Emeric Verschuur
*/
#include "LrElementaryObject3D.h"
......@@ -16,4 +20,7 @@ LrElementaryObject3D::~LrElementaryObject3D()
{
}
bool LrElementaryObject3D::getIntersection(const LrRay &ray, LrHit *hit) const
{
}
/**
* @brief 3D elementary object management.
* @file LrElementaryObject3D.h
* @author Josselin Francois, Michael Nauge, Axel Richard, Hervé Souchaud, Emeric Verschuur
* @author Josselin Francois
* @author Michael Nauge
* @author Axel Richard
* @author Hervé Souchaud
* @author Emeric Verschuur
*/
#ifndef LRELEMENTARYOBJECT3D_H
......@@ -28,7 +32,7 @@ public:
* @param ray LrRay object reference.
* @return un LrPoint3d object.
*/
virtual LrPoint3d getIntersection(const LrRay &ray) const;
virtual bool getIntersection(const LrRay &ray, LrHit *hit) const;
};
#endif
/**
* @brief 3D object management.
* @file LrGeometry.cpp
* @author Josselin Francois, Michael Nauge, Axel Richard, Hervé Souchaud, Emeric Verschuur
* @author Josselin Francois
* @author Michael Nauge
* @author Axel Richard
* @author Hervé Souchaud
* @author Emeric Verschuur
*/
#include "LrGeometry.h"
......
/**
* @brief 3D object management.
* @file LrGeometry.h
* @author Josselin Francois, Michael Nauge, Axel Richard, Hervé Souchaud, Emeric Verschuur
* @author Josselin Francois
* @author Michael Nauge
* @author Axel Richard
* @author Hervé Souchaud
* @author Emeric Verschuur
*/
#ifndef LRGEOMETRY_H
......
/**
* @brief Point (geometry) management.
* @file LrGeometryPoint.cpp
* @author Josselin Francois, Michael Nauge, Axel Richard, Hervé Souchaud, Emeric Verschuur
* @author Josselin Francois
* @author Michael Nauge
* @author Axel Richard
* @author Hervé Souchaud
* @author Emeric Verschuur
*/
#include "LrGeometryPoint.h"
......
/**
* @brief Point (geometry) management.
* @file LrGeometryPoint.h
* @author Josselin Francois, Michael Nauge, Axel Richard, Hervé Souchaud, Emeric Verschuur
* @author Josselin Francois
* @author Michael Nauge
* @author Axel Richard
* @author Hervé Souchaud
* @author Emeric Verschuur
*/
#ifndef LRGEOMETRYPOINT_H
......
/**
* @brief Quadrangle (geometry) management.
* @file LrGeometryQuadrangle.cpp
* @author Josselin Francois, Michael Nauge, Axel Richard, Hervé Souchaud, Emeric Verschuur
* @author Josselin Francois
* @author Michael Nauge
* @author Axel Richard
* @author Hervé Souchaud
* @author Emeric Verschuur
*/
#include "LrGeometryQuadrangle.h"
......
/**
* @brief Quadrangle (geometry) management.
* @file LrGeometryQuadrangle.h
* @author Josselin Francois, Michael Nauge, Axel Richard, Hervé Souchaud, Emeric Verschuur
* @author Josselin Francois
* @author Michael Nauge
* @author Axel Richard
* @author Hervé Souchaud
* @author Emeric Verschuur
*/
#ifndef LRGEOMETRYQUADRANGLE_H
......
/**
* @brief Sphere (geometry) management.
* @file LrGeometrySphere.cpp
* @author Josselin Francois, Michael Nauge, Axel Richard, Hervé Souchaud, Emeric Verschuur
* @author Josselin Francois
* @author Michael Nauge
* @author Axel Richard
* @author Hervé Souchaud
* @author Emeric Verschuur
*/
#include "LrGeometrySphere.h"
......
/**
* @brief Sphere (geometry) management.
* @file LrGeometrySphere.h
* @author Josselin Francois, Michael Nauge, Axel Richard, Hervé Souchaud, Emeric Verschuur
* @author Josselin Francois
* @author Michael Nauge
* @author Axel Richard
* @author Hervé Souchaud
* @author Emeric Verschuur
*/
#ifndef LRGEOMETRYSPHERE_H
......
/**
* @brief Triangle (geometry) management.
* @file LrGeometryTriangle.cpp
* @author Josselin Francois, Michael Nauge, Axel Richard, Hervé Souchaud, Emeric Verschuur
* @author Josselin Francois
* @author Michael Nauge
* @author Axel Richard
* @author Hervé Souchaud
* @author Emeric Verschuur
*/
#include "LrGeometryTriangle.h"
......
/**
* @brief Triangle (geometry) management.
* @file LrGeometryTriangle.h
* @author Josselin Francois, Michael Nauge, Axel Richard, Hervé Souchaud, Emeric Verschuur
* @author Josselin Francois
* @author Michael Nauge
* @author Axel Richard
* @author Hervé Souchaud
* @author Emeric Verschuur
*/
#ifndef LRGEOMETRYTRIANGLE_H
......
/**
* @brief 3D object management.
* @file LrObject3D.cpp
* @author Josselin Francois, Michael Nauge, Axel Richard, Hervé Souchaud, Emeric Verschuur
* @author Josselin Francois
* @author Michael Nauge
* @author Axel Richard
* @author Hervé Souchaud
* @author Emeric Verschuur
*/
#include "LrObject3D.h"
......@@ -15,8 +19,3 @@ LrObject3D::LrObject3D()
LrObject3D::~LrObject3D()
{
}
LrPoint3d LrObject3D::getIntersection(const LrRay &ray) const
{
}
/**
* @brief 3D object management.
* @file LrObject3D.h
* @author Josselin Francois, Michael Nauge, Axel Richard, Hervé Souchaud, Emeric Verschuur
* @author Josselin Francois
* @author Michael Nauge
* @author Axel Richard
* @author Hervé Souchaud
* @author Emeric Verschuur
*/
#ifndef LROBJECT3D_H
......@@ -31,7 +35,7 @@ public:
* @param ray LrRay object reference.
* @return un LrPoint3d object.
*/
virtual LrPoint3d getIntersection(const LrRay &ray) const;
virtual bool getIntersection(const LrRay &ray, LrHit *hit) const;
private:
LrMatrix m_mat;
};
......
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