Compare commits

..

No commits in common. "5c4287a572bc23398ff0c596682bfbd7ba043057" and "d16132de305224a94f34530bcd63abcf28636a93" have entirely different histories.

7 changed files with 72 additions and 137 deletions

View File

@ -5,8 +5,7 @@ POVDEP = contexte.inc elements.inc \
globals.inc datas/hf.png globals.inc datas/hf.png
PNG: essai.png scene.png topview.png passage.png \ PNG: essai.png scene.png topview.png passage.png
orbite.png
topview.png: topview.pov Makefile $(POVDEP) topview.png: topview.pov Makefile $(POVDEP)
@ -18,9 +17,6 @@ essai.png: essai.pov Makefile $(POVDEP)
passage.png: passage.pov Makefile $(POVDEP) passage.png: passage.pov Makefile $(POVDEP)
povray $(POVOPT) -W1280 -H1024 -K340 -i$< -o$@ povray $(POVOPT) -W1280 -H1024 -K340 -i$< -o$@
orbite.png: orbite.pov Makefile $(POVDEP)
povray $(POVOPT) -W1280 -H1024 -K340 -i$< -o$@
CK=175 CK=175
scene.png: scene.pov Makefile $(POVDEP) scene.png: scene.pov Makefile $(POVDEP)
povray $(POVOPT) -W1280 -H1024 +K${CK} -i$< -o$@ povray $(POVOPT) -W1280 -H1024 +K${CK} -i$< -o$@

View File

@ -3,6 +3,20 @@
*/ */
#declare Rng2 = seed(now*24*60*60);
#declare foo = rand(Rng2);
#declare NormClock = clock / 360.0;
/* ------------------------------------------------------------ */
#macro Cos_01( X )
(0.5-0.5*cos( 3.141592654 * X))
#end
#macro Cos_010( X )
(0.5-0.5*cos( 2 * 3.141592654 * X))
#end
/* ------------------------------------------------------------ */ /* ------------------------------------------------------------ */
#declare Rhxba = 0.30; #declare Rhxba = 0.30;
@ -22,26 +36,20 @@ merge {
} }
} }
#declare Les_Bibelots = object object { HexaBalls
{ texture { Lightning1 scale 0.33 }
union { rotate <clock/3, clock/6, clock/9>
object { HexaBalls translate <3, 0.72, 5>
texture { Lightning1 scale 0.33 }
rotate <clock/3, clock/6, clock/9>
translate <3, -1+1.11*Cos_010(NormClock), 5>
}
object { HexaBalls
texture { Lightning2 scale 0.56 }
// rotate <-clock, clock*0.62, clock>
translate <5, -1+0.92*Cos_010(NormClock), -4>
}
} }
}
object { HexaBalls
texture { Lightning2 scale 0.33 }
rotate <-clock, clock*0.62, clock>
translate <5, 0.92, -4>
}
/* ------------------------------------------------------------ */ /* ------------------------------------------------------------ */
#declare Le_Sol = object
{
height_field { height_field {
png "datas/hf.png" png "datas/hf.png"
smooth smooth
@ -53,7 +61,7 @@ height_field {
finish { phong 0.125 } finish { phong 0.125 }
} }
} }
}
#declare Repere = object #declare Repere = object
{ {
@ -63,71 +71,41 @@ union {
} }
} }
#declare Les_Lumieres = object #if (1)
{ light_source {
union { <0.3, 2.50, 2.8> color Gray90
#if (1) spotlight
light_source { radius 14
<0.3, 2.50, 2.8> color Gray90 falloff 10
spotlight tightness 10
radius 14 falloff 10 tightness 10 point_at <0, 0.95, 0.22222222>
point_at <0, 0.95, 0.22222222> }
} #end
#end
#if ( (clock>166) & (clock<213) ) #if ( (clock>166) & (clock<213) )
light_source { light_source {
<2, 0.30, -2> color Yellow <2, 0.30, -2> color Yellow
spotlight spotlight
radius 12 falloff 20 tightness 10 radius 12
point_at <-0.08, 0.80, 0.17> falloff 20
} tightness 10
#end point_at <-0.08, 0.80, 0.17>
}
#end
#if (1) #if (1)
light_source { light_source {
<-5, 5.60, 8> <-5, 5.60, 8>
#if ( (clock > 290) & (clock<344) ) #if ( (clock > 290) & (clock<344) )
#local Couleur = rgb <0.20, 0.20, 0.90>; #local Couleur = rgb <0.20, 0.20, 0.90>;
#else #else
#local Couleur = rgb <0.80, 0.80, 0.70>; #local Couleur = rgb <0.80, 0.80, 0.70>;
#end #end
color Couleur color Couleur
spotlight spotlight
radius 9 falloff 10 tightness 5 radius 9
falloff 10
tightness 5
point_at <0, 0.95, -0.22> point_at <0, 0.95, -0.22>
}
#end
} }
} #end
// #declare Le_Ciel = object
// {
sky_sphere {
pigment {
gradient y
color_map {
[ 0.5 color Orange*0.7 ]
[ 1.0 color Yellow*0.5 ]
}
turbulence 2.87 + Cos_010(NormClock)
scale 0.207
translate -1
}
emission rgb <0.1, 0.1, 0.1>
}
// }
/* ------------------------------------------------------------ */
/*
* Et on rassemble tous les éléments...
*/
#declare Le_Decor = object
{
union {
object { Le_Sol }
object { Les_Bibelots }
object { Les_Lumieres }
}
}
/* ------------------------------------------------------------ */

