Commit 3b46bf8d authored by axel's avatar axel
Browse files

No commit message

No commit message
parent 9f724579
Loading
Loading
Loading
Loading
+9 −9
Original line number Diff line number Diff line
@@ -53,26 +53,26 @@ int main(int argc, char** argv)
    /**************************************************************************/
    
    /* Entite B : Sphere */
    LrMatrix B_Mat = LrMatrix::translate(LrVector(10, 25, 5)) * LrMatrix::scale(2);
    LrMatrix B_Mat = LrMatrix::translate(LrVector(15, 25, 15)) * LrMatrix::scale(2);
    LrColor c_1((uint8_t)175,(uint8_t)17,(uint8_t)17);
    LrColor c_2((uint8_t)0,(uint8_t)100,(uint8_t)100);
    LrColor c_3((uint8_t)215,(uint8_t)21,(uint8_t)21);
    LrPertColorTextProcTurbulence B_Pc(c_2, LrColor::YELLOW, c_3, 1.0, 4); 
    LrPertColorTextProcTurbulence B_Pc(c_2, LrColor::YELLOW, c_3, 1.0, 2); 
    LrOpticPhong B_Opt(0.5, 0.5, 0, &B_Pc, &A_Pn, 50);
    LrEntityElementary B(B_Mat, &A_Geo, &B_Opt);
    /**************************************************************************/
    
    /* Entite C : Sphere */
    LrMatrix C_Mat = LrMatrix::translate(LrVector(-10, 15, -3)) * LrMatrix::scale(3);
    LrMatrix C_Mat = LrMatrix::translate(LrVector(-12, 15, -3)) * LrMatrix::scale(3);
    LrPertColorTextProcMarbre C_Pc(LrColor::BLACK, LrColor::WHITE, LrColor::GREY, 1, 4);
    LrOpticPhong C_Opt(0.5, 0.5, 0, &C_Pc, &A_Pn, 50);
    LrEntityElementary C(C_Mat, &A_Geo, &C_Opt);
    /**************************************************************************/
    
    /* Entite D : Cube*/
    LrMatrix D_Mat = LrMatrix::translate(LrVector(-25, -7, -10)) * LrMatrix::scale(50);
    LrGeometryCube D_Geo(true);
    LrPertColorBasic D_Pc(LrColor::WHITE);
    LrMatrix D_Mat = LrMatrix::translate(LrVector(5, -2, -2)) * LrMatrix::rotateY(M_PI/4) * LrMatrix::rotateZ(M_PI/4) * LrMatrix::scale(2);
    LrGeometryCube D_Geo(false);
    LrPertColorBasic D_Pc(LrColor::YELLOW);
    LrOpticPhong D_Opt(0, 0.8, 0, &D_Pc, &A_Pn, 25);
    LrEntityElementary D(D_Mat, &D_Geo, &D_Opt);
    /**************************************************************************/
@@ -92,7 +92,7 @@ int main(int argc, char** argv)
/*#####################  LES LUMIERES de LA SCENE  ###########################*/
    
    //Entite X
    LrMatrix X_Mat = LrMatrix::translate(LrVector(-5, -8, 5));
    LrMatrix X_Mat = LrMatrix::translate(LrVector(-5, -15, 5));
    LrEntityLightPoint X(X_Mat, LrColor(0.8f,0.8f,0.8f));
    //LrEntityLightPlane X(X_Mat, LrColor(0.6f,0.6f,0.6f),10);
    /**************************************************************************/
@@ -104,7 +104,7 @@ int main(int argc, char** argv)
    /**************************************************************************/
    
    //Entite Z
    LrMatrix Z_Mat = LrMatrix::translate(LrVector(5, 0, 5));
    LrMatrix Z_Mat = LrMatrix::translate(LrVector(5, -15, 5));
    LrEntityLightPoint Z(Z_Mat, LrColor(0.8f,0.8f,0.8f));
    //LrEntityLightPlane Z(Z_Mat, LrColor(0.6f,0.6f,0.6f),10);
    /**************************************************************************/
@@ -127,7 +127,7 @@ int main(int argc, char** argv)
    list_entities.push_back(&A);
    list_entities.push_back(&B);
    list_entities.push_back(&C);
    //list_entities.push_back(&D);
    list_entities.push_back(&D);
    list_entities.push_back(&E);
    
    /**************************************************************************/