[FEAT] cylinder is now ok
This commit is contained in:
@@ -69,6 +69,7 @@ int main(void)
|
||||
the_cylinder = new Cylinder();
|
||||
the_cylinder->set_minimum(0);
|
||||
the_cylinder->set_maximum(0.75);
|
||||
the_cylinder->set_closed(true);
|
||||
the_cylinder->set_transform(Matrix::translation(-1, 0, 1) *
|
||||
Matrix::scaling(0.5, 1, 0.5));
|
||||
Material &the_cylinder_material = the_cylinder->material();
|
||||
@@ -125,6 +126,7 @@ int main(void)
|
||||
the_concentric_cylinder4 = new Cylinder();
|
||||
the_concentric_cylinder4->set_minimum(0);
|
||||
the_concentric_cylinder4->set_maximum(0.5);
|
||||
the_concentric_cylinder4->set_closed(true);
|
||||
the_concentric_cylinder4->set_transform(Matrix::translation(1, 0, 0) *
|
||||
Matrix::scaling(0.2, 1, 0.2));
|
||||
Material &the_concentric_cylinder4_material = the_concentric_cylinder4->material();
|
||||
@@ -139,6 +141,7 @@ int main(void)
|
||||
the_decorative_cylinder1 = new Cylinder();
|
||||
the_decorative_cylinder1->set_minimum(0);
|
||||
the_decorative_cylinder1->set_maximum(0.3);
|
||||
the_decorative_cylinder1->set_closed(true);
|
||||
the_decorative_cylinder1->set_transform(Matrix::translation(0, 0, -0.75) *
|
||||
Matrix::scaling(0.05, 1, 0.05));
|
||||
Material &the_decorative_cylinder1_material = the_decorative_cylinder1->material();
|
||||
@@ -153,6 +156,7 @@ int main(void)
|
||||
the_decorative_cylinder2 = new Cylinder();
|
||||
the_decorative_cylinder2->set_minimum(0);
|
||||
the_decorative_cylinder2->set_maximum(0.3);
|
||||
the_decorative_cylinder2->set_closed(true);
|
||||
the_decorative_cylinder2->set_transform(Matrix::translation(0, 0, -2.25) * Matrix::rotation_y(-0.15) *
|
||||
Matrix::translation(0, 0, 1.5) * Matrix::scaling(0.05, 1, 0.05));
|
||||
Material &the_decorative_cylinder2_material = the_decorative_cylinder2->material();
|
||||
@@ -167,6 +171,7 @@ int main(void)
|
||||
the_decorative_cylinder3 = new Cylinder();
|
||||
the_decorative_cylinder3->set_minimum(0);
|
||||
the_decorative_cylinder3->set_maximum(0.3);
|
||||
the_decorative_cylinder3->set_closed(true);
|
||||
the_decorative_cylinder3->set_transform(Matrix::translation(0, 0, -2.25) * Matrix::rotation_y(-0.3) *
|
||||
Matrix::translation(0, 0, 1.5) * Matrix::scaling(0.05, 1, 0.05));
|
||||
Material &the_decorative_cylinder3_material = the_decorative_cylinder3->material();
|
||||
@@ -181,6 +186,7 @@ int main(void)
|
||||
the_decorative_cylinder4 = new Cylinder();
|
||||
the_decorative_cylinder4->set_minimum(0);
|
||||
the_decorative_cylinder4->set_maximum(0.3);
|
||||
the_decorative_cylinder4->set_closed(true);
|
||||
the_decorative_cylinder4->set_transform(Matrix::translation(0, 0, -2.25) * Matrix::rotation_y(-0.45) *
|
||||
Matrix::translation(0, 0, 1.5) * Matrix::scaling(0.05, 1, 0.05));
|
||||
Material &the_decorative_cylinder4_material = the_decorative_cylinder4->material();
|
||||
@@ -195,6 +201,7 @@ int main(void)
|
||||
the_glass_cylinder = new Cylinder();
|
||||
the_glass_cylinder->set_minimum(0.0001);
|
||||
the_glass_cylinder->set_maximum(0.5);
|
||||
the_glass_cylinder->set_closed(true);
|
||||
the_glass_cylinder->set_transform(Matrix::translation(0, 0, -1.5) *
|
||||
Matrix::scaling(0.33, 1, 0.33));
|
||||
Material &the_glass_cylinder_material = the_glass_cylinder->material();
|
||||
|
||||
Reference in New Issue
Block a user