gigantic refactoring, part one

essai.pov

@@ -7,10 +7,6 @@
 
 #include  "globals.inc"
 
-#include  "colors.inc"
-#include  "metals.inc"
-#include  "textures.inc"
-#include  "stones.inc"
 
 #declare  NormClock = clock / 360.0;
 #include  "contexte.inc"
@@ -22,8 +18,12 @@
 #macro Bubble ()
 sphere {
 	0, 0.10
-	#if ( rand(Rng1) < 0.5 )	pigment { color Cyan }
-	#else				pigment { color Magenta }
+	#if   ( rand(Rng1) < 0.333 )
+	  texture { Ruby_Glass }
+	#elseif ( rand(Rng1) < 0.666 )
+	tus  texture { Orange_Glass }
+	#else
+	  texture { Gold_Nugget scale 0.56 }
 	#end
 	}
 #end
@@ -39,8 +39,13 @@ union	{
 #declare Les_Machins = object
 {
 union	{
-	#for (X, -7, 7)
-	    object { Un_Machin() translate x*X*0.6 }
+	#for (Xp, -10, 10)
+		#if ( rand(Rng1) < 0.5 )
+		  object { HexaCone_radar_A translate x*Xp*0.6 }
+		#else
+		  object { Un_Machin () translate x*Xp*0.6 }
+		#end
+		
 	#end
 	}
 }