yogsototh/mandelbrot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:yogsototh/mandelbrot

Browse source 
Conflicts:
	run
This commit is contained in:
Yann Esposito (Yogsototh) 2013-03-06 21:17:44 +01:00
commit 1944a7caef
4 changed files with 42 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
.gitignore vendored
View file

@ -1,3 +1,8 @@
mandelbrot.hi
mandelbrot.o
*.hi
*.o
*.swp
~*
mandelbrot
stillimages
*.mp4
*.gif

3
README.md
View file

@ -14,3 +14,6 @@ But it remains a nice example.
Here is the result:
<img src="https://github.com/yogsototh/mandelbrot/raw/master/mandelbrot.png" alt="Mandelbrot Set" width="100%" />
And a video made with `avconv` (`ffmpeg`); see the `run` script: [https://vimeo.com/61190538](https://vimeo.com/61190538).

36
mandelbrot.hs
View file

@ -35,6 +35,24 @@ data Global = Global {
, filename :: String
} deriving (Show,Read)
data Color = Color { red :: {-# UNPACK #-} !Word8
, green :: {-# UNPACK #-} !Word8
, blue :: {-# UNPACK #-} !Word8 }
doubleToColor :: Double -> Color
doubleToColor x = Color {
red = redFromDouble x
, green = greenFromDouble x
, blue = blueFromDouble x }
where
light=[253,246,227]
dark=[0,43,54]
redFromDouble :: Double -> Word8
redFromDouble p = round $! (light!!0)*(1-p) + p*(dark!!0)
greenFromDouble :: Double -> Word8
greenFromDouble p = round $! (light!!1)*(1-p) + p*(dark!!1)
blueFromDouble :: Double -> Word8
blueFromDouble p = round $! (light!!2)*(1-p) + p*(dark!!2)
intToDouble :: Int -> Double
intToDouble = fromInteger . toInteger
@ -75,7 +93,7 @@ mandel env (Z :. i :. j ) = (intToDouble (m `rem` 512) :: Double) / (intToDouble
where x = indexToDouble j (imgWidth env) (xpos env) (width env)
y = indexToDouble i (imgHeight env) (ypos env) (height env)
n = f (C x y) (C 0 0) (nbsteps env)
m | n == 0 = div ((nbsteps env) * 90) 100
m | n == 0 = nbsteps env
| otherwise = n
@ -85,19 +103,11 @@ toImage arr = D.RGBA $
R.traverse arr8 (:. 4) chans
where
arr8 = R.map (floor . (*255) . min 1 . max 0) arr
chans a (Z :. x :. y :. 0) = redFromDouble $ a (Z :. x :. y)
chans a (Z :. x :. y :. 1) = greenFromDouble $ a (Z :. x :. y)
chans a (Z :. x :. y :. 2) = blueFromDouble $ a (Z :. x :. y)
chans a (Z :. x :. y :. 0) = red $ w8ToColor $ a (Z :. x :. y)
chans a (Z :. x :. y :. 1) = green $ w8ToColor $ a (Z :. x :. y)
chans a (Z :. x :. y :. 2) = blue $ w8ToColor $ a (Z :. x :. y)
chans _ (Z :. _ :. _ :. 3) = 255
light=[253,246,227]
dark=[0,43,54]
redFromDouble :: Word8 -> Word8
redFromDouble x = round $! (light!!0)*(1-p) + p*(dark!!0)
where p = (fromIntegral x) / 255
greenFromDouble x = round $! (light!!1)*(1-p) + p*(dark!!1)
where p = (fromIntegral x) / 255
blueFromDouble x = round $! (light!!2)*(1-p) + p*(dark!!2)
where p = (fromIntegral x) / 255
w8ToColor n = doubleToColor $ (fromIntegral n) / 255
force = runIdentity . R.computeP

15
run
View file

@ -21,21 +21,24 @@ old=( $dir/*(.N) )
liste=()
i=1
width=4.0
while ((width>0.00005)); do
fic=$(printf "$dir/m-%03d.png" $i)
imgheight=500
imgwidth=$((imgheight*16/10))
while ((width>0.000005)); do
fic=$(printf "$dir/m-%04d.png" $i)
\rm -f $fic
PREPARAMS="1024 720 260 -1.2535555 0.3845245 $width $fic"
PREPARAMS="$imgwidth $imgheight 1000 -1.2535555 0.3845245 $width $fic"
print ./mandelbrot $PREPARAMS
eval ./mandelbrot $PREPARAMS
(($?>0)) && exit 0
liste=( $liste $fic )
(( width /= 1.07 ))
(( width *= 0.97 ))
((i++))
done
cmd=avconv
which $cmd >/dev/null || cmd=ffmpeg
framerate=24
quality=8
\rm -f animandel.mpeg && \
$cmd -f image2 -i $dir/m-%03d.png -r 30 animandel.mp4
$cmd -f image2 -i "$dir/m-%04d.png" -r $framerate -qscale $quality -s ${imgwidth}x${imgheight} animandel.mp4
# convert -delay 10 -loop 0 $liste animandel.gif