Commit 23cfa30d authored by Emeric Verschuur's avatar Emeric Verschuur

Modification du diagramme et des objets 3D

parent d5175285
//
// C++ Implementation: lrcomposedobject3d
// C++ Implementation: LrComposedObject3D
//
// Description:
//
......@@ -9,7 +9,7 @@
// Copyright: See COPYING file that comes with this distribution
//
//
#include "lrcomposedobject3d.h"
#include "LrComposedObject3D.h"
LrComposedObject3D::LrComposedObject3D()
: LrObject3D()
......
//
// C++ Interface: lrcomposedobject3d
// C++ Interface: LrComposedObject3D
//
// Description:
//
......@@ -12,13 +12,13 @@
/**
* @brief 3D composed object management.
* @file lrcomposedobject3d.h
* @file LrComposedObject3D.h
* @author Emeric VERSCHUUR <contact@mr-ti.com>, (C) 2008
*/
#ifndef LRCOMPOSEDOBJECT3D_H
#define LRCOMPOSEDOBJECT3D_H
#include "lrobject3d.h"
#include "LrObject3D.h"
/**
* This class can manage a 3D elementary objects.
......@@ -31,10 +31,20 @@
class LrComposedObject3D : public LrObject3D
{
public:
/**
* @brief LrComposedObject3D constructor.
*/
LrComposedObject3D();
/**
* @brief LrComposedObject3D destructor.
*/
~LrComposedObject3D();
/**
* @brief Give the intersection point of this object and a ray.
* @param ray LrRay object reference.
* @return un LrPoint3d object.
*/
virtual LrPoint3d getIntersection(const LrRay &ray) const;
};
#endif
//
// C++ Implementation: lrelementaryobject3d
// C++ Implementation: LrElementaryObject3D
//
// Description:
//
......@@ -9,7 +9,7 @@
// Copyright: See COPYING file that comes with this distribution
//
//
#include "lrelementaryobject3d.h"
#include "LrElementaryObject3D.h"
LrElementaryObject3D::LrElementaryObject3D()
: LrObject3D()
......
//
// C++ Interface: lrelementaryobject3d
// C++ Interface: LrElementaryObject3D
//
// Description:
//
......@@ -12,13 +12,13 @@
/**
* @brief 3D elementary object management.
* @file lrelementaryobject3d.h
* @file LrElementaryObject3D.h
* @author Emeric VERSCHUUR <contact@mr-ti.com>, (C) 2008
*/
#ifndef LRELEMENTARYOBJECT3D_H
#define LRELEMENTARYOBJECT3D_H
#include "lrobject3d.h"
#include "LrElementaryObject3D.h"
/**
* This class can manage a 3D elementary objects.
......@@ -27,10 +27,20 @@
class LrElementaryObject3D : public LrObject3D
{
public:
/**
* @brief LrElementaryObject3D constructor.
*/
LrElementaryObject3D();
/**
* @brief LrElementaryObject3D destructor.
*/
~LrElementaryObject3D();
/**
* @brief Give the intersection point of this object and a ray.
* @param ray LrRay object reference.
* @return un LrPoint3d object.
*/
virtual LrPoint3d getIntersection(const LrRay &ray) const;
};
#endif
//
// C++ Implementation: lrobject3d
// C++ Implementation: LrObject3D
//
// Description:
//
......@@ -9,7 +9,7 @@
// Copyright: See COPYING file that comes with this distribution
//
//
#include "lrobject3d.h"
#include "LrObject3D.h"
LrObject3D::LrObject3D()
:
......
//
// C++ Interface: lrobject3d
// C++ Interface: LrObject3D
//
// Description:
//
......@@ -12,7 +12,7 @@
/**
* @brief 3D object management.
* @file lrobject3d.h
* @file LrObject3D.h
* @author Emeric VERSCHUUR <contact@mr-ti.com>, (C) 2008
*/
......@@ -43,7 +43,7 @@ public:
* @param ray LrRay object reference.
* @return un LrPoint3d object.
*/
LrPoint3d getIntersection(const LrRay &ray) const;
virtual LrPoint3d getIntersection(const LrRay &ray) 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