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

Modification des entêtes des classes Object3D et Geometry

parent a9d6e4c6

LrComposedObject3D.cpp

+11 −1
Original line number Diff line number Diff line 
/**

 * @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

{

    

}

LrComposedObject3D.h

+6 −2
Original line number Diff line number Diff line 
/**

 * @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

LrElementaryObject3D.cpp

+9 −2
Original line number Diff line number Diff line 
/**

 * @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

{

    

}

LrElementaryObject3D.h

+6 −2
Original line number Diff line number Diff line 
/**

 * @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

LrGeometry.cpp

+5 −1
Original line number Diff line number Diff line 
/**

 * @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"