diff --git a/Fraktalism/mkvoxvidz.sh b/Fraktalism/mkvoxvidz.sh index e4c2740..7be5946 100755 --- a/Fraktalism/mkvoxvidz.sh +++ b/Fraktalism/mkvoxvidz.sh @@ -12,7 +12,7 @@ fi TMPNG="/dev/shm/voxvidz.png" -NBIMG=1500 +NBIMG=1600 printf "#declare NbImg = %d;\n" $NBIMG | tee WS/nbimg.inc @@ -37,7 +37,7 @@ do titre='Voxelisation - tTh - Avril 2022' numbers=$(tail -1 WS/camvox.log | \ - awk '{printf " K=%5d : %6.3f %6.3f %6.3f", \ + awk '{printf " K=%5d : %6.3f %6.3f %6.3f", \ $1, $2, $3, $4}') echo "numbers " "$numbers" " txtidx " $txtidx @@ -57,7 +57,7 @@ do grep 'Parse Time' WS/toto.err grep 'Trace Time' WS/toto.err - echo ; sleep 15 + echo ; sleep 10 done diff --git a/Fraktalism/showvoxels.pov b/Fraktalism/showvoxels.pov index ee11d14..8b27b23 100644 --- a/Fraktalism/showvoxels.pov +++ b/Fraktalism/showvoxels.pov @@ -17,7 +17,7 @@ global_settings { #declare VOXEL = object { // sphere { 0, 1.18 } -#local D = 1.92; +#local D = 2.11; box { <-D, -D, -D>, } } @@ -52,7 +52,7 @@ finish { phong 0.6 specular 0.8 } object { TriAxe } plane { - <0, 1, 0>, -100 + <0, 1, 0>, -120 texture { pigment { color srgb <0.203, 0.185, 0.191> } finish { phong 0.18 metallic 0.55 } @@ -69,11 +69,11 @@ light_source { < 8, -48, 3> color Green*0.75 } #include "WS/nbimg.inc" #declare NormClock = (clock/NbImg); -#declare ECAM = 190 - (100*NormClock); -#declare CKsmall = NormClock * 77.20; +#declare ECAM = 210 - (100*NormClock); +#declare CKsmall = NormClock * 87.20; #declare Offset = 0.10; #declare XCAM = ECAM * (sin(radians(CKsmall)) + Offset); -#declare YCAM = 16; +#declare YCAM = 18; #declare ZCAM = ECAM * (cos(radians(CKsmall)) + Offset); #declare ACAM = 65 + (53*NormClock); @@ -91,7 +91,7 @@ light_source { < 8, -48, 3> color Green*0.75 } camera { location // look_at - look_at <0, 0, 0> + look_at <0, -1, 0> right x*image_width/image_height angle ACAM } diff --git a/Fraktalism/voxelize.f90 b/Fraktalism/voxelize.f90 index ed345c0..c3213cc 100644 --- a/Fraktalism/voxelize.f90 +++ b/Fraktalism/voxelize.f90 @@ -9,7 +9,7 @@ program voxelize implicit none - integer, parameter :: DIMC = 200 + integer, parameter :: DIMC = 180 integer, dimension(:,:,:), allocatable :: cube type(t_point3d), dimension(:), allocatable :: points integer :: errcode, foo, argc @@ -44,7 +44,7 @@ program voxelize KA(1) = -1.3402 ; KA(2) = 1.5245 KA(3) = 1.0966 ; KA(4) = -2.3423 KB(1) = -1.2100 ; KB(2) = 1.3685 - KB(3) = 1.1237 ; KB(4) = -2.1992 + KB(3) = 1.3237 ; KB(4) = -2.3992 call interp4dp(KA, KB, KM, delta) write(0, "(' --- coefs = ', 4F11.6)") KM call compute_pickover(points, KM) @@ -65,7 +65,7 @@ program voxelize write(0, *) "--- maxval(cube) = ", maxcube call spit_cube_as_union(filename, cube, & - maxcube/1000, dble(9000.00)) + maxcube/2000, dble(9000.00)) write(0, *) "--- end of voxelize" @@ -173,8 +173,8 @@ subroutine spit_cube_as_union(fname, voxels, limit, scaling) bz = bz + dble(iz) valeur = DBLE(cube(ix,iy,iz)) / scaling ! XXX - if (valeur .GT. 1.0) then - valeur = 1.0 + if (valeur .GT. 1.5) then + valeur = 1.5 endif write(chaine, "( 'translate <', I4, ',', I4, ',', I4, '> ' )") &