Commit 59b49075 authored by Emeric Verschuur's avatar Emeric Verschuur
Browse files

Beaucoup de correction d'erreur. Ajout de LrEntityList, LrOctreeList dans config.h

parent 5dc3f272

LrBinder.h

+3 −5
Changes for LrBinder.h: 3 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include "LrOctree.h"

#include "LrVector.h"

#include "LrEntity.h"

#include <list>



#define MAX_DIV 4
@@ -25,15 +26,13 @@ class LrBinder 
{

    private :



        ListObject m_liste_objets;//la liste d'objet

        LrEntityList m_liste_objets;//la liste d'objet

        



    public :

            typedef list<LrEntity *> ListObject;



            LrBinder();

            LrBinder(const LrBinder & source);

            LrBinder(ListObject l);

            LrBinder(LrEntityList l);

            

            virtual ~LrBinder() = 0;
@@ -41,4 +40,3 @@ class LrBinder 
            virtual bool getIntersection(LrRay &ray, LrHit & hit);

};

#endif
 
            
 No newline at end of file

LrCamera.cpp

+3 −3
Changes for LrCamera.cpp: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -57,9 +57,9 @@ LrCamera::LrCamera(const LrPoint &position, const LrVector &vertical, const LrVe 
    m_horizontal = m_direction ^ m_vertical;

    

    // Normalisation des vecteurs

    m_vertical.normaliser();

    m_horizontal.normaliser();

    m_direction.normaliser();    

    m_vertical.normalize();

    m_horizontal.normalize();

    m_direction.normalize();    

}



    LrCamera::~LrCamera() {

LrImage.h

+1 −1
Changes for LrImage.h: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ public: 
     * Note : le contenu de l'image sera effacé,

     * et l'image sera remplie en bleue

     */

    void LrImage::setSize(int width, int height);    

    void setSize(int width, int height);    

    

     /**

     * @brief Retourne la largeur de l'image

LrOctree.cpp

+6 −6
Changes for LrOctree.cpp: 6 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -112,15 +112,15 @@ operator == (const LrOctree &lhs, const LrOctree &rhs) 


    if((lhs.m_listeObj.size() != rhs.m_listeObj.size()) || (lhs.m_listeOct.size() != rhs.m_listeOct.size())) return false;



    EntityList::iterator itObj_rhs = rhstemp.m_listeObj.begin();

    for(EntityList::iterator itObj_lhs = lhstemp.m_listeObj.begin(); itObj_lhs != lhstemp.m_listeObj.end(); itObj_lhs++)

    LrEntityList::iterator itObj_rhs = rhstemp.m_listeObj.begin();

    for(LrEntityList::iterator itObj_lhs = lhstemp.m_listeObj.begin(); itObj_lhs != lhstemp.m_listeObj.end(); itObj_lhs++)

    {

        res = res && (*itObj_lhs == *itObj_rhs);

        itObj_rhs++;

    }



    OctreeSonList::iterator itOct_rhs =  rhstemp.m_listeOct.begin();

    OctreeSonList::iterator itOct_lhs;

    LrOctreeList::iterator itOct_rhs =  rhstemp.m_listeOct.begin();

    LrOctreeList::iterator itOct_lhs;

    for( itOct_lhs = lhstemp.m_listeOct.begin(); itOct_lhs != lhstemp.m_listeOct.end(); itOct_lhs++)

    {

        res = res && (*itOct_lhs == *itOct_rhs);
@@ -180,7 +180,7 @@ const LrOctree* LrOctree::getOctree(int index) const 
{

    if(index < 8)

    {

        OctreeSonList::iterator it = ((LrOctree *)this)->m_listeOct.begin();

        LrOctreeList::iterator it = ((LrOctree *)this)->m_listeOct.begin();

        int i = 0;

        while(i !=index) it++;
@@ -203,7 +203,7 @@ LrEntity* LrOctree::getObject(int index) const 
{

    if(index < m_listeObj.size())

    {

        EntityList::iterator it = ((LrOctree *)this)->m_listeObj.begin();

        LrEntityList::iterator it = ((LrOctree *)this)->m_listeObj.begin();

        int i = 0;

        while(i !=index) it++;

        return *it;

LrOctree.h

+2 −5
Changes for LrOctree.h: 2 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -31,13 +31,10 @@ class LrOctree 
        const LrOctree *m_parent;

        LrVector m_pos;

        Real m_taille;

        list<LrEntity *> m_listeObj;

        list<LrOctree *> m_listeOct;

        LrEntityList m_listeObj;

        LrEntityList m_listeOct;



    public:



        typedef std::list<LrEntity *> EntityList;

        typedef std::list<LrOctree *> OctreeSonList;

        // constructors and destructor

        // ***************************