Commit 03859477 authored by axel's avatar axel
Browse files

No commit message

No commit message
parent 088a9e39
Loading
Loading
Loading
Loading
+8 −8
Original line number Diff line number Diff line
@@ -39,9 +39,9 @@ int main(int argc, char** argv)
    FILE *file;

    /*Creation d'une sphere : entite A (sphere rouge)*/
    LrMatrix mat_A=LrMatrix::translate(LrVector(0, 0, 10)) * LrMatrix::scale(4);
    LrMatrix mat_A=LrMatrix::translate(LrVector(-1, 15, 0)) * LrMatrix::scale(3);
    LrGeometrySphere geo_A;
    LrColor c_bois1((uint8_t)136,(uint8_t)88,(uint8_t)0);
    LrColor c_bois1((uint8_t)140,(uint8_t)73,(uint8_t)15);
    LrColor c_bois2((uint8_t)109,(uint8_t)60,(uint8_t)0);
    LrColor c_bois3((uint8_t)67,(uint8_t)40,(uint8_t)0);
    LrPertColorTextProcBois pcb_A(c_bois1, c_bois2, c_bois3, 1.0, 1); 
@@ -51,7 +51,7 @@ int main(int argc, char** argv)
    LrEntityElementary sphere_A(mat_A, &geo_A, &opt_A);

    /*Creation d'une sphere : entite B (sphere verte)*/
    LrMatrix mat_B = LrMatrix::translate(LrVector(2, 25, 5)) * LrMatrix::scale(2);
    LrMatrix mat_B = LrMatrix::translate(LrVector(10, 25, 5)) * 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);
@@ -61,7 +61,7 @@ int main(int argc, char** argv)
    LrEntityElementary sphere_B(mat_B, &geo_A, &opt_B);

    /*Creation d'une sphere : entite B (sphere du milieu)*/
    LrMatrix mat_C = LrMatrix::translate(LrVector(-4, 15, -3)) * LrMatrix::scale(3);
    LrMatrix mat_C = LrMatrix::translate(LrVector(-10, 15, -3)) * LrMatrix::scale(3);
    LrPertColorTextProcMarbre pcb_C(LrColor::BLACK, LrColor::WHITE, LrColor::GREY, 1, 4);
    LrPertNormalBasic pnb_C;
    LrOpticPhong opt_C(0.5, 0.5, 0, &pcb_C, &pnb_C, 50);
@@ -89,16 +89,16 @@ int main(int argc, char** argv)
    //Creation d'une lumiere point : entite X (lumiere de droite)
    LrMatrix mat_lum_X = LrMatrix::translate(LrVector(-5, -8, 5));
    //LrEntityLightPoint lum_X(mat_lum_X, LrColor(0.8f,0.8f,0.8f));
    LrEntityLightPlane lum_X(mat_lum_X, LrColor(0.3f,0.3f,0.3f),10);
    LrEntityLightPlane lum_X(mat_lum_X, LrColor(0.6f,0.6f,0.6f),10);

    //Creation d'une lumiere point : entite Y (Lumiere au plafond)
    LrMatrix mat_lum_Y = LrMatrix::translate(LrVector(0, 0, 20));
    LrEntityLightPlane lum_Y(mat_lum_Y, LrColor(0.3f,0.3f,0.3f),10);
    LrEntityLightPlane lum_Y(mat_lum_Y, LrColor(0.6f,0.6f,0.6f),10);

    //Creation d'une lumiere point : entite Z (Lumiere de gauche)
    LrMatrix mat_lum_Z = LrMatrix::translate(LrVector(5, 0, 5));
    //LrEntityLightPoint lum_Z(mat_lum_Z, LrColor(0.8f,0.8f,0.8f));
    LrEntityLightPlane lum_Z(mat_lum_Z, LrColor(0.3f,0.3f,0.3f),10);
    LrEntityLightPlane lum_Z(mat_lum_Z, LrColor(0.6f,0.6f,0.6f),10);
    
    //Creation de la Liste des entites-lumieres et ajout des entites-lumieres dans cette liste
    LrScene::LrEntityList list_lights;
@@ -122,7 +122,7 @@ int main(int argc, char** argv)

    //Image et camera
    LrImage img_A(600,600);
    LrPoint pt_origine_cam(0, -20, 0);
    LrPoint pt_origine_cam(0, -25, 0);
    LrCameraPlane cam_A(pt_origine_cam,LrVector::K,LrVector::J,M_PI/4,M_PI/4);

    //L'antiAliasing