From d8e3d1c01b6056169dfe5b8089674bb8eba386c7 Mon Sep 17 00:00:00 2001 From: tTh Date: Sun, 20 Sep 2026 10:47:43 +0200 Subject: [PATCH] naptime reached --- BloubWorld/bloubspace.f90 | 8 ++++---- BloubWorld/genbloubs.f90 | 2 +- BloubWorld/mergebloubs.f90 | 8 ++++---- BloubWorld/movebloubs.f90 | 12 ++++++------ BloubWorld/runme.sh | 14 ++++++-------- BloubWorld/scene.pov | 16 ++++++++-------- BloubWorld/toinc.awk | 4 ++-- GrafAnim/Makefile | 2 +- GrafAnim/essai.f90 | 2 +- GrafAnim/noisepic.f90 | 2 -- GrafAnim/trigofest.f90 | 3 +-- Modules/twavm.f90 | 1 + 12 files changed, 35 insertions(+), 39 deletions(-) diff --git a/BloubWorld/bloubspace.f90 b/BloubWorld/bloubspace.f90 index 3c0138d..6fc965e 100644 --- a/BloubWorld/bloubspace.f90 +++ b/BloubWorld/bloubspace.f90 @@ -104,7 +104,7 @@ module bloubspace end subroutine ! ---------------------------------------------------------------- - ! Load a blbs file into an array of bloubs + ! Write an array of bloubs subroutine spit_bloubs_to_file (fname, blbarray, towrite) implicit none @@ -139,12 +139,12 @@ module bloubspace enddo close(output) - write(0, '(1X, "spitted ", I0, " bloubs to ", A)') & + write(0, '(1X, "spitted ", I6, " bloubs to ", A)') & spitted, trim(fname) end subroutine spit_bloubs_to_file ! ---------------------------------------------------------------- - ! Dump an array of bloubs to a blbs file. + ! Read an array of bloubs from a blbs file. ! subroutine slurp_bloubs_file_in_array (infile, blbarray, nbread) implicit none @@ -323,7 +323,7 @@ module bloubspace implicit none type(t_bloubs), intent (inout) :: blb - if (blb%age .gt. 240) then + if (blb%age .gt. 280) then blb%alive = .FALSE. endif diff --git a/BloubWorld/genbloubs.f90 b/BloubWorld/genbloubs.f90 index 97ab825..ae4fd31 100644 --- a/BloubWorld/genbloubs.f90 +++ b/BloubWorld/genbloubs.f90 @@ -33,7 +33,7 @@ program genbloubs bloub%nick = 'noname ' bloub%num = i + 41 - call make_a_random_bloub(bloub, 11.80) + call make_a_random_bloub(bloub, 13.37) bloub%radius = 0.010 + (0.12*rand()) write(idu) bloub ! no error control ? diff --git a/BloubWorld/mergebloubs.f90 b/BloubWorld/mergebloubs.f90 index 4a66570..8f1c4d8 100644 --- a/BloubWorld/mergebloubs.f90 +++ b/BloubWorld/mergebloubs.f90 @@ -49,7 +49,7 @@ program mergebloubs contacts = contacts + 1 call merge_two_bloubs(bloubs(ia), bloubs(ib), merged) bloubs(ia) = merged - bloubs(ia)%nick = "marged" + bloubs(ia)%nick = "merged" bloubs(ia)%state = 1; bloubs(ib)%alive = .FALSE. write(0, *) " *** merged ", ia, " and ", ib, & @@ -98,9 +98,9 @@ contains blr%vy = (bla%vy + blb%vy) / 2.0 blr%vz = (bla%vz + blb%vz) / 2.0 if (0.001 .GT. rand()) then - blr%vx = blr%vx * 1.04 - blr%vy = blr%vy * 1.04 - blr%vz = blr%vz * 1.04 + blr%vx = blr%vx * 1.02 + blr%vy = blr%vy * 1.02 + blr%vz = blr%vz * 1.02 endif blr%radius = (va + vb) ** 0.33335 diff --git a/BloubWorld/movebloubs.f90 b/BloubWorld/movebloubs.f90 index c9d0a1c..650cf1d 100644 --- a/BloubWorld/movebloubs.f90 +++ b/BloubWorld/movebloubs.f90 @@ -48,9 +48,9 @@ program movebloubs compteur = 0 killed = 0 -!- +!- ---------------- ! begin of bigloop -!- +!- ---------------- do read (unit=inu, iostat=errcode) bloub if (0 .ne. errcode) then @@ -99,16 +99,16 @@ program movebloubs ! insert some fancy conditional here for adding new ! bloubs to the bloubiverse - if (compteur .LT. 180) then + if (compteur .LT. 333) then write (0, *) '... rearmement demographique ...' - call add_more_bloubs(outu, 19, 0.046) + call add_more_bloubs(outu, 42, 0.046) endif rnd = rand() ! write(0, *) 'rnd= ', rnd - if (rnd .LT. 0.18) then + if (rnd .LT. 0.22) then write (0, *) '... the random of life ...' - call add_more_bloubs(outu, 15, 0.056) + call add_more_bloubs(outu, 19, 0.056) endif close(inu) ; close(outu) diff --git a/BloubWorld/runme.sh b/BloubWorld/runme.sh index ff9f671..e7b66ff 100755 --- a/BloubWorld/runme.sh +++ b/BloubWorld/runme.sh @@ -7,8 +7,8 @@ INCFILE="WS/bloubs.inc" TMPPNG="/dev/shm/bloubs7.png" -NBIMG=2000 -POVOPT="+Q9 +a -v -d Declare=NbFrames=$NBIMG -W1200 -H900 -WT4" +NBIMG=3200 +POVOPT="+Q9 +a -v -d Declare=NbFrames=$NBIMG -W1152 -H900 -WT2" DDIR="frames/a" LOGERR="log.error" TXTCOLOR="#db4090" @@ -32,7 +32,7 @@ fi # first, we have to make a seminal buch of bloubs # --> this function need to be parametrizable # -./genbloubs ${BLBS_IN} 333 +./genbloubs ${BLBS_IN} 9999 for idx in $(seq 0 $((NBIMG-1)) ) do @@ -54,14 +54,14 @@ do fi td=$(date -u +'%F %R' | tr '01' 'ol') - hi=$(printf "\$%03x" $idx | tr '01' 'ol') + hi=$(printf "%03d" $idx | tr '01' 'ol') count=$(tail -1 "WS/log.nb_bloubs" | tr '01' 'ol') PNG=$(printf "%s/%05d.png" ${DDIR} $idx) convert ${TMPPNG} \ -font Courier-Bold \ - -pointsize 28 \ + -pointsize 32 \ -fill "$TXTCOLOR" \ -gravity south-east \ -annotate +25+5 "$hi" \ @@ -75,9 +75,7 @@ do ./mergebloubs ${BLBS_OUT} ${BLBS_IN} # mv ${BLBS_OUT} ${BLBS_IN} - echo "### run done" - sleep 15 - + sleep 19 done rm $LOGERR diff --git a/BloubWorld/scene.pov b/BloubWorld/scene.pov index a9f6789..6531a85 100644 --- a/BloubWorld/scene.pov +++ b/BloubWorld/scene.pov @@ -5,7 +5,7 @@ #version 3.7; global_settings { - ambient_light rgb <0.14, 0.08, 0.08> + ambient_light rgb <0.14, 0.08, 0.28> assumed_gamma 1.0 } @@ -27,7 +27,7 @@ global_settings { object { Bloubs - finish { phong 0.47 specular 0.47 } + finish { phong 0.37 specular 0.67 } } #declare La_Boite = object @@ -40,7 +40,7 @@ union { plane { <0, 0, 1>, 69 } texture { pigment { color srgb <0.48, 0.54, 0.52> } - finish { phong 0.18 ambient 0.25 reflection 0.35 } + finish { phong 0.08 ambient 0.25 reflection 0.65 } } } } @@ -55,7 +55,7 @@ translate -6.20*y sky_sphere { pigment { color Gray20 } - emission rgb <0.01, 0.01, 0.01> + emission rgb <0.05, 0.05, 0.05> } // ---------------------------------------------------------- @@ -69,12 +69,12 @@ union { cylinder { -SC*z, SC*z, 0.04 } } texture { - pigment { color Gray70 } + pigment { color Gray80 } finish { emission 0.975 } } } -object { Croisillon scale 0.90 translate } +// object { Croisillon scale 0.90 translate } // ---------------------------------------------------------- @@ -140,7 +140,7 @@ union { } } -object { Les_Bornes } +// object { Les_Bornes } // ---------------------------------------------------------- #local D = 0.016; @@ -169,7 +169,7 @@ light_source { <-14, 10-NormClock, -29> color Gray80 } #declare XCAM = 20 - ( 40 * NormClock); #declare YCAM = -1.1 + (2.26 * NormClock); #declare ZCAM = -23.00; -#declare ACAM = 55 - (12*Cos_010(NormClock)); +#declare ACAM = 75 - (12*Cos_010(NormClock)); #declare XLAT = 0; #declare YLAT = 0; diff --git a/BloubWorld/toinc.awk b/BloubWorld/toinc.awk index 2e2e738..e2c19d3 100644 --- a/BloubWorld/toinc.awk +++ b/BloubWorld/toinc.awk @@ -2,7 +2,7 @@ # # Input for this script is generated by 'exportbloubs.f90' # -# this code is (C) 2022 tTh +# this code is (C) 2026 tTh # BEGIN { @@ -29,7 +29,7 @@ BEGIN { if (age > 150) color = "DarkGreen" else color = "Aquamarine" } - if (age < 18) color = "Gray40" + if (age < 18) color = "Gray60" if (age < 9) color = "LimeGreen" # calcul barycentre diff --git a/GrafAnim/Makefile b/GrafAnim/Makefile index 5156318..80319be 100644 --- a/GrafAnim/Makefile +++ b/GrafAnim/Makefile @@ -2,7 +2,7 @@ # Fortraneries by tTh - Graf Anim # -GFOPT = -Wall -Wextra -g -time -I../Modules +GFOPT = -Wall -Wextra -g -pg -I../Modules MYLIB = '../Modules/libtth90modules.a' # ---- programmes diff --git a/GrafAnim/essai.f90 b/GrafAnim/essai.f90 index 877335e..77f8e68 100644 --- a/GrafAnim/essai.f90 +++ b/GrafAnim/essai.f90 @@ -94,6 +94,6 @@ subroutine iterator(img, x0, y0, nbi) enddo end subroutine - +! ---------------------------------------------------------- end program diff --git a/GrafAnim/noisepic.f90 b/GrafAnim/noisepic.f90 index 8ac0fcc..1cb7438 100644 --- a/GrafAnim/noisepic.f90 +++ b/GrafAnim/noisepic.f90 @@ -42,8 +42,6 @@ program noisepic contains !-- ------------------------------------------------------------------ -!-- -!-- ------------------------------------------------------------------ subroutine make_noise_color_range_pic (seqv, rngs, nbre) implicit none integer, intent(in) :: seqv, nbre diff --git a/GrafAnim/trigofest.f90 b/GrafAnim/trigofest.f90 index ab35b67..19c00b5 100644 --- a/GrafAnim/trigofest.f90 +++ b/GrafAnim/trigofest.f90 @@ -32,7 +32,7 @@ program trigofest STOP ': WORLD FINISHED' -contains !------------------------------------------ +contains !------------------------------------------------------------- ! Lowlevel functions ! ------------------ @@ -121,7 +121,6 @@ subroutine spirale(pic, inirad, param) end subroutine -!------------------------------------------------------------- !------------------------------------------------------------- end program diff --git a/Modules/twavm.f90 b/Modules/twavm.f90 index 1169e40..992b802 100644 --- a/Modules/twavm.f90 +++ b/Modules/twavm.f90 @@ -1,5 +1,6 @@ program twavm + ! tests sur le machin wavmetrics ! new: Wed Feb 7 01:27:48 UTC 2024 use mathstuff2