View File

@ -38,15 +38,9 @@ union {
#local xR = (rand(Rng2)-0.5000) * kR; #local xR = (rand(Rng2)-0.5000) * kR;
#local yR = (rand(Rng2)-0.5000) * kR; #local yR = (rand(Rng2)-0.5000) * kR;
#local zR = (rand(Rng2)-0.5000) * kR; #local zR = (rand(Rng2)-0.5000) * kR;
#local Value = sin(NormClock * 25.536); #local Red = abs(sin(NormClock * 35.536));
#if (Value < 0) #local Red = Red * rand(Rng2);
#local Couleur = rgb <abs(Value), 0, 0>; light_source { <xR, yR, xR>, rgb <Red, 0.03, 0.03>
#else
#local Couleur = rgb <0, abs(Value), 0>;
#end
#local Couleur = Couleur * rand(Rng2);
light_source {
<xR, yR, xR>, Couleur
fade_distance 0.99 fade_distance 0.99
fade_power 1.58 fade_power 1.58
} }

View File

@ -2,13 +2,7 @@
set -e ; set -u set -e ; set -u
if [ $# == 1 ]
then
srcdir=$1
else
srcdir="essai"
fi
source ./fonctions.sh source ./fonctions.sh
ff_encodage $srcdir wip.mp4 ff_encodage passage wip.mp4

View File

@ -4,19 +4,3 @@ global_settings {
ambient_light rgb <0.18, 0.14, 0.17> ambient_light rgb <0.18, 0.14, 0.17>
max_trace_level 15 max_trace_level 15
} }
#declare Rng2 = seed(now*24*60*60);
#declare foo = rand(Rng2);
#declare NormClock = clock / 360.0;
/* ------------------------------------------------------------ */
#macro Cos_01( X )
(0.5-0.5*cos( 3.141592654 * X))
#end
#macro Cos_010( X )
(0.5-0.5*cos( 2 * 3.141592654 * X))
#end
/* ------------------------------------------------------------ */

View File

@ -52,21 +52,11 @@ do
done done
} }
# ------------------------------------------------------- # -------------------------------------------------------
faire_la_fin ()
{
local NBRE=80
for foo in $(seq 0 $NBRE)
do
addfile "datas/back.png"
done
}
# -------------------------------------------------------
faire_le_titre faire_le_titre
ralentisseur 10 ralentisseur 10
linkfarm orbite
linkfarm topview linkfarm topview
linkfarm passage linkfarm passage
linkfarm scene linkfarm scene

View File

@ -12,13 +12,12 @@ BEGIN { \
mini[foo] = 666; \ mini[foo] = 666; \
maxi[foo] = -42; \ maxi[foo] = -42; \
} \ } \
} } \
\ { \
$1=="orbite" { \ accu[$1] += $2; \
accu[$2] += $3; \ count[$1]++; \
count[$2]++; \ if (mini[$1] > $2) mini[$1] = $2; \
if (mini[$2] > $3) mini[$2] = $3; \ if (maxi[$1] < $2) maxi[$1] = $2; \
if (maxi[$2] < $3) maxi[$2] = $3; \
} \ } \
END { \ END { \
for (foo=0; foo<nbrames; foo++) { \ for (foo=0; foo<nbrames; foo++) { \
@ -36,7 +35,7 @@ gnuplot << __EOC__
set output "timing.png" set output "timing.png"
set grid set grid
set xrange [:360] set xrange [:360]
set yrange [:30] set yrange [:240]
set title "HexaCone : temps de tracé vs. numéro de séquence" set title "HexaCone : temps de tracé vs. numéro de séquence"
set xlabel "numéro de la trame" set xlabel "numéro de la trame"
set ylabel "temps en secondes" set ylabel "temps en secondes"