Compare commits

..

No commits in common. "a5f2e4150278d56cfe048e58b690aef99da4b0a8" and "266c9cb5438d8df4418b91cc0880d5ac062074b8" have entirely different histories.

2 changed files with 9 additions and 14 deletions

View File

@ -12,21 +12,16 @@
#declare Chose = object #declare Chose = object
{ {
merge { merge {
difference { cone { 1.2*z, 0.91, 0.5, 1.22 }
cone { -1.2*y, 0.81, 0.2*y, 1.12 } #local C2X = 8 * sin(NormClock) * sin(NormClock*3);
sphere { 0.2*y 0.73 } #local C2Z = 5 * (sin(-NormClock) * cos(NormClock*5));
} cylinder { 1*x, <C2X, 4.5, C2Z>, 0.20+(0.2*Cos_010(NormClock)) }
#local CK = NormClock * 7.654; #local P2 = (clock/51)+1;
#for (Foo, 0, 7) cylinder { 0, P2, 0.04 }
#local C2X = 4 * sin(CK+rand(Rng1)) * sin(CK*3); sphere { P2, 0.09 }
#local C2Z = 3 * (sin(-CK+rand(Rng1)) * cos(CK*(5+rand(Rng1))));
#local R = 0.05+(0.02*Cos_010(NormClock));
cylinder { 0, <C2X, 4.5, C2Z>, R }
sphere { <C2X, 4.5, C2Z>, R }
#end
} }
texture { tPlasticOrange } texture { tPlasticOrange }
scale <0.62, 0.5, 0.65> scale <0.6, 0.5, 0.7>
rotate -y*clock rotate -y*clock
translate y*1.6666666 translate y*1.6666666
} }

View File

@ -31,7 +31,7 @@ IDX=$(( IDX + 1 ))
linkfarm () linkfarm ()
{ {
SRC="frames/$1" SRC="frames/$1"
# echo "linkfarm $SRC" | tee -a WS/log echo "linkfarm $SRC" | tee -a WS/log
local INTER="/dev/shm/tmp-intertitre.png" local INTER="/dev/shm/tmp-intertitre.png"
tools/plot-timing.sh $1 tools/plot-timing.sh $1