From d7da858380b7b2b22c45a09e66dc3b68e2cd8a20 Mon Sep 17 00:00:00 2001 From: tTh Date: Thu, 25 Jun 2026 10:09:03 +0200 Subject: [PATCH] cramicule is comming ! --- BloubWorld/README.md | 2 ++ BloubWorld/bloubspace.f90 | 2 +- BloubWorld/genbloubs.f90 | 2 +- BloubWorld/movebloubs.f90 | 14 ++++++++------ BloubWorld/runme.sh | 8 ++++---- BloubWorld/scene.pov | 9 +++++++-- BloubWorld/toinc.awk | 9 ++++++--- Fraktalism/Makefile | 2 +- Fraktalism/common.sh | 2 +- Fraktalism/encode.sh | 6 +++--- Fraktalism/julias.f90 | 6 +++--- Fraktalism/mandelbrots.f90 | 4 ++-- Fraktalism/mkjuliagif.sh | 8 ++++---- Fraktalism/mkmandel.f90 | 3 ++- Fraktalism/mkvoxvidz.sh | 9 +++++---- Fraktalism/mods/README.md | 6 ++++-- Fraktalism/mods/documention.md | 2 +- Fraktalism/showvoxels.pov | 11 ++++------- Fraktalism/voxelize.f90 | 2 +- GravityField/animation.f90 | 2 +- Modules/WS/README.md | 5 +++++ 21 files changed, 66 insertions(+), 48 deletions(-) create mode 100644 Modules/WS/README.md diff --git a/BloubWorld/README.md b/BloubWorld/README.md index e68300a..3848a56 100644 --- a/BloubWorld/README.md +++ b/BloubWorld/README.md @@ -82,5 +82,7 @@ par exemple le barycentre des bloubs. Et c'est très facile - Réfléchir à une politique de vieillissement des bloubs - le `merge` de deux bloubs est-il un acte politique ? +. + diff --git a/BloubWorld/bloubspace.f90 b/BloubWorld/bloubspace.f90 index 65bc2c2..3c0138d 100644 --- a/BloubWorld/bloubspace.f90 +++ b/BloubWorld/bloubspace.f90 @@ -84,7 +84,7 @@ module bloubspace blb%py = coefxyz * (rand() - 0.50) blb%pz = coefxyz * (rand() - 0.50) - blb%vx = (rand() / 9.000) + blb%vx = (rand() / 6.000) if (blb%px .LT. 0.0) blb%vx = -blb%vx blb%vy = -0.10 + (rand() / 11.000) diff --git a/BloubWorld/genbloubs.f90 b/BloubWorld/genbloubs.f90 index 47fb6c7..97ab825 100644 --- a/BloubWorld/genbloubs.f90 +++ b/BloubWorld/genbloubs.f90 @@ -42,4 +42,4 @@ program genbloubs close(unit=idu) -end program \ No newline at end of file +end program diff --git a/BloubWorld/movebloubs.f90 b/BloubWorld/movebloubs.f90 index f486e82..c9d0a1c 100644 --- a/BloubWorld/movebloubs.f90 +++ b/BloubWorld/movebloubs.f90 @@ -54,7 +54,7 @@ program movebloubs do read (unit=inu, iostat=errcode) bloub if (0 .ne. errcode) then - ! may be we got an EOF ? + ! may be we got an EOF ? XXX exit endif @@ -97,16 +97,18 @@ program movebloubs ! ok, we have read all the bloubs from the input file - ! insert some fancy conditional here - if (compteur .LT. 50) then - call add_more_bloubs(outu, 5, 0.046) + ! insert some fancy conditional here for adding new + ! bloubs to the bloubiverse + if (compteur .LT. 180) then + write (0, *) '... rearmement demographique ...' + call add_more_bloubs(outu, 19, 0.046) endif rnd = rand() ! write(0, *) 'rnd= ', rnd if (rnd .LT. 0.18) then - write (0, *) '... random of life ...' - call add_more_bloubs(outu, 5, 0.056) + write (0, *) '... the random of life ...' + call add_more_bloubs(outu, 15, 0.056) endif close(inu) ; close(outu) diff --git a/BloubWorld/runme.sh b/BloubWorld/runme.sh index a262ac3..ff9f671 100755 --- a/BloubWorld/runme.sh +++ b/BloubWorld/runme.sh @@ -32,7 +32,7 @@ fi # first, we have to make a seminal buch of bloubs # --> this function need to be parametrizable # -./genbloubs ${BLBS_IN} 3333 +./genbloubs ${BLBS_IN} 333 for idx in $(seq 0 $((NBIMG-1)) ) do @@ -54,7 +54,7 @@ do fi td=$(date -u +'%F %R' | tr '01' 'ol') - hi=$(printf "#%04d" $idx | tr '01' 'ol') + hi=$(printf "\$%03x" $idx | tr '01' 'ol') count=$(tail -1 "WS/log.nb_bloubs" | tr '01' 'ol') PNG=$(printf "%s/%05d.png" ${DDIR} $idx) @@ -64,7 +64,7 @@ do -pointsize 28 \ -fill "$TXTCOLOR" \ -gravity south-east \ - -annotate +25+5 "$td" \ + -annotate +25+5 "$hi" \ -gravity south-west \ -annotate +25+5 "$count" \ $PNG @@ -76,7 +76,7 @@ do # mv ${BLBS_OUT} ${BLBS_IN} echo "### run done" - sleep 5 + sleep 15 done diff --git a/BloubWorld/scene.pov b/BloubWorld/scene.pov index 2069bce..a9f6789 100644 --- a/BloubWorld/scene.pov +++ b/BloubWorld/scene.pov @@ -13,6 +13,10 @@ global_settings { #declare NormClock = clock / NbFrames; +#macro Cos_010( X ) + (0.5-0.5*cos(2*3.141592654*X)) +#end + // ---------------------------------------------------------- #include "WS/bloubs.inc" @@ -35,7 +39,7 @@ union { plane { <0, 1, 0>, 27 } plane { <0, 0, 1>, 69 } texture { - pigment { color srgb <0.35, 0.44, 0.43> } + pigment { color srgb <0.48, 0.54, 0.52> } finish { phong 0.18 ambient 0.25 reflection 0.35 } } } @@ -162,9 +166,10 @@ union { light_source { < 19, 12+NormClock, -17> color Gray80 } light_source { <-14, 10-NormClock, -29> color Gray80 } -#declare XCAM = 10 - ( 20 * NormClock); +#declare XCAM = 20 - ( 40 * NormClock); #declare YCAM = -1.1 + (2.26 * NormClock); #declare ZCAM = -23.00; +#declare ACAM = 55 - (12*Cos_010(NormClock)); #declare XLAT = 0; #declare YLAT = 0; diff --git a/BloubWorld/toinc.awk b/BloubWorld/toinc.awk index 52771ec..2e2e738 100644 --- a/BloubWorld/toinc.awk +++ b/BloubWorld/toinc.awk @@ -8,6 +8,7 @@ BEGIN { count = 0 bx = by = bz = 0.0 + print "// --------------------------------" print "// GENERATED FILE, DON'T TOUCH IT !" print "// --------------------------------" print @@ -21,19 +22,21 @@ BEGIN { color = "Cyan" if (merged) { - if (age > 150) color = "Orange" - else color = "Yellow" + if (age > 150) color = "OrangeRed" + else color = "GreenYellow" } else { if (age > 150) color = "DarkGreen" else color = "Aquamarine" } if (age < 18) color = "Gray40" - if (age < 9) color = "Blue" + if (age < 9) color = "LimeGreen" + # calcul barycentre bx += $1 by += $2 bz += $3 + pigment = "pigment { color " color " }" printf "\tsphere { <%f, %f, %f>, %f \n\t\t%s }\n", \ $1, $2, $3, $4, pigment diff --git a/Fraktalism/Makefile b/Fraktalism/Makefile index 38308e2..3057713 100644 --- a/Fraktalism/Makefile +++ b/Fraktalism/Makefile @@ -2,7 +2,7 @@ all: essai voxelize evolvopick pickover \ mkjulia mklorentz mkmandel -GFOPT = -Wall -Wextra -time -g -Imods/ -I../Modules +GFOPT = -Wall -Wextra -Imods/ -I../Modules # --------------------------------------------- # the module 'spitpgm' is now in $PROJECT/Modules diff --git a/Fraktalism/common.sh b/Fraktalism/common.sh index 5ce2996..97ef74a 100644 --- a/Fraktalism/common.sh +++ b/Fraktalism/common.sh @@ -1,4 +1,4 @@ -POVOPT=" -d +q9 +a +W1920 +H1080 -v +WT4" +POVOPT=" -d +q9 +a +W800 +H600 -v +WT2" diff --git a/Fraktalism/encode.sh b/Fraktalism/encode.sh index 317acd6..41c45ca 100755 --- a/Fraktalism/encode.sh +++ b/Fraktalism/encode.sh @@ -25,15 +25,15 @@ echo "file type :" $filetype # case $filetype in PNG) extension=".png" ;; - Netpbm) extension=".pgm" ;; + Netpbm) extension=".pnm" ;; *) extension=".binary" ;; esac echo "extension :" $extension -TITLE='---{ voxelisation experimentale }---' +TITLE='---{ fortranerie experimentale }---' ffmpeg -nostdin \ -loglevel warning \ - -y -r 30 -f image2 -i $SDIR/%05d.png \ + -y -r 30 -f image2 -i $SDIR/%05d$extension \ -metadata artist='--{ tTh des Bourtoulots }--' \ -metadata title="${TITLE}" \ -preset veryslow \ diff --git a/Fraktalism/julias.f90 b/Fraktalism/julias.f90 index de9fde7..1694caa 100644 --- a/Fraktalism/julias.f90 +++ b/Fraktalism/julias.f90 @@ -93,9 +93,9 @@ subroutine julia_colormapped(pic, cx, cy, mag, maxiter) endif end do if (over_iter) then - pic(ix, iy)%r = mod(int(modulus2(Z)*2000.0), 255) - pic(ix, iy)%g = mod(abs(int(real(Z) *11.0)), 255) - pic(ix, iy)%b = mod(abs(int(aimag(Z)*11.0)), 255) + pic(ix, iy)%r = mod(int(modulus2(Z)*1337.0), 255) + pic(ix, iy)%g = mod(abs(int(real(Z) *17.0)), 255) + pic(ix, iy)%b = mod(abs(int(aimag(Z)*17.0)), 255) print *, ix, iy, Z, modulus2(Z) over = over + 1 else diff --git a/Fraktalism/mandelbrots.f90 b/Fraktalism/mandelbrots.f90 index 7b45b8d..77fcb1d 100644 --- a/Fraktalism/mandelbrots.f90 +++ b/Fraktalism/mandelbrots.f90 @@ -42,10 +42,10 @@ subroutine mandelbrot_one(pic, start) ! enter megaloop ! do iy = 1, height - fy = (float(iy) / float(height/3)) - 1.5 + fy = (float(iy) / float(height/2)) - 1.0 !! print *, "line ", iy, fy do ix = 1, width - fx = (float(ix) / float(width/3)) - 2.0 + fx = (float(ix) / float(width/2)) - 1.4 !------------------------------------- ! working on the current pixel za = start diff --git a/Fraktalism/mkjuliagif.sh b/Fraktalism/mkjuliagif.sh index 014182e..be03780 100755 --- a/Fraktalism/mkjuliagif.sh +++ b/Fraktalism/mkjuliagif.sh @@ -45,13 +45,13 @@ do -font Courier-Bold \ -pointsize 20 \ -fill Yellow \ - -annotate +15+34 $tcx \ - -annotate +15+58 $tcy \ - -gravity South-East \ + -annotate +18+34 $tcx \ + -annotate +18+58 $tcy \ + -gravity South \ -font Courier \ -pointsize 14 \ -fill Yellow \ - -annotate +10+6 "Konrad+tTh 2024" \ + -annotate +0+9 "Konrad+tTh 2026" \ $img done diff --git a/Fraktalism/mkmandel.f90 b/Fraktalism/mkmandel.f90 index f366a3d..7e63767 100644 --- a/Fraktalism/mkmandel.f90 +++ b/Fraktalism/mkmandel.f90 @@ -23,7 +23,7 @@ program mkmandel write(0, *) "-------- making some mandelbrot -------" - allocate(pic(1920, 1080)) + allocate(pic(1024, 780)) do angle = 0, 2000 @@ -35,6 +35,7 @@ program mkmandel ! filename = trim(filename) write(0,*) "passe ", angle, radangle, trim(filename) + ! compute the 'perturbation' stx = radius * (sin(radangle*4.07) + 0.2131*cos(radangle*11.36)) sty = radius * (sin(radangle*6.21) + 0.2725*cos(radangle*10.99)) diff --git a/Fraktalism/mkvoxvidz.sh b/Fraktalism/mkvoxvidz.sh index 6508c99..5af6afc 100755 --- a/Fraktalism/mkvoxvidz.sh +++ b/Fraktalism/mkvoxvidz.sh @@ -31,11 +31,11 @@ do if [ $? -ne 0 ] ; then echo "ERROR ERROR ERROR ERROR ERROR ERROR" tail -15 WS/toto.err - sleep 20 + sleep 200 #exit 1 fi - titre='Voxelisation - tTh - Avril 2022' + titre='Voxelisation - tTh - Juin 2026' numbers=$(tail -1 WS/camvox.log | \ awk '{printf " K=%5d : %6.3f %6.3f %6.3f", \ $1, $2, $3, $4}') @@ -45,11 +45,11 @@ do convert ${TMPNG} \ -fill Orange \ -kerning 2 \ - -pointsize 32 \ -font AvantGarde-Book \ -gravity South-West \ + -pointsize 20 \ -annotate +20+45 "$titre" \ - -pointsize 24 \ + -pointsize 14 \ -annotate +20+10 "$numbers" \ \ $dst @@ -62,3 +62,4 @@ do done ./encode.sh frames/voxel/ voxel-3.mp4 + diff --git a/Fraktalism/mods/README.md b/Fraktalism/mods/README.md index eb98cbc..ea745f1 100644 --- a/Fraktalism/mods/README.md +++ b/Fraktalism/mods/README.md @@ -1,4 +1,4 @@ -# Modules +# Modules fraktallistes Premier point : trouver les bonnes options de gfortran pour @@ -9,5 +9,7 @@ avec un script de build bien robuste. Troisième point : Faire la [documentation](documentation.md) -Quatrilème point : Cultiver la techno-futilité. +Quatrillème point : Cultiver la techno-futilité, une des choses +qui nous évitera de devenir dingues dans ce monde actuel en +décomposition. diff --git a/Fraktalism/mods/documention.md b/Fraktalism/mods/documention.md index a173506..1fb8ea5 100644 --- a/Fraktalism/mods/documention.md +++ b/Fraktalism/mods/documention.md @@ -1,7 +1,7 @@ # La doc des modules (enfin !) Non, détrompez-vous, ce n'est pas vraiment une doc, parce que -les codes des modules du fraktalisme est en perpétuelle évolution. +les codes des modules du fraktalisme sont en perpétuelle évolution. ## Points 3d diff --git a/Fraktalism/showvoxels.pov b/Fraktalism/showvoxels.pov index 8b27b23..318c523 100644 --- a/Fraktalism/showvoxels.pov +++ b/Fraktalism/showvoxels.pov @@ -7,7 +7,7 @@ #version 3.7; global_settings { - ambient_light rgb <0.04, 0.04, 0.04> + ambient_light rgb <0.06, 0.06, 0.06> assumed_gamma 1.0 } //---------------------------------------------------------------- @@ -16,8 +16,7 @@ global_settings { #declare VOXEL = object { -// sphere { 0, 1.18 } -#local D = 2.11; +#local D = 3.85; box { <-D, -D, -D>, } } @@ -33,14 +32,13 @@ object { */ #local TRK = DIMC/2.0000000; translate <-TRK, -TRK, -TRK> - // rotate } //---------------------------------------------------------------- #declare TriAxe = object { #local Sz = 300; -#local Ra = 0.20; +#local Ra = 0.25; union { cylinder { <-Sz, 0, 0>, , Ra pigment { color Red } } cylinder { <0, -Sz, 0>, <0, Sz, 0>, Ra pigment { color Green } } @@ -62,7 +60,7 @@ plane { light_source { <-29, 45, -27> color Gray70 } light_source { <-52, 5, -48> color Yellow*0.45 } light_source { < 59, 45, 48> color Gray20 } -light_source { < 59, -45, 48> color Gray20 } +light_source { < 59, -45, 48> color Gray40 } light_source { < 9, 59, 18> color Red*0.65 } light_source { < 8, -48, 3> color Green*0.75 } @@ -97,4 +95,3 @@ camera { } //---------------------------------------------------------------- -//---------------------------------------------------------------- diff --git a/Fraktalism/voxelize.f90 b/Fraktalism/voxelize.f90 index 1858e3a..a3a8909 100644 --- a/Fraktalism/voxelize.f90 +++ b/Fraktalism/voxelize.f90 @@ -9,7 +9,7 @@ program voxelize implicit none - integer, parameter :: DIMC = 451 + integer, parameter :: DIMC = 512 integer, dimension(:,:,:), allocatable :: cube type(t_point3d), dimension(:), allocatable :: points integer :: errcode, foo, argc diff --git a/GravityField/animation.f90 b/GravityField/animation.f90 index 942758f..2628afd 100644 --- a/GravityField/animation.f90 +++ b/GravityField/animation.f90 @@ -21,7 +21,7 @@ program animation type(massbody) :: planets(NB_BODY) call init_random() - call create_some_planets(planets, 1664.3, IMG_WIDTH , IMG_HEIGHT) + call create_some_planets(planets, 1.4e4, IMG_WIDTH , IMG_HEIGHT) call print_barycentre_bodies(planets, 'begin') call la_grande_boucle(0, 667, planets) diff --git a/Modules/WS/README.md b/Modules/WS/README.md new file mode 100644 index 0000000..e6b0574 --- /dev/null +++ b/Modules/WS/README.md @@ -0,0 +1,5 @@ + + +This is the *Work Space* for various temporary files. + +