Compare commits

..

No commits in common. "e099b398f3bcf645d32e506dfdf9374bf6e98f23" and "8ea11d110b0a89ae3a876ecebac990468ef3d27a" have entirely different histories.

3 changed files with 37 additions and 32 deletions

View File

@ -2,7 +2,6 @@
julia
pickover
lorentz
mkmandel
voxelize
evolvopick
henon

View File

@ -17,7 +17,7 @@ fraktals.o: fraktals.f90 Makefile
gfortran $(GFOPT) -c $<
OBJDEP = mods/points3d.o mods/xperiment.o fraktals.o mods/fractcolmap.o
OBJS = $(OBJDEP) ../Modules/pixrgb.o ../Modules/spitpgm.o
OBJS = $(OBJDEP) ../Modules/spitpgm.o
# ---------------------------------------------

View File

@ -1,17 +1,17 @@
!-----------------------------------------------------
! IMAGE PROCESSING
!-----------------------------------------------------
!-
subroutine plotsomething(pic, start)
!-----------------------------------------------------
subroutine plotsomething(pic, start, cz)
! use cmplxmath
! use imagetools
use pixrgb
implicit none
type(t_pixrgb), intent(inout), dimension (:,:) :: pic
complex, intent(in) :: start
! type (CenterMag), intent(in) :: cz
integer, intent(inout), dimension (:,:) :: pic
complex, intent(in) :: start
type (CenterMag), intent(in) :: cz
integer :: ix, iy, width, height
real :: fx, fy, mod2
@ -23,12 +23,13 @@ subroutine plotsomething(pic, start)
width = ubound(pic, 1)
height = ubound(pic, 2)
! print *, " pic size ", width, height
print *, " pic size ", width, height
print *, " start ", start
call print_centermag(cz)
! initialise constants
!
maxiter = 2500;
maxiter = 999;
! enter megaloop
!
@ -58,16 +59,17 @@ subroutine plotsomething(pic, start)
iter = iter + 1
!! print *, "ZA ITER ESCAPE", za, iter, escape
enddo
if (escape) then
pic(ix, iy)%r = mod(iter*22, 255)
pic(ix, iy)%b = mod(iter*7, 255)
pic(ix, iy) = mod(iter, 333)
else
pic(ix, iy)%g = mod(int(mod2 * 555), 200)
! pic(ix, iy)%g = mod(iter, 255)
! pic(ix, iy)%b = mod(iter*11, 255)
! esoteric computation here
! pic(ix, iy) = mod(8*floor(mod2*11.11), 24)
pic(ix, iy) = mod(iter, 222)
endif
!-------------------------------------
end do ! fin boucle sur X
end do
end
@ -77,47 +79,51 @@ end
! this is the main programm
!
program mkmandel
use pixrgb
use imagetools
implicit none
interface
subroutine plotsomething (pic, start)
use pixrgb
type(t_pixrgb), intent(inout), dimension (:,:) :: pic
complex, intent(in) :: start
subroutine plotsomething (pic, start, cz)
use imagetools
integer, intent(inout), dimension (:,:) :: pic
complex, intent(in) :: start
type (CenterMag), intent(in) :: cz
end subroutine plotsomething
end interface
type(t_pixrgb), allocatable :: pic(:,:)
integer, dimension(512, 512) :: picz
type (CenterMag) :: cm
integer :: angle
real :: radangle, radius
real :: stx, sty
character (len=80) :: filename
cm%cx = 0.0 ; cm%cy = 0.0 ; cm%mag = 3.0
picz = 0 ! clear screen
print *, "-------- making some mandelbrot -------"
allocate(pic(800, 600))
do angle = 0, 1200
call rgbpix_set_to_zero(pic)
do angle = 0, 1800
radangle = float(angle) * 0.017453292522222
radius = float(angle) / 2000.0
write (filename, "(a, i5.5, a)") "frames/mandel/", angle, ".pnm"
write (filename, "(a, i5.5, a)") "img/", angle, ".pnm"
! filename = trim(filename)
print *, "#### passe ", angle, radangle, trim(filename)
stx = radius * sin(radangle*3.9)
sty = radius * cos(radangle*3.3)
stx = radius * sin(radangle*4.0)
sty = radius * cos(radangle*3.0)
call plotsomething (picz, complex(stx, sty), cm)
call spitaspnm (picz, trim(filename))
call plotsomething (pic, complex(stx, sty))
call rgbpix_spit_as_pnm_8 (pic, trim(filename))
print *
enddo
print *, " [DONE]"
print *, "[DONE]"
end