From 35f30b7e39515cbe0bf531c2c61b27fc6cdb7008 Mon Sep 17 00:00:00 2001 From: Tonton Th Date: Sat, 27 Jun 2026 23:01:40 +0200 Subject: [PATCH] cosmetic --- incs/instruments.inc | 40 +++++++++++++--------------------------- 1 file changed, 13 insertions(+), 27 deletions(-) diff --git a/incs/instruments.inc b/incs/instruments.inc index f29faf6..54a1bea 100644 --- a/incs/instruments.inc +++ b/incs/instruments.inc @@ -2,7 +2,6 @@ instruments.inc --------------- - */ @@ -22,31 +21,26 @@ #declare Boitier_Cadran = object { -union - { +union { cylinder { <0, 0, 1>, <0, 0, 0.2>, D_Cadran } cylinder { <0, 0, .3>, <0, 0, .25>, D_Cadran+.05 } - difference - { + difference { cylinder { <0, 0, 1.2>, <0, 0, 0.9>, D_Cadran+0.05 } cylinder { <0, 0, 1.3>, <0, 0, 0.8>, D_Cadran-0.05 } } } - texture { T_Chrome_2C } } /* voir le proggy 'make_cadran.f' */ #declare Fond_Cadran = object { -difference - { +difference { cylinder { <0, 0, 1.1>, <0, 0, 0.9>, D_Cadran } cylinder { <0, 0, 1.2>, <0, 0, 0.8>, 0.06 } } -pigment - { +pigment { image_map { png "picz/cadran.png" interpolate 2 } translate <-0.5, -0.5, 0> scale @@ -56,8 +50,7 @@ pigment /* ----------------------------------------------------- instruments ------- */ #declare Aiguille_0 = object { -union - { +union { // le pivot de l'aiguille cylinder { <0, 0, 1.07>, <0, 0, 1.22>, 0.06 } @@ -72,8 +65,7 @@ texture { T_Copper_3C } /* ----------------------------------------------------- instruments ------- */ #declare Cadran_0 = object { -union - { +union { object { Boitier_Cadran } object { Fond_Cadran } object { Aiguille_0 } @@ -82,8 +74,7 @@ union /* ----------------------------------------------------- instruments ------- */ #declare Cadran_1 = object { -union - { +union { object { Boitier_Cadran } object { Fond_Cadran } object { Aiguille_0 } @@ -106,11 +97,8 @@ texture { #declare Coque_Phare_0 = object { - -union - { - difference - { +union { + difference { sphere { <0, 0, 0>, 1 } sphere { <0, 0, 0>, .9 } box { <-2, -2, 0>, <2, 2, 2> } @@ -123,8 +111,7 @@ texture { T_Chrome_2C } #declare Vitre_Phare_0 = object { -union - { +union { // cylinder { <0, 0, -.01>, <0, 0, .01>, 1 } torus { .8, .03 rotate x*90 } torus { .6, .03 rotate x*90 } @@ -137,14 +124,13 @@ texture { T_Glass1 } #declare Phare_0 = object { -union - { +union { object { Coque_Phare_0 } object { Vitre_Phare_0 } - light_source - { + light_source { <0, 0, 0> color White + fade_distance 6 fade_power 1 looks_like { Ampoule } translate z*-.5 }