diff --git a/about.php b/about.php index de50c2a..f4d7782 100644 --- a/about.php +++ b/about.php @@ -81,8 +81,8 @@ */ var preloadImages = function (imgs, callback) { var img; - var remaining = 6; - for (var i = 0; i < 6; i++) { + var remaining = 26; + for (var i = 0; i < 26; i++) { img = new Image; img.onload = function () { --remaining; diff --git a/images/logo/topisto_mask.png b/images/logo/topisto_mask.png new file mode 100644 index 0000000..a1fb161 Binary files /dev/null and b/images/logo/topisto_mask.png differ diff --git a/images/logo/tr (copie)/gmic.sh b/images/logo/tr (copie)/gmic.sh new file mode 100755 index 0000000..3289282 --- /dev/null +++ b/images/logo/tr (copie)/gmic.sh @@ -0,0 +1,6 @@ +toto=$1 +gmic ../../topisto_vert_tr.png $@ -output topisto_tmp_$toto.png + +convert topisto_tmp_$toto.png -fuzz 10% -transparent white topisto_$toto.png + +rm -f topisto_tmp_$toto.png diff --git a/images/logo/tr (copie)/go.sh b/images/logo/tr (copie)/go.sh new file mode 100644 index 0000000..d30feb5 --- /dev/null +++ b/images/logo/tr (copie)/go.sh @@ -0,0 +1,32 @@ + source gmic.sh endgrave fx_engrave 0.5,4,0,7.68,15.2,0,0,1,10,1,0,0,0,1,0 gui_merge_layers + source gmic.sh bokeh fx_bokeh 3,8,0,30,8,4,0.3,0.2,210,210,80,160,0.7,30,20,20,1,2,170,130,20,110,0.15,0 + source gmic.sh 8bits fx_8bits 25,800,16,0 + source gmic.sh 8bits fx_8bits 25,800,16,0 + source gmic.sh + source gmic.sh fire_edges 0.7,0.25,0.5,25,20 + source gmic.sh fire_edges fire_edges 0.7,0.25,0.5,25,20 + source gmic.sh diffusiontensors fx_diffusiontensors 10,5,3,1,0.15,1,0,3,0 + source gmic.sh feltpen fx_feltpen 300,50,1,0.1,20,5,0 + source gmic.sh gtutor_fpaint 0.5,0.5,0,0,45,0.5,0.5,0.5,0 + source gmic.sh fx_graphic_novelfxl 0,2,6,5,20,0,0.62,14,0,1,0.5,0.78,1.92,0,0,0,1,1,1,0.5,0.8,1.28 + source gmic.sh fx_illustration_look 100,0,0,0,0 + source gmic.sh fx_lylejk_painting 10,2,4,10,0 + source gmic.sh fx_painting 5,2.5,1.5,50,1,0 + source gmic.sh fx_posterize 150,30,1,6,0,0,1,0 + source gmic.sh fx_quadtree 2,1024,1.05,0,2.33,0.68,0.39,1,0 + source gmic.sh fx_vector_painting 9.37,0 + source gmic.sh boxfitting + source gmic.sh boxfitting , + source gmic.sh cartoon 3,80,15 + source gmic.sh cubism , + source gmic.sh halftone , + source gmic.sh blur 2 light_relief 0.3,4,0.1,0 + source gmic.sh +sketchbw 1 reverse blur[-1] 3 blend[-2,-1] overlay + source gmic.sh mosaic , + source gmic.sh linify 40 + source gmic.sh polygonize 300,1%,0.1%,3%,3% + source gmic.sh poster_hope , + source gmic.sh rodilius 12,10,300,10 normalize_local 10,6 + source gmic.sh stained_glass 20%,0.1 + source gmic.sh fx_shapes 1,16,10,2,5,106.8,2,0,0,1,0 + source gmic.sh fx_shapeism 2,7,0.38,0,1,5,32,8,3,1,5,0.5,1,0,0,0,255 diff --git a/images/logo/tr/topisto_8bits.png b/images/logo/tr (copie)/topisto_8bits.png similarity index 100% rename from images/logo/tr/topisto_8bits.png rename to images/logo/tr (copie)/topisto_8bits.png diff --git a/images/logo/tr (copie)/topisto_blur.png b/images/logo/tr (copie)/topisto_blur.png new file mode 100644 index 0000000..ff20189 Binary files /dev/null and b/images/logo/tr (copie)/topisto_blur.png differ diff --git a/images/logo/tr/topisto_bokeh.png b/images/logo/tr (copie)/topisto_bokeh.png similarity index 100% rename from images/logo/tr/topisto_bokeh.png rename to images/logo/tr (copie)/topisto_bokeh.png diff --git a/images/logo/tr (copie)/topisto_boxfitting.png b/images/logo/tr (copie)/topisto_boxfitting.png new file mode 100644 index 0000000..d051941 Binary files /dev/null and b/images/logo/tr (copie)/topisto_boxfitting.png differ diff --git a/images/logo/tr (copie)/topisto_cartoon.png b/images/logo/tr (copie)/topisto_cartoon.png new file mode 100644 index 0000000..2865683 Binary files /dev/null and b/images/logo/tr (copie)/topisto_cartoon.png differ diff --git a/images/logo/tr (copie)/topisto_cubism.png b/images/logo/tr (copie)/topisto_cubism.png new file mode 100644 index 0000000..7bc1970 Binary files /dev/null and b/images/logo/tr (copie)/topisto_cubism.png differ diff --git a/images/logo/tr/topisto_diffusiontensors.png b/images/logo/tr (copie)/topisto_diffusiontensors.png similarity index 100% rename from images/logo/tr/topisto_diffusiontensors.png rename to images/logo/tr (copie)/topisto_diffusiontensors.png diff --git a/images/logo/tr/topisto_dreamsmooth.png b/images/logo/tr (copie)/topisto_dreamsmooth.png similarity index 100% rename from images/logo/tr/topisto_dreamsmooth.png rename to images/logo/tr (copie)/topisto_dreamsmooth.png diff --git a/images/logo/tr/topisto_endgrave.png b/images/logo/tr (copie)/topisto_endgrave.png similarity index 100% rename from images/logo/tr/topisto_endgrave.png rename to images/logo/tr (copie)/topisto_endgrave.png diff --git a/images/logo/tr/topisto_feltpen.png b/images/logo/tr (copie)/topisto_feltpen.png similarity index 100% rename from images/logo/tr/topisto_feltpen.png rename to images/logo/tr (copie)/topisto_feltpen.png diff --git a/images/logo/tr (copie)/topisto_fx_graphic_novelfxl.png b/images/logo/tr (copie)/topisto_fx_graphic_novelfxl.png new file mode 100644 index 0000000..5b8901d Binary files /dev/null and b/images/logo/tr (copie)/topisto_fx_graphic_novelfxl.png differ diff --git a/images/logo/tr (copie)/topisto_fx_illustration_look.png b/images/logo/tr (copie)/topisto_fx_illustration_look.png new file mode 100644 index 0000000..ab6dd14 Binary files /dev/null and b/images/logo/tr (copie)/topisto_fx_illustration_look.png differ diff --git a/images/logo/tr (copie)/topisto_fx_lylejk_painting.png b/images/logo/tr (copie)/topisto_fx_lylejk_painting.png new file mode 100644 index 0000000..44ca31d Binary files /dev/null and b/images/logo/tr (copie)/topisto_fx_lylejk_painting.png differ diff --git a/images/logo/tr (copie)/topisto_fx_painting.png b/images/logo/tr (copie)/topisto_fx_painting.png new file mode 100644 index 0000000..893c897 Binary files /dev/null and b/images/logo/tr (copie)/topisto_fx_painting.png differ diff --git a/images/logo/tr (copie)/topisto_fx_posterize.png b/images/logo/tr (copie)/topisto_fx_posterize.png new file mode 100644 index 0000000..b3cf31b Binary files /dev/null and b/images/logo/tr (copie)/topisto_fx_posterize.png differ diff --git a/images/logo/tr (copie)/topisto_fx_quadtree.png b/images/logo/tr (copie)/topisto_fx_quadtree.png new file mode 100644 index 0000000..8f8486e Binary files /dev/null and b/images/logo/tr (copie)/topisto_fx_quadtree.png differ diff --git a/images/logo/tr (copie)/topisto_fx_shapeism.png b/images/logo/tr (copie)/topisto_fx_shapeism.png new file mode 100644 index 0000000..577880e Binary files /dev/null and b/images/logo/tr (copie)/topisto_fx_shapeism.png differ diff --git a/images/logo/tr (copie)/topisto_fx_shapes.png b/images/logo/tr (copie)/topisto_fx_shapes.png new file mode 100644 index 0000000..85b2199 Binary files /dev/null and b/images/logo/tr (copie)/topisto_fx_shapes.png differ diff --git a/images/logo/tr (copie)/topisto_fx_vector_painting.png b/images/logo/tr (copie)/topisto_fx_vector_painting.png new file mode 100644 index 0000000..cda3b22 Binary files /dev/null and b/images/logo/tr (copie)/topisto_fx_vector_painting.png differ diff --git a/images/logo/tr (copie)/topisto_gtutor_fpaint.png b/images/logo/tr (copie)/topisto_gtutor_fpaint.png new file mode 100644 index 0000000..38bf196 Binary files /dev/null and b/images/logo/tr (copie)/topisto_gtutor_fpaint.png differ diff --git a/images/logo/tr (copie)/topisto_halftone.png b/images/logo/tr (copie)/topisto_halftone.png new file mode 100644 index 0000000..afdd119 Binary files /dev/null and b/images/logo/tr (copie)/topisto_halftone.png differ diff --git a/images/logo/tr (copie)/topisto_linify.png b/images/logo/tr (copie)/topisto_linify.png new file mode 100644 index 0000000..0b8dd8e Binary files /dev/null and b/images/logo/tr (copie)/topisto_linify.png differ diff --git a/images/logo/tr (copie)/topisto_mosaic.png b/images/logo/tr (copie)/topisto_mosaic.png new file mode 100644 index 0000000..30ac893 Binary files /dev/null and b/images/logo/tr (copie)/topisto_mosaic.png differ diff --git a/images/logo/tr (copie)/topisto_polygonize.png b/images/logo/tr (copie)/topisto_polygonize.png new file mode 100644 index 0000000..abd986c Binary files /dev/null and b/images/logo/tr (copie)/topisto_polygonize.png differ diff --git a/images/logo/tr (copie)/topisto_poster_hope.png b/images/logo/tr (copie)/topisto_poster_hope.png new file mode 100644 index 0000000..96aefb6 Binary files /dev/null and b/images/logo/tr (copie)/topisto_poster_hope.png differ diff --git a/images/logo/tr (copie)/topisto_rodilius.png b/images/logo/tr (copie)/topisto_rodilius.png new file mode 100644 index 0000000..2c970ac Binary files /dev/null and b/images/logo/tr (copie)/topisto_rodilius.png differ diff --git a/images/logo/tr/topisto_sketchbw.png b/images/logo/tr (copie)/topisto_sketchbw.png similarity index 100% rename from images/logo/tr/topisto_sketchbw.png rename to images/logo/tr (copie)/topisto_sketchbw.png diff --git a/images/logo/tr (copie)/topisto_stained_glass.png b/images/logo/tr (copie)/topisto_stained_glass.png new file mode 100644 index 0000000..349a7a1 Binary files /dev/null and b/images/logo/tr (copie)/topisto_stained_glass.png differ diff --git a/images/logo/tr/gmic.sh b/images/logo/tr/gmic.sh index 3289282..44e0140 100755 --- a/images/logo/tr/gmic.sh +++ b/images/logo/tr/gmic.sh @@ -1,6 +1,8 @@ toto=$1 gmic ../../topisto_vert_tr.png $@ -output topisto_tmp_$toto.png -convert topisto_tmp_$toto.png -fuzz 10% -transparent white topisto_$toto.png +convert topisto_tmp_$toto.png -fuzz 10% -transparent white topisto_tmp_2_$toto.png -rm -f topisto_tmp_$toto.png +composite -compose copy_opacity ../topisto_mask.png topisto_tmp_2_$toto.png topisto_$toto.png + +rm -f topisto_tmp_$toto.png topisto_tmp_2_$toto.png diff --git a/images/logo/tr/go.sh b/images/logo/tr/go.sh old mode 100644 new mode 100755 index d30feb5..2c81f36 --- a/images/logo/tr/go.sh +++ b/images/logo/tr/go.sh @@ -1,11 +1,8 @@ - source gmic.sh endgrave fx_engrave 0.5,4,0,7.68,15.2,0,0,1,10,1,0,0,0,1,0 gui_merge_layers - source gmic.sh bokeh fx_bokeh 3,8,0,30,8,4,0.3,0.2,210,210,80,160,0.7,30,20,20,1,2,170,130,20,110,0.15,0 - source gmic.sh 8bits fx_8bits 25,800,16,0 - source gmic.sh 8bits fx_8bits 25,800,16,0 - source gmic.sh - source gmic.sh fire_edges 0.7,0.25,0.5,25,20 - source gmic.sh fire_edges fire_edges 0.7,0.25,0.5,25,20 - source gmic.sh diffusiontensors fx_diffusiontensors 10,5,3,1,0.15,1,0,3,0 + source gmic.sh fx_engrave 0.5,4,0,7.68,15.2,0,0,1,10,1,0,0,0,1,0 gui_merge_layers + source gmic.sh fx_bokeh 3,8,0,30,8,4,0.3,0.2,210,210,80,160,0.7,30,20,20,1,2,170,130,20,110,0.15,0 + source gmic.sh fx_8bits 25,800,16,0 + #source gmic.sh fire_edges 0.7,0.25,0.5,25,20 + source gmic.sh fx_diffusiontensors 10,5,3,1,0.15,1,0,3,0 source gmic.sh feltpen fx_feltpen 300,50,1,0.1,20,5,0 source gmic.sh gtutor_fpaint 0.5,0.5,0,0,45,0.5,0.5,0.5,0 source gmic.sh fx_graphic_novelfxl 0,2,6,5,20,0,0.62,14,0,1,0.5,0.78,1.92,0,0,0,1,1,1,0.5,0.8,1.28 @@ -15,7 +12,6 @@ source gmic.sh fx_posterize 150,30,1,6,0,0,1,0 source gmic.sh fx_quadtree 2,1024,1.05,0,2.33,0.68,0.39,1,0 source gmic.sh fx_vector_painting 9.37,0 - source gmic.sh boxfitting source gmic.sh boxfitting , source gmic.sh cartoon 3,80,15 source gmic.sh cubism , diff --git a/images/logo/tr/topisto_+sketchbw.png b/images/logo/tr/topisto_+sketchbw.png new file mode 100644 index 0000000..9097530 Binary files /dev/null and b/images/logo/tr/topisto_+sketchbw.png differ diff --git a/images/logo/tr/topisto_blur.png b/images/logo/tr/topisto_blur.png index ff20189..b4ddaaa 100644 Binary files a/images/logo/tr/topisto_blur.png and b/images/logo/tr/topisto_blur.png differ diff --git a/images/logo/tr/topisto_boxfitting.png b/images/logo/tr/topisto_boxfitting.png index d051941..f65ea7e 100644 Binary files a/images/logo/tr/topisto_boxfitting.png and b/images/logo/tr/topisto_boxfitting.png differ diff --git a/images/logo/tr/topisto_cartoon.png b/images/logo/tr/topisto_cartoon.png index 2865683..53afaff 100644 Binary files a/images/logo/tr/topisto_cartoon.png and b/images/logo/tr/topisto_cartoon.png differ diff --git a/images/logo/tr/topisto_cubism.png b/images/logo/tr/topisto_cubism.png index 7bc1970..6cb4e3f 100644 Binary files a/images/logo/tr/topisto_cubism.png and b/images/logo/tr/topisto_cubism.png differ diff --git a/images/logo/tr/topisto_fx_8bits.png b/images/logo/tr/topisto_fx_8bits.png new file mode 100644 index 0000000..12f79cc Binary files /dev/null and b/images/logo/tr/topisto_fx_8bits.png differ diff --git a/images/logo/tr/topisto_fx_bokeh.png b/images/logo/tr/topisto_fx_bokeh.png new file mode 100644 index 0000000..0466d51 Binary files /dev/null and b/images/logo/tr/topisto_fx_bokeh.png differ diff --git a/images/logo/tr/topisto_fx_diffusiontensors.png b/images/logo/tr/topisto_fx_diffusiontensors.png new file mode 100644 index 0000000..41e162a Binary files /dev/null and b/images/logo/tr/topisto_fx_diffusiontensors.png differ diff --git a/images/logo/tr/topisto_fx_engrave.png b/images/logo/tr/topisto_fx_engrave.png new file mode 100644 index 0000000..672ed61 Binary files /dev/null and b/images/logo/tr/topisto_fx_engrave.png differ diff --git a/images/logo/tr/topisto_fx_graphic_novelfxl.png b/images/logo/tr/topisto_fx_graphic_novelfxl.png index 5b8901d..1487376 100644 Binary files a/images/logo/tr/topisto_fx_graphic_novelfxl.png and b/images/logo/tr/topisto_fx_graphic_novelfxl.png differ diff --git a/images/logo/tr/topisto_fx_illustration_look.png b/images/logo/tr/topisto_fx_illustration_look.png index ab6dd14..da81789 100644 Binary files a/images/logo/tr/topisto_fx_illustration_look.png and b/images/logo/tr/topisto_fx_illustration_look.png differ diff --git a/images/logo/tr/topisto_fx_lylejk_painting.png b/images/logo/tr/topisto_fx_lylejk_painting.png index 44ca31d..973c338 100644 Binary files a/images/logo/tr/topisto_fx_lylejk_painting.png and b/images/logo/tr/topisto_fx_lylejk_painting.png differ diff --git a/images/logo/tr/topisto_fx_painting.png b/images/logo/tr/topisto_fx_painting.png index 893c897..dd22d91 100644 Binary files a/images/logo/tr/topisto_fx_painting.png and b/images/logo/tr/topisto_fx_painting.png differ diff --git a/images/logo/tr/topisto_fx_posterize.png b/images/logo/tr/topisto_fx_posterize.png index b3cf31b..f061427 100644 Binary files a/images/logo/tr/topisto_fx_posterize.png and b/images/logo/tr/topisto_fx_posterize.png differ diff --git a/images/logo/tr/topisto_fx_quadtree.png b/images/logo/tr/topisto_fx_quadtree.png index 8f8486e..add7ed9 100644 Binary files a/images/logo/tr/topisto_fx_quadtree.png and b/images/logo/tr/topisto_fx_quadtree.png differ diff --git a/images/logo/tr/topisto_fx_shapeism.png b/images/logo/tr/topisto_fx_shapeism.png index 577880e..d1d8a54 100644 Binary files a/images/logo/tr/topisto_fx_shapeism.png and b/images/logo/tr/topisto_fx_shapeism.png differ diff --git a/images/logo/tr/topisto_fx_shapes.png b/images/logo/tr/topisto_fx_shapes.png index 85b2199..b521d34 100644 Binary files a/images/logo/tr/topisto_fx_shapes.png and b/images/logo/tr/topisto_fx_shapes.png differ diff --git a/images/logo/tr/topisto_fx_vector_painting.png b/images/logo/tr/topisto_fx_vector_painting.png index cda3b22..857b9fd 100644 Binary files a/images/logo/tr/topisto_fx_vector_painting.png and b/images/logo/tr/topisto_fx_vector_painting.png differ diff --git a/images/logo/tr/topisto_gtutor_fpaint.png b/images/logo/tr/topisto_gtutor_fpaint.png index 38bf196..7ce470a 100644 Binary files a/images/logo/tr/topisto_gtutor_fpaint.png and b/images/logo/tr/topisto_gtutor_fpaint.png differ diff --git a/images/logo/tr/topisto_halftone.png b/images/logo/tr/topisto_halftone.png index afdd119..ad5b5dd 100644 Binary files a/images/logo/tr/topisto_halftone.png and b/images/logo/tr/topisto_halftone.png differ diff --git a/images/logo/tr/topisto_linify.png b/images/logo/tr/topisto_linify.png index 0b8dd8e..c74b745 100644 Binary files a/images/logo/tr/topisto_linify.png and b/images/logo/tr/topisto_linify.png differ diff --git a/images/logo/tr/topisto_mosaic.png b/images/logo/tr/topisto_mosaic.png index 30ac893..1a0bf49 100644 Binary files a/images/logo/tr/topisto_mosaic.png and b/images/logo/tr/topisto_mosaic.png differ diff --git a/images/logo/tr/topisto_polygonize.png b/images/logo/tr/topisto_polygonize.png index abd986c..3fb13af 100644 Binary files a/images/logo/tr/topisto_polygonize.png and b/images/logo/tr/topisto_polygonize.png differ diff --git a/images/logo/tr/topisto_poster_hope.png b/images/logo/tr/topisto_poster_hope.png index 96aefb6..b516cde 100644 Binary files a/images/logo/tr/topisto_poster_hope.png and b/images/logo/tr/topisto_poster_hope.png differ diff --git a/images/logo/tr/topisto_rodilius.png b/images/logo/tr/topisto_rodilius.png index 2c970ac..3844a33 100644 Binary files a/images/logo/tr/topisto_rodilius.png and b/images/logo/tr/topisto_rodilius.png differ diff --git a/images/logo/tr/topisto_stained_glass.png b/images/logo/tr/topisto_stained_glass.png index 349a7a1..1e87d37 100644 Binary files a/images/logo/tr/topisto_stained_glass.png and b/images/logo/tr/topisto_stained_glass.png differ