mirror of
https://github.com/reanimate/reanimate.git
synced 2026-09-14 09:32:22 +00:00
Deploying to gh-pages from @ 217c54ab38 🚀
This commit is contained in:
Lemmih
parent
d7ec80e9b5
commit
bd223bb125
10 changed files with 313 additions and 313 deletions
|
|
@ -1,4 +1,5 @@
|
|||
100% (154 /154) in 'Reanimate'
|
||||
100% (128 /128) in 'Reanimate.Scene'
|
||||
100% ( 55 / 55) in 'Reanimate.Svg.Constructors'
|
||||
100% ( 41 / 41) in 'Reanimate.Animation'
|
||||
100% ( 40 / 40) in 'Reanimate.GeoProjection'
|
||||
|
|
@ -36,4 +37,3 @@
|
|||
100% ( 3 / 3) in 'Reanimate.Math.Balloon'
|
||||
100% ( 3 / 3) in 'Reanimate.Blender'
|
||||
100% ( 2 / 2) in 'Reanimate.Builtin.CirclePlot'
|
||||
89% (114 /128) in 'Reanimate.Scene'
|
||||
|
|
|
|||
|
|
@ -107,7 +107,7 @@ table.dashboard { border-collapse: collapse ; border: solid 1px black }
|
|||
<td align="right">85%</td><td>23/27</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="85%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">57%</td><td>11/19</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="57%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">78%</td><td>314/400</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="78%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td></tr>
|
||||
<tr>
|
||||
<td> <tt>module <a href="reanimate-0.5.0.1-inplace/Reanimate.Scene.Var.hs.html">reanimate-0.5.0.1-inplace/Reanimate.Scene.Var</a></tt></td>
|
||||
<td align="right">89%</td><td>17/19</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="89%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">60%</td><td>14/23</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="60%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">68%</td><td>220/319</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="68%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td></tr>
|
||||
<td align="right">89%</td><td>17/19</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="89%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">60%</td><td>14/23</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="60%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">68%</td><td>214/313</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="68%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td></tr>
|
||||
<tr>
|
||||
<td> <tt>module <a href="reanimate-0.5.0.1-inplace/Reanimate.Svg.hs.html">reanimate-0.5.0.1-inplace/Reanimate.Svg</a></tt></td>
|
||||
<td align="right">38%</td><td>5/13</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="38%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">18%</td><td>15/80</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="18%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">41%</td><td>323/777</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="41%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td></tr>
|
||||
|
|
@ -131,5 +131,5 @@ table.dashboard { border-collapse: collapse ; border: solid 1px black }
|
|||
<td align="right">100%</td><td>6/6</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="100%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">50%</td><td>1/2</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="50%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">95%</td><td>43/45</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="95%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td></tr>
|
||||
<tr></tr><tr style="background: #e0e0e0">
|
||||
<th align=left> Program Coverage Total</tt></th>
|
||||
<td align="right">35%</td><td>261/739</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="35%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">17%</td><td>144/846</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="17%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">32%</td><td>4843/14992</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="32%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td></tr>
|
||||
<td align="right">35%</td><td>261/739</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="35%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">17%</td><td>144/846</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="17%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">32%</td><td>4837/14986</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="32%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td></tr>
|
||||
</table></body></html>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ table.dashboard { border-collapse: collapse ; border: solid 1px black }
|
|||
<td align="right">100%</td><td>14/14</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="100%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">60%</td><td>3/5</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="60%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">99%</td><td>1176/1180</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="99%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td></tr>
|
||||
<tr>
|
||||
<td> <tt>module <a href="reanimate-0.5.0.1-inplace/Reanimate.Scene.Var.hs.html">reanimate-0.5.0.1-inplace/Reanimate.Scene.Var</a></tt></td>
|
||||
<td align="right">89%</td><td>17/19</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="89%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">60%</td><td>14/23</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="60%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">68%</td><td>220/319</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="68%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td></tr>
|
||||
<td align="right">89%</td><td>17/19</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="89%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">60%</td><td>14/23</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="60%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">68%</td><td>214/313</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="68%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td></tr>
|
||||
<tr>
|
||||
<td> <tt>module <a href="reanimate-0.5.0.1-inplace/Reanimate.Svg.LineCommand.hs.html">reanimate-0.5.0.1-inplace/Reanimate.Svg.LineCommand</a></tt></td>
|
||||
<td align="right">80%</td><td>12/15</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="80%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">58%</td><td>43/74</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="58%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">70%</td><td>659/937</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="70%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td></tr>
|
||||
|
|
@ -131,5 +131,5 @@ table.dashboard { border-collapse: collapse ; border: solid 1px black }
|
|||
<td align="right">66%</td><td>12/18</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="66%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">- </td><td>0/0</td><td width=100> </td><td align="right">72%</td><td>172/236</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="72%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td></tr>
|
||||
<tr></tr><tr style="background: #e0e0e0">
|
||||
<th align=left> Program Coverage Total</tt></th>
|
||||
<td align="right">35%</td><td>261/739</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="35%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">17%</td><td>144/846</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="17%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">32%</td><td>4843/14992</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="32%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td></tr>
|
||||
<td align="right">35%</td><td>261/739</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="35%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">17%</td><td>144/846</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="17%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">32%</td><td>4837/14986</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="32%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td></tr>
|
||||
</table></body></html>
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ table.dashboard { border-collapse: collapse ; border: solid 1px black }
|
|||
<td align="right">80%</td><td>12/15</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="80%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">58%</td><td>43/74</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="58%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">70%</td><td>659/937</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="70%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td></tr>
|
||||
<tr>
|
||||
<td> <tt>module <a href="reanimate-0.5.0.1-inplace/Reanimate.Scene.Var.hs.html">reanimate-0.5.0.1-inplace/Reanimate.Scene.Var</a></tt></td>
|
||||
<td align="right">89%</td><td>17/19</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="89%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">60%</td><td>14/23</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="60%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">68%</td><td>220/319</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="68%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td></tr>
|
||||
<td align="right">89%</td><td>17/19</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="89%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">60%</td><td>14/23</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="60%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">68%</td><td>214/313</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="68%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td></tr>
|
||||
<tr>
|
||||
<td> <tt>module <a href="reanimate-0.5.0.1-inplace/Reanimate.Svg.Constructors.hs.html">reanimate-0.5.0.1-inplace/Reanimate.Svg.Constructors</a></tt></td>
|
||||
<td align="right">67%</td><td>33/49</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="67%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">37%</td><td>3/8</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="37%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">65%</td><td>368/563</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="65%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td></tr>
|
||||
|
|
@ -131,5 +131,5 @@ table.dashboard { border-collapse: collapse ; border: solid 1px black }
|
|||
<td align="right">0%</td><td>0/1</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="100%"><tr><td height=12 class="invbar"></td></tr></table></td></tr></table></td><td align="right">0%</td><td>0/4</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="100%"><tr><td height=12 class="invbar"></td></tr></table></td></tr></table></td><td align="right">0%</td><td>0/61</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="100%"><tr><td height=12 class="invbar"></td></tr></table></td></tr></table></td></tr>
|
||||
<tr></tr><tr style="background: #e0e0e0">
|
||||
<th align=left> Program Coverage Total</tt></th>
|
||||
<td align="right">35%</td><td>261/739</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="35%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">17%</td><td>144/846</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="17%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">32%</td><td>4843/14992</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="32%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td></tr>
|
||||
<td align="right">35%</td><td>261/739</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="35%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">17%</td><td>144/846</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="17%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">32%</td><td>4837/14986</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="32%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td></tr>
|
||||
</table></body></html>
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ table.dashboard { border-collapse: collapse ; border: solid 1px black }
|
|||
<td align="right">90%</td><td>28/31</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="90%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">57%</td><td>8/14</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="57%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">87%</td><td>298/341</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="87%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td></tr>
|
||||
<tr>
|
||||
<td> <tt>module <a href="reanimate-0.5.0.1-inplace/Reanimate.Scene.Var.hs.html">reanimate-0.5.0.1-inplace/Reanimate.Scene.Var</a></tt></td>
|
||||
<td align="right">89%</td><td>17/19</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="89%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">60%</td><td>14/23</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="60%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">68%</td><td>220/319</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="68%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td></tr>
|
||||
<td align="right">89%</td><td>17/19</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="89%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">60%</td><td>14/23</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="60%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">68%</td><td>214/313</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="68%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td></tr>
|
||||
<tr>
|
||||
<td> <tt>module <a href="reanimate-0.5.0.1-inplace/Reanimate.Ease.hs.html">reanimate-0.5.0.1-inplace/Reanimate.Ease</a></tt></td>
|
||||
<td align="right">87%</td><td>7/8</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="87%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">100%</td><td>4/4</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="100%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">96%</td><td>85/88</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="96%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td></tr>
|
||||
|
|
@ -131,5 +131,5 @@ table.dashboard { border-collapse: collapse ; border: solid 1px black }
|
|||
<td align="right">0%</td><td>0/1</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="100%"><tr><td height=12 class="invbar"></td></tr></table></td></tr></table></td><td align="right">0%</td><td>0/4</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="100%"><tr><td height=12 class="invbar"></td></tr></table></td></tr></table></td><td align="right">0%</td><td>0/61</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="100%"><tr><td height=12 class="invbar"></td></tr></table></td></tr></table></td></tr>
|
||||
<tr></tr><tr style="background: #e0e0e0">
|
||||
<th align=left> Program Coverage Total</tt></th>
|
||||
<td align="right">35%</td><td>261/739</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="35%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">17%</td><td>144/846</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="17%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">32%</td><td>4843/14992</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="32%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td></tr>
|
||||
<td align="right">35%</td><td>261/739</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="35%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">17%</td><td>144/846</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="17%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">32%</td><td>4837/14986</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="32%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td></tr>
|
||||
</table></body></html>
|
||||
|
|
|
|||
|
|
@ -9,4 +9,4 @@ const snippets = [{"title": "Hello World","url": "https://reanimate.clozecards.c
|
|||
,{"title": "Object Positions","url": "https://reanimate.clozecards.com/LRZe4V6frOI/195.svg","code": "env =\n addStatic (mkBackground \"white\") .\n mapA (withStrokeColor \"black\")\n\nanimation :: Animation\nanimation = env $\n scene $ do\n -- Configure objects\n txt <- newText \"Center\"\n top <- newText \"Top\"\n oModifyS top $ \n oTopY .= screenTop\n topR <- newText \"Top right\"\n oModifyS topR $ do\n oTopY .= screenTop\n oRightX .= screenRight\n botR <- newText \"Bottom right\"\n oModifyS botR $ do\n oTranslateY .= screenBottom+0.5\n oRightX .= screenRight\n botL <- newText \"Bottom left\"\n oModifyS botL $ do\n oTranslateY .= screenBottom+0.5\n oLeftX .= screenLeft\n topL <- newText \"Top left\"\n oModifyS topL $ do\n oTopY .= screenTop\n oLeftX .= screenLeft\n -- Show objects\n oShow txt\n wait 1\n switchTo txt top\n switchTo top topR\n switchTo topR botR\n switchTo botR botL\n switchTo botL topL\n switchTo topL txt\n\nswitchTo src dst = do\n fork $ oHideWith src oFadeOut\n oShowWith dst oFadeIn\n wait 1\n\nnewText txt =\n newObject $ scale 1.5 $ centerX $ latex txt\n"}
|
||||
,{"title": "Camera","url": "https://reanimate.clozecards.com/JlWlOpJvDds/150.svg","code": "animation :: Animation\nanimation = docEnv $ mapA (withFillOpacity 1) $ scene $ do\n cam <- newObject Camera\n\n txt <- newObject $ center $ latex \"Fixed (non-cam)\"\n oModifyS txt $ do\n oTopY .= screenTop \n oZIndex .= 2\n\n circle <- newObject $ withFillColor \"blue\" $ mkCircle 1\n cameraAttach cam circle\n circleRight <- oRead circle oRightX\n\n box <- newObject $ withFillColor \"green\" $ mkRect 2 2\n cameraAttach cam box\n oModify box $ oLeftX .~ circleRight\n boxCenter <- oRead box oCenterXY\n\n small <- newObject $ center $ latex \"This text is very small\"\n cameraAttach cam small\n oModifyS small $ do\n oCenterXY .= boxCenter\n oScale .= 0.1\n \n oShow txt\n oShow small\n oShow circle\n oShow box\n\n wait 1\n\n cameraFocus cam boxCenter\n waitOn $ do\n fork $ cameraPan cam 3 boxCenter\n fork $ cameraZoom cam 3 15\n \n wait 2\n cameraZoom cam 3 1\n cameraPan cam 1 (V2 0 0)\n"}
|
||||
];
|
||||
const playgroundVersion = "2020-09-19 (d37e7)";
|
||||
const playgroundVersion = "2020-09-19 (217c5)";
|
||||
|
|
|
|||
|
|
@ -87,7 +87,7 @@ span.spaces { background: white }
|
|||
<span class="lineno"> 68 </span><span class="spaces"> </span><span class="nottickedoff">now = (duration ani / (fromIntegral frameCount - 1)) * fromIntegral nth</span>
|
||||
<span class="lineno"> 69 </span><span class="spaces"> </span><span class="nottickedoff">frame = frameAt (if frameCount <= 1 then 0 else now) ani</span>
|
||||
<span class="lineno"> 70 </span><span class="spaces"> </span><span class="nottickedoff">path = folder </> show nth <.> "svg"</span>
|
||||
<span class="lineno"> 71 </span><span class="spaces"> </span><span class="nottickedoff">~svg = renderSvg Nothing Nothing frame</span>
|
||||
<span class="lineno"> 71 </span><span class="spaces"> </span><span class="nottickedoff">svg = renderSvg Nothing Nothing frame</span>
|
||||
<span class="lineno"> 72 </span><span class="spaces"></span><span class="nottickedoff"></span>
|
||||
<span class="lineno"> 73 </span><span class="spaces"> </span><span class="nottickedoff">idempotentFile path $</span>
|
||||
<span class="lineno"> 74 </span><span class="spaces"> </span><span class="nottickedoff">writeFile path svg</span>
|
||||
|
|
|
|||
|
|
@ -62,120 +62,121 @@ span.spaces { background: white }
|
|||
<span class="lineno"> 43 </span>instance MonadFix (Scene s) where
|
||||
<span class="lineno"> 44 </span> <span class="decl"><span class="nottickedoff">mfix fn = M $ \t -> mfix (\v -> let (a, _s, _p, _gens) = v in unM (fn a) t)</span></span>
|
||||
<span class="lineno"> 45 </span>
|
||||
<span class="lineno"> 46 </span>liftST :: ST s a -> Scene s a
|
||||
<span class="lineno"> 47 </span><span class="decl"><span class="istickedoff">liftST action = M $ \_ -> action >>= \a -> return (a, 0, 0, [])</span></span>
|
||||
<span class="lineno"> 48 </span>
|
||||
<span class="lineno"> 49 </span>-- | Evaluate the value of a scene.
|
||||
<span class="lineno"> 50 </span>evalScene :: (forall s. Scene s a) -> a
|
||||
<span class="lineno"> 51 </span><span class="decl"><span class="nottickedoff">evalScene action = runST $ do</span>
|
||||
<span class="lineno"> 52 </span><span class="spaces"> </span><span class="nottickedoff">(val, _, _, _) <- unM action 0</span>
|
||||
<span class="lineno"> 53 </span><span class="spaces"> </span><span class="nottickedoff">return val</span></span>
|
||||
<span class="lineno"> 54 </span>
|
||||
<span class="lineno"> 55 </span>-- | Render a 'Scene' to an 'Animation'.
|
||||
<span class="lineno"> 56 </span>scene :: (forall s. Scene s a) -> Animation
|
||||
<span class="lineno"> 57 </span><span class="decl"><span class="istickedoff">scene action =</span>
|
||||
<span class="lineno"> 58 </span><span class="spaces"> </span><span class="istickedoff">runST</span>
|
||||
<span class="lineno"> 59 </span><span class="spaces"> </span><span class="istickedoff">( do</span>
|
||||
<span class="lineno"> 60 </span><span class="spaces"> </span><span class="istickedoff">(_, s, p, gens) <- unM action 0</span>
|
||||
<span class="lineno"> 61 </span><span class="spaces"> </span><span class="istickedoff">let dur = max s p</span>
|
||||
<span class="lineno"> 62 </span><span class="spaces"> </span><span class="istickedoff">genFns <- sequence gens</span>
|
||||
<span class="lineno"> 63 </span><span class="spaces"> </span><span class="istickedoff">return $</span>
|
||||
<span class="lineno"> 64 </span><span class="spaces"> </span><span class="istickedoff">mkAnimation</span>
|
||||
<span class="lineno"> 65 </span><span class="spaces"> </span><span class="istickedoff">dur</span>
|
||||
<span class="lineno"> 66 </span><span class="spaces"> </span><span class="istickedoff">( \t -></span>
|
||||
<span class="lineno"> 67 </span><span class="spaces"> </span><span class="istickedoff">mkGroup $</span>
|
||||
<span class="lineno"> 68 </span><span class="spaces"> </span><span class="istickedoff">map fst $</span>
|
||||
<span class="lineno"> 69 </span><span class="spaces"> </span><span class="istickedoff">sortOn</span>
|
||||
<span class="lineno"> 70 </span><span class="spaces"> </span><span class="istickedoff">snd</span>
|
||||
<span class="lineno"> 71 </span><span class="spaces"> </span><span class="istickedoff">[spriteRender dur (t * dur) | spriteRender <- genFns]</span>
|
||||
<span class="lineno"> 72 </span><span class="spaces"> </span><span class="istickedoff">)</span>
|
||||
<span class="lineno"> 73 </span><span class="spaces"> </span><span class="istickedoff">)</span></span>
|
||||
<span class="lineno"> 74 </span>
|
||||
<span class="lineno"> 75 </span>-- | Execute actions in a scene without advancing the clock. Note that scenes do not end before
|
||||
<span class="lineno"> 76 </span>-- all forked actions have completed.
|
||||
<span class="lineno"> 77 </span>--
|
||||
<span class="lineno"> 78 </span>-- Example:
|
||||
<span class="lineno"> 79 </span>--
|
||||
<span class="lineno"> 80 </span>-- @
|
||||
<span class="lineno"> 81 </span>-- do 'fork' $ 'play' 'Reanimate.Builtin.Documentation.drawBox'
|
||||
<span class="lineno"> 82 </span>-- 'play' 'Reanimate.Builtin.Documentation.drawCircle'
|
||||
<span class="lineno"> 83 </span>-- @
|
||||
<span class="lineno"> 84 </span>--
|
||||
<span class="lineno"> 85 </span>-- <<docs/gifs/doc_fork.gif>>
|
||||
<span class="lineno"> 86 </span>fork :: Scene s a -> Scene s a
|
||||
<span class="lineno"> 87 </span><span class="decl"><span class="istickedoff">fork (M action) = M $ \t -> do</span>
|
||||
<span class="lineno"> 88 </span><span class="spaces"> </span><span class="istickedoff">(a, s, p, gens) <- action t</span>
|
||||
<span class="lineno"> 89 </span><span class="spaces"> </span><span class="istickedoff">return (a, 0, max s p, gens)</span></span>
|
||||
<span class="lineno"> 90 </span>
|
||||
<span class="lineno"> 91 </span>-- | Query the current clock timestamp.
|
||||
<span class="lineno"> 92 </span>--
|
||||
<span class="lineno"> 93 </span>-- Example:
|
||||
<span class="lineno"> 94 </span>--
|
||||
<span class="lineno"> 95 </span>-- @
|
||||
<span class="lineno"> 96 </span>-- do now \<- 'play' 'Reanimate.Builtin.Documentation.drawCircle' *\> 'queryNow'
|
||||
<span class="lineno"> 97 </span>-- 'play' $ 'staticFrame' 1 $ 'scale' 2 $ 'withStrokeWidth' 0.05 $
|
||||
<span class="lineno"> 98 </span>-- 'mkText' $ "Now=" <> T.pack (show now)
|
||||
<span class="lineno"> 99 </span>-- @
|
||||
<span class="lineno"> 100 </span>--
|
||||
<span class="lineno"> 101 </span>-- <<docs/gifs/doc_queryNow.gif>>
|
||||
<span class="lineno"> 102 </span>queryNow :: Scene s Time
|
||||
<span class="lineno"> 103 </span><span class="decl"><span class="istickedoff">queryNow = M $ \t -> return (t, 0, 0, [])</span></span>
|
||||
<span class="lineno"> 104 </span>
|
||||
<span class="lineno"> 105 </span>-- | Advance the clock by a given number of seconds.
|
||||
<span class="lineno"> 106 </span>--
|
||||
<span class="lineno"> 107 </span>-- Example:
|
||||
<span class="lineno"> 108 </span>--
|
||||
<span class="lineno"> 109 </span>-- @
|
||||
<span class="lineno"> 110 </span>-- do 'fork' $ 'play' 'Reanimate.Builtin.Documentation.drawBox'
|
||||
<span class="lineno"> 111 </span>-- 'wait' 1
|
||||
<span class="lineno"> 112 </span>-- 'play' 'Reanimate.Builtin.Documentation.drawCircle'
|
||||
<span class="lineno"> 113 </span>-- @
|
||||
<span class="lineno"> 114 </span>--
|
||||
<span class="lineno"> 115 </span>-- <<docs/gifs/doc_wait.gif>>
|
||||
<span class="lineno"> 116 </span>wait :: Duration -> Scene s ()
|
||||
<span class="lineno"> 117 </span><span class="decl"><span class="istickedoff">wait d = M $ \_ -> return (<span class="nottickedoff">()</span>, d, 0, [])</span></span>
|
||||
<span class="lineno"> 118 </span>
|
||||
<span class="lineno"> 119 </span>-- | Wait until the clock is equal to the given timestamp.
|
||||
<span class="lineno"> 120 </span>waitUntil :: Time -> Scene s ()
|
||||
<span class="lineno"> 121 </span><span class="decl"><span class="nottickedoff">waitUntil tNew = do</span>
|
||||
<span class="lineno"> 122 </span><span class="spaces"> </span><span class="nottickedoff">now <- queryNow</span>
|
||||
<span class="lineno"> 123 </span><span class="spaces"> </span><span class="nottickedoff">wait (max 0 (tNew - now))</span></span>
|
||||
<span class="lineno"> 124 </span>
|
||||
<span class="lineno"> 125 </span>-- | Wait until all forked and sequential animations have finished.
|
||||
<span class="lineno"> 126 </span>--
|
||||
<span class="lineno"> 127 </span>-- Example:
|
||||
<span class="lineno"> 128 </span>--
|
||||
<span class="lineno"> 129 </span>-- @
|
||||
<span class="lineno"> 130 </span>-- do 'waitOn' $ 'fork' $ 'play' 'Reanimate.Builtin.Documentation.drawBox'
|
||||
<span class="lineno"> 131 </span>-- 'play' 'Reanimate.Builtin.Documentation.drawCircle'
|
||||
<span class="lineno"> 132 </span>-- @
|
||||
<span class="lineno"> 133 </span>--
|
||||
<span class="lineno"> 134 </span>-- <<docs/gifs/doc_waitOn.gif>>
|
||||
<span class="lineno"> 135 </span>waitOn :: Scene s a -> Scene s a
|
||||
<span class="lineno"> 136 </span><span class="decl"><span class="istickedoff">waitOn (M action) = M $ \t -> do</span>
|
||||
<span class="lineno"> 137 </span><span class="spaces"> </span><span class="istickedoff">(a, s, p, gens) <- action t</span>
|
||||
<span class="lineno"> 138 </span><span class="spaces"> </span><span class="istickedoff">return (<span class="nottickedoff">a</span>, max s p, 0, gens)</span></span>
|
||||
<span class="lineno"> 139 </span>
|
||||
<span class="lineno"> 140 </span>-- | Change the ZIndex of a scene.
|
||||
<span class="lineno"> 141 </span>adjustZ :: (ZIndex -> ZIndex) -> Scene s a -> Scene s a
|
||||
<span class="lineno"> 142 </span><span class="decl"><span class="nottickedoff">adjustZ fn (M action) = M $ \t -> do</span>
|
||||
<span class="lineno"> 143 </span><span class="spaces"> </span><span class="nottickedoff">(a, s, p, gens) <- action t</span>
|
||||
<span class="lineno"> 144 </span><span class="spaces"> </span><span class="nottickedoff">return (a, s, p, map genFn gens)</span>
|
||||
<span class="lineno"> 145 </span><span class="spaces"> </span><span class="nottickedoff">where</span>
|
||||
<span class="lineno"> 146 </span><span class="spaces"> </span><span class="nottickedoff">genFn gen = do</span>
|
||||
<span class="lineno"> 147 </span><span class="spaces"> </span><span class="nottickedoff">frameGen <- gen</span>
|
||||
<span class="lineno"> 148 </span><span class="spaces"> </span><span class="nottickedoff">return $ \d t -> let (svg, z) = frameGen d t in (svg, fn z)</span></span>
|
||||
<span class="lineno"> 149 </span>
|
||||
<span class="lineno"> 150 </span>-- | Query the duration of a scene.
|
||||
<span class="lineno"> 151 </span>withSceneDuration :: Scene s () -> Scene s Duration
|
||||
<span class="lineno"> 152 </span><span class="decl"><span class="nottickedoff">withSceneDuration s = do</span>
|
||||
<span class="lineno"> 153 </span><span class="spaces"> </span><span class="nottickedoff">t1 <- queryNow</span>
|
||||
<span class="lineno"> 154 </span><span class="spaces"> </span><span class="nottickedoff">s</span>
|
||||
<span class="lineno"> 155 </span><span class="spaces"> </span><span class="nottickedoff">t2 <- queryNow</span>
|
||||
<span class="lineno"> 156 </span><span class="spaces"> </span><span class="nottickedoff">return (t2 - t1)</span></span>
|
||||
<span class="lineno"> 157 </span>
|
||||
<span class="lineno"> 158 </span>addGen :: Gen s -> Scene s ()
|
||||
<span class="lineno"> 159 </span><span class="decl"><span class="istickedoff">addGen gen = M $ \_ -> return (<span class="nottickedoff">()</span>, 0, 0, [gen])</span></span>
|
||||
<span class="lineno"> 46 </span>-- | Lift ST action into the Scene monad.
|
||||
<span class="lineno"> 47 </span>liftST :: ST s a -> Scene s a
|
||||
<span class="lineno"> 48 </span><span class="decl"><span class="istickedoff">liftST action = M $ \_ -> action >>= \a -> return (a, 0, 0, [])</span></span>
|
||||
<span class="lineno"> 49 </span>
|
||||
<span class="lineno"> 50 </span>-- | Evaluate the value of a scene.
|
||||
<span class="lineno"> 51 </span>evalScene :: (forall s. Scene s a) -> a
|
||||
<span class="lineno"> 52 </span><span class="decl"><span class="nottickedoff">evalScene action = runST $ do</span>
|
||||
<span class="lineno"> 53 </span><span class="spaces"> </span><span class="nottickedoff">(val, _, _, _) <- unM action 0</span>
|
||||
<span class="lineno"> 54 </span><span class="spaces"> </span><span class="nottickedoff">return val</span></span>
|
||||
<span class="lineno"> 55 </span>
|
||||
<span class="lineno"> 56 </span>-- | Render a 'Scene' to an 'Animation'.
|
||||
<span class="lineno"> 57 </span>scene :: (forall s. Scene s a) -> Animation
|
||||
<span class="lineno"> 58 </span><span class="decl"><span class="istickedoff">scene action =</span>
|
||||
<span class="lineno"> 59 </span><span class="spaces"> </span><span class="istickedoff">runST</span>
|
||||
<span class="lineno"> 60 </span><span class="spaces"> </span><span class="istickedoff">( do</span>
|
||||
<span class="lineno"> 61 </span><span class="spaces"> </span><span class="istickedoff">(_, s, p, gens) <- unM action 0</span>
|
||||
<span class="lineno"> 62 </span><span class="spaces"> </span><span class="istickedoff">let dur = max s p</span>
|
||||
<span class="lineno"> 63 </span><span class="spaces"> </span><span class="istickedoff">genFns <- sequence gens</span>
|
||||
<span class="lineno"> 64 </span><span class="spaces"> </span><span class="istickedoff">return $</span>
|
||||
<span class="lineno"> 65 </span><span class="spaces"> </span><span class="istickedoff">mkAnimation</span>
|
||||
<span class="lineno"> 66 </span><span class="spaces"> </span><span class="istickedoff">dur</span>
|
||||
<span class="lineno"> 67 </span><span class="spaces"> </span><span class="istickedoff">( \t -></span>
|
||||
<span class="lineno"> 68 </span><span class="spaces"> </span><span class="istickedoff">mkGroup $</span>
|
||||
<span class="lineno"> 69 </span><span class="spaces"> </span><span class="istickedoff">map fst $</span>
|
||||
<span class="lineno"> 70 </span><span class="spaces"> </span><span class="istickedoff">sortOn</span>
|
||||
<span class="lineno"> 71 </span><span class="spaces"> </span><span class="istickedoff">snd</span>
|
||||
<span class="lineno"> 72 </span><span class="spaces"> </span><span class="istickedoff">[spriteRender dur (t * dur) | spriteRender <- genFns]</span>
|
||||
<span class="lineno"> 73 </span><span class="spaces"> </span><span class="istickedoff">)</span>
|
||||
<span class="lineno"> 74 </span><span class="spaces"> </span><span class="istickedoff">)</span></span>
|
||||
<span class="lineno"> 75 </span>
|
||||
<span class="lineno"> 76 </span>-- | Execute actions in a scene without advancing the clock. Note that scenes do not end before
|
||||
<span class="lineno"> 77 </span>-- all forked actions have completed.
|
||||
<span class="lineno"> 78 </span>--
|
||||
<span class="lineno"> 79 </span>-- Example:
|
||||
<span class="lineno"> 80 </span>--
|
||||
<span class="lineno"> 81 </span>-- @
|
||||
<span class="lineno"> 82 </span>-- do 'fork' $ 'Reanimate.Scene.play' 'Reanimate.Builtin.Documentation.drawBox'
|
||||
<span class="lineno"> 83 </span>-- 'Reanimate.Scene.play' 'Reanimate.Builtin.Documentation.drawCircle'
|
||||
<span class="lineno"> 84 </span>-- @
|
||||
<span class="lineno"> 85 </span>--
|
||||
<span class="lineno"> 86 </span>-- <<docs/gifs/doc_fork.gif>>
|
||||
<span class="lineno"> 87 </span>fork :: Scene s a -> Scene s a
|
||||
<span class="lineno"> 88 </span><span class="decl"><span class="istickedoff">fork (M action) = M $ \t -> do</span>
|
||||
<span class="lineno"> 89 </span><span class="spaces"> </span><span class="istickedoff">(a, s, p, gens) <- action t</span>
|
||||
<span class="lineno"> 90 </span><span class="spaces"> </span><span class="istickedoff">return (a, 0, max s p, gens)</span></span>
|
||||
<span class="lineno"> 91 </span>
|
||||
<span class="lineno"> 92 </span>-- | Query the current clock timestamp.
|
||||
<span class="lineno"> 93 </span>--
|
||||
<span class="lineno"> 94 </span>-- Example:
|
||||
<span class="lineno"> 95 </span>--
|
||||
<span class="lineno"> 96 </span>-- @
|
||||
<span class="lineno"> 97 </span>-- do now \<- 'Reanimate.Scene.play' 'Reanimate.Builtin.Documentation.drawCircle' *\> 'queryNow'
|
||||
<span class="lineno"> 98 </span>-- 'Reanimate.Scene.play' $ 'staticFrame' 1 $ 'scale' 2 $ 'withStrokeWidth' 0.05 $
|
||||
<span class="lineno"> 99 </span>-- 'mkText' $ "Now=" <> T.pack (show now)
|
||||
<span class="lineno"> 100 </span>-- @
|
||||
<span class="lineno"> 101 </span>--
|
||||
<span class="lineno"> 102 </span>-- <<docs/gifs/doc_queryNow.gif>>
|
||||
<span class="lineno"> 103 </span>queryNow :: Scene s Time
|
||||
<span class="lineno"> 104 </span><span class="decl"><span class="istickedoff">queryNow = M $ \t -> return (t, 0, 0, [])</span></span>
|
||||
<span class="lineno"> 105 </span>
|
||||
<span class="lineno"> 106 </span>-- | Advance the clock by a given number of seconds.
|
||||
<span class="lineno"> 107 </span>--
|
||||
<span class="lineno"> 108 </span>-- Example:
|
||||
<span class="lineno"> 109 </span>--
|
||||
<span class="lineno"> 110 </span>-- @
|
||||
<span class="lineno"> 111 </span>-- do 'fork' $ 'Reanimate.Scene.play' 'Reanimate.Builtin.Documentation.drawBox'
|
||||
<span class="lineno"> 112 </span>-- 'wait' 1
|
||||
<span class="lineno"> 113 </span>-- 'Reanimate.Scene.play' 'Reanimate.Builtin.Documentation.drawCircle'
|
||||
<span class="lineno"> 114 </span>-- @
|
||||
<span class="lineno"> 115 </span>--
|
||||
<span class="lineno"> 116 </span>-- <<docs/gifs/doc_wait.gif>>
|
||||
<span class="lineno"> 117 </span>wait :: Duration -> Scene s ()
|
||||
<span class="lineno"> 118 </span><span class="decl"><span class="istickedoff">wait d = M $ \_ -> return (<span class="nottickedoff">()</span>, d, 0, [])</span></span>
|
||||
<span class="lineno"> 119 </span>
|
||||
<span class="lineno"> 120 </span>-- | Wait until the clock is equal to the given timestamp.
|
||||
<span class="lineno"> 121 </span>waitUntil :: Time -> Scene s ()
|
||||
<span class="lineno"> 122 </span><span class="decl"><span class="nottickedoff">waitUntil tNew = do</span>
|
||||
<span class="lineno"> 123 </span><span class="spaces"> </span><span class="nottickedoff">now <- queryNow</span>
|
||||
<span class="lineno"> 124 </span><span class="spaces"> </span><span class="nottickedoff">wait (max 0 (tNew - now))</span></span>
|
||||
<span class="lineno"> 125 </span>
|
||||
<span class="lineno"> 126 </span>-- | Wait until all forked and sequential animations have finished.
|
||||
<span class="lineno"> 127 </span>--
|
||||
<span class="lineno"> 128 </span>-- Example:
|
||||
<span class="lineno"> 129 </span>--
|
||||
<span class="lineno"> 130 </span>-- @
|
||||
<span class="lineno"> 131 </span>-- do 'waitOn' $ 'fork' $ 'Reanimate.Scene.play' 'Reanimate.Builtin.Documentation.drawBox'
|
||||
<span class="lineno"> 132 </span>-- 'Reanimate.Scene.play' 'Reanimate.Builtin.Documentation.drawCircle'
|
||||
<span class="lineno"> 133 </span>-- @
|
||||
<span class="lineno"> 134 </span>--
|
||||
<span class="lineno"> 135 </span>-- <<docs/gifs/doc_waitOn.gif>>
|
||||
<span class="lineno"> 136 </span>waitOn :: Scene s a -> Scene s a
|
||||
<span class="lineno"> 137 </span><span class="decl"><span class="istickedoff">waitOn (M action) = M $ \t -> do</span>
|
||||
<span class="lineno"> 138 </span><span class="spaces"> </span><span class="istickedoff">(a, s, p, gens) <- action t</span>
|
||||
<span class="lineno"> 139 </span><span class="spaces"> </span><span class="istickedoff">return (<span class="nottickedoff">a</span>, max s p, 0, gens)</span></span>
|
||||
<span class="lineno"> 140 </span>
|
||||
<span class="lineno"> 141 </span>-- | Change the ZIndex of a scene.
|
||||
<span class="lineno"> 142 </span>adjustZ :: (ZIndex -> ZIndex) -> Scene s a -> Scene s a
|
||||
<span class="lineno"> 143 </span><span class="decl"><span class="nottickedoff">adjustZ fn (M action) = M $ \t -> do</span>
|
||||
<span class="lineno"> 144 </span><span class="spaces"> </span><span class="nottickedoff">(a, s, p, gens) <- action t</span>
|
||||
<span class="lineno"> 145 </span><span class="spaces"> </span><span class="nottickedoff">return (a, s, p, map genFn gens)</span>
|
||||
<span class="lineno"> 146 </span><span class="spaces"> </span><span class="nottickedoff">where</span>
|
||||
<span class="lineno"> 147 </span><span class="spaces"> </span><span class="nottickedoff">genFn gen = do</span>
|
||||
<span class="lineno"> 148 </span><span class="spaces"> </span><span class="nottickedoff">frameGen <- gen</span>
|
||||
<span class="lineno"> 149 </span><span class="spaces"> </span><span class="nottickedoff">return $ \d t -> let (svg, z) = frameGen d t in (svg, fn z)</span></span>
|
||||
<span class="lineno"> 150 </span>
|
||||
<span class="lineno"> 151 </span>-- | Query the duration of a scene.
|
||||
<span class="lineno"> 152 </span>withSceneDuration :: Scene s () -> Scene s Duration
|
||||
<span class="lineno"> 153 </span><span class="decl"><span class="nottickedoff">withSceneDuration s = do</span>
|
||||
<span class="lineno"> 154 </span><span class="spaces"> </span><span class="nottickedoff">t1 <- queryNow</span>
|
||||
<span class="lineno"> 155 </span><span class="spaces"> </span><span class="nottickedoff">s</span>
|
||||
<span class="lineno"> 156 </span><span class="spaces"> </span><span class="nottickedoff">t2 <- queryNow</span>
|
||||
<span class="lineno"> 157 </span><span class="spaces"> </span><span class="nottickedoff">return (t2 - t1)</span></span>
|
||||
<span class="lineno"> 158 </span>
|
||||
<span class="lineno"> 159 </span>addGen :: Gen s -> Scene s ()
|
||||
<span class="lineno"> 160 </span><span class="decl"><span class="istickedoff">addGen gen = M $ \_ -> return (<span class="nottickedoff">()</span>, 0, 0, [gen])</span></span>
|
||||
|
||||
</pre>
|
||||
</body>
|
||||
|
|
|
|||
|
|
@ -60,8 +60,8 @@ span.spaces { background: white }
|
|||
<span class="lineno"> 41 </span>-- Example:
|
||||
<span class="lineno"> 42 </span>--
|
||||
<span class="lineno"> 43 </span>-- @
|
||||
<span class="lineno"> 44 </span>-- do var \<- 'simpleVar' 'mkCircle' 0
|
||||
<span class="lineno"> 45 </span>-- 'tweenVar' var 2 $ \\val -> 'fromToS' val ('Reanimate.Constants.screenHeight'/2)
|
||||
<span class="lineno"> 44 </span>-- do var \<- 'simpleVar' 'Reanimate.Svg.Constructors.mkCircle' 0
|
||||
<span class="lineno"> 45 </span>-- 'Reanimate.Scene.tweenVar' var 2 $ \\val -> 'Reanimate.fromToS' val ('Reanimate.Constants.screenHeight'/2)
|
||||
<span class="lineno"> 46 </span>-- @
|
||||
<span class="lineno"> 47 </span>--
|
||||
<span class="lineno"> 48 </span>-- <<docs/gifs/doc_simpleVar.gif>>
|
||||
|
|
@ -117,9 +117,9 @@ span.spaces { background: white }
|
|||
<span class="lineno"> 98 </span>--
|
||||
<span class="lineno"> 99 </span>-- @
|
||||
<span class="lineno"> 100 </span>-- do v \<- 'newVar' 0
|
||||
<span class="lineno"> 101 </span>-- 'newSprite' $ 'mkCircle' \<$\> 'unVar' v
|
||||
<span class="lineno"> 102 </span>-- 'tweenVar' v 1 $ \\val -> 'fromToS' val 3
|
||||
<span class="lineno"> 103 </span>-- 'tweenVar' v 1 $ \\val -> 'fromToS' val 0
|
||||
<span class="lineno"> 101 </span>-- 'newSprite' $ 'Reanimate.Svg.Constructors.mkCircle' \<$\> 'unVar' v
|
||||
<span class="lineno"> 102 </span>-- 'Reanimate.Scene.tweenVar' v 1 $ \\val -> 'Reanimate.fromToS' val 3
|
||||
<span class="lineno"> 103 </span>-- 'Reanimate.Scene.tweenVar' v 1 $ \\val -> 'Reanimate.fromToS' val 0
|
||||
<span class="lineno"> 104 </span>-- @
|
||||
<span class="lineno"> 105 </span>--
|
||||
<span class="lineno"> 106 </span>-- <<docs/gifs/doc_unVar.gif>>
|
||||
|
|
@ -142,7 +142,7 @@ span.spaces { background: white }
|
|||
<span class="lineno"> 123 </span>-- Example:
|
||||
<span class="lineno"> 124 </span>--
|
||||
<span class="lineno"> 125 </span>-- @
|
||||
<span class="lineno"> 126 </span>-- do 'newSprite' $ 'mkCircle' \<$\> 'spriteT' -- Circle sprite where radius=time.
|
||||
<span class="lineno"> 126 </span>-- do 'newSprite' $ 'Reanimate.Svg.Constructors.mkCircle' \<$\> 'spriteT' -- Circle sprite where radius=time.
|
||||
<span class="lineno"> 127 </span>-- 'wait' 2
|
||||
<span class="lineno"> 128 </span>-- @
|
||||
<span class="lineno"> 129 </span>--
|
||||
|
|
@ -188,7 +188,7 @@ span.spaces { background: white }
|
|||
<span class="lineno"> 169 </span>-- @
|
||||
<span class="lineno"> 170 </span>-- do 'fork' $ 'newSpriteA' 'Reanimate.Builtin.Documentation.drawCircle'
|
||||
<span class="lineno"> 171 </span>-- 'play' 'Reanimate.Builtin.Documentation.drawBox'
|
||||
<span class="lineno"> 172 </span>-- 'play' $ 'reverseA' 'Reanimate.Builtin.Documentation.drawBox'
|
||||
<span class="lineno"> 172 </span>-- 'play' $ 'Reanimate.Animation.reverseA' 'Reanimate.Builtin.Documentation.drawBox'
|
||||
<span class="lineno"> 173 </span>-- @
|
||||
<span class="lineno"> 174 </span>--
|
||||
<span class="lineno"> 175 </span>-- <<docs/gifs/doc_newSpriteA.gif>>
|
||||
|
|
@ -201,9 +201,9 @@ span.spaces { background: white }
|
|||
<span class="lineno"> 182 </span>-- Example:
|
||||
<span class="lineno"> 183 </span>--
|
||||
<span class="lineno"> 184 </span>-- @
|
||||
<span class="lineno"> 185 </span>-- do 'fork' $ 'newSpriteA'' 'SyncFreeze' 'Reanimate.Builtin.Documentation.drawCircle'
|
||||
<span class="lineno"> 185 </span>-- do 'fork' $ 'newSpriteA'' 'Reanimate.Animation.SyncFreeze' 'Reanimate.Builtin.Documentation.drawCircle'
|
||||
<span class="lineno"> 186 </span>-- 'play' 'Reanimate.Builtin.Documentation.drawBox'
|
||||
<span class="lineno"> 187 </span>-- 'play' $ 'reverseA' 'Reanimate.Builtin.Documentation.drawBox'
|
||||
<span class="lineno"> 187 </span>-- 'play' $ 'Reanimate.Animation.reverseA' 'Reanimate.Builtin.Documentation.drawBox'
|
||||
<span class="lineno"> 188 </span>-- @
|
||||
<span class="lineno"> 189 </span>--
|
||||
<span class="lineno"> 190 </span>-- <<docs/gifs/doc_newSpriteA'.gif>>
|
||||
|
|
@ -217,7 +217,7 @@ span.spaces { background: white }
|
|||
<span class="lineno"> 198 </span>-- Example:
|
||||
<span class="lineno"> 199 </span>--
|
||||
<span class="lineno"> 200 </span>-- @
|
||||
<span class="lineno"> 201 </span>-- do 'newSpriteSVG' $ 'mkBackground' "lightblue"
|
||||
<span class="lineno"> 201 </span>-- do 'newSpriteSVG' $ 'Reanimate.Svg.Constructors.mkBackground' "lightblue"
|
||||
<span class="lineno"> 202 </span>-- 'play' 'Reanimate.Builtin.Documentation.drawCircle'
|
||||
<span class="lineno"> 203 </span>-- @
|
||||
<span class="lineno"> 204 </span>--
|
||||
|
|
@ -238,8 +238,8 @@ span.spaces { background: white }
|
|||
<span class="lineno"> 219 </span>-- @
|
||||
<span class="lineno"> 220 </span>-- do s \<- 'fork' $ 'newSpriteA' 'Reanimate.Builtin.Documentation.drawBox'
|
||||
<span class="lineno"> 221 </span>-- v \<- 'newVar' 0
|
||||
<span class="lineno"> 222 </span>-- 'applyVar' v s 'rotate'
|
||||
<span class="lineno"> 223 </span>-- 'tweenVar' v 2 $ \\val -> 'fromToS' val 90
|
||||
<span class="lineno"> 222 </span>-- 'applyVar' v s 'Reanimate.Svg.Constructors.rotate'
|
||||
<span class="lineno"> 223 </span>-- 'Reanimate.Scene.tweenVar' v 2 $ \\val -> 'Reanimate.fromToS' val 90
|
||||
<span class="lineno"> 224 </span>-- @
|
||||
<span class="lineno"> 225 </span>--
|
||||
<span class="lineno"> 226 </span>-- <<docs/gifs/doc_applyVar.gif>>
|
||||
|
|
@ -254,7 +254,7 @@ span.spaces { background: white }
|
|||
<span class="lineno"> 235 </span>-- Example:
|
||||
<span class="lineno"> 236 </span>--
|
||||
<span class="lineno"> 237 </span>-- @
|
||||
<span class="lineno"> 238 </span>-- do s <- 'newSpriteSVG' $ 'withFillOpacity' 1 $ 'mkCircle' 1
|
||||
<span class="lineno"> 238 </span>-- do s <- 'newSpriteSVG' $ 'Reanimate.Svg.Constructors.withFillOpacity' 1 $ 'Reanimate.Svg.Constructors.mkCircle' 1
|
||||
<span class="lineno"> 239 </span>-- 'fork' $ 'wait' 1 \>\> 'destroySprite' s
|
||||
<span class="lineno"> 240 </span>-- 'play' 'Reanimate.Builtin.Documentation.drawBox'
|
||||
<span class="lineno"> 241 </span>-- @
|
||||
|
|
@ -286,7 +286,7 @@ span.spaces { background: white }
|
|||
<span class="lineno"> 267 </span>-- @
|
||||
<span class="lineno"> 268 </span>-- do s \<- 'fork' $ 'newSpriteA' 'Reanimate.Builtin.Documentation.drawCircle'
|
||||
<span class="lineno"> 269 </span>-- 'wait' 1
|
||||
<span class="lineno"> 270 </span>-- 'spriteMap' s 'flipYAxis'
|
||||
<span class="lineno"> 270 </span>-- 'spriteMap' s 'Reanimate.Svg.Constructors.flipYAxis'
|
||||
<span class="lineno"> 271 </span>-- @
|
||||
<span class="lineno"> 272 </span>--
|
||||
<span class="lineno"> 273 </span>-- <<docs/gifs/doc_spriteMap.gif>>
|
||||
|
|
@ -304,7 +304,7 @@ span.spaces { background: white }
|
|||
<span class="lineno"> 285 </span>--
|
||||
<span class="lineno"> 286 </span>-- @
|
||||
<span class="lineno"> 287 </span>-- do s \<- 'fork' $ 'newSpriteA' 'Reanimate.Builtin.Documentation.drawCircle'
|
||||
<span class="lineno"> 288 </span>-- 'spriteTween' s 1 $ \\val -> 'translate' ('Reanimate.Constants.screenWidth'*0.3*val) 0
|
||||
<span class="lineno"> 288 </span>-- 'spriteTween' s 1 $ \\val -> 'Reanimate.Svg.Constructors.translate' ('Reanimate.Constants.screenWidth'*0.3*val) 0
|
||||
<span class="lineno"> 289 </span>-- @
|
||||
<span class="lineno"> 290 </span>--
|
||||
<span class="lineno"> 291 </span>-- <<docs/gifs/doc_spriteTween.gif>>
|
||||
|
|
@ -328,8 +328,8 @@ span.spaces { background: white }
|
|||
<span class="lineno"> 309 </span>--
|
||||
<span class="lineno"> 310 </span>-- @
|
||||
<span class="lineno"> 311 </span>-- do s \<- 'fork' $ 'newSpriteA' 'Reanimate.Builtin.Documentation.drawBox'
|
||||
<span class="lineno"> 312 </span>-- v \<- 'spriteVar' s 0 'rotate'
|
||||
<span class="lineno"> 313 </span>-- 'tweenVar' v 2 $ \\val -> 'fromToS' val 90
|
||||
<span class="lineno"> 312 </span>-- v \<- 'spriteVar' s 0 'Reanimate.Svg.Constructors.rotate'
|
||||
<span class="lineno"> 313 </span>-- 'Reanimate.Scene.tweenVar' v 2 $ \\val -> 'Reanimate.fromToS' val 90
|
||||
<span class="lineno"> 314 </span>-- @
|
||||
<span class="lineno"> 315 </span>--
|
||||
<span class="lineno"> 316 </span>-- <<docs/gifs/doc_spriteVar.gif>>
|
||||
|
|
@ -345,8 +345,8 @@ span.spaces { background: white }
|
|||
<span class="lineno"> 326 </span>--
|
||||
<span class="lineno"> 327 </span>-- @
|
||||
<span class="lineno"> 328 </span>-- do s <- 'fork' $ 'newSpriteA' 'Reanimate.Builtin.Documentation.drawCircle'
|
||||
<span class="lineno"> 329 </span>-- 'spriteE' s $ 'overBeginning' 1 'fadeInE'
|
||||
<span class="lineno"> 330 </span>-- 'spriteE' s $ 'overEnding' 0.5 'fadeOutE'
|
||||
<span class="lineno"> 329 </span>-- 'spriteE' s $ 'Reanimate.Effect.overBeginning' 1 'Reanimate.Effect.fadeInE'
|
||||
<span class="lineno"> 330 </span>-- 'spriteE' s $ 'Reanimate.Effect.overEnding' 0.5 'Reanimate.Effect.fadeOutE'
|
||||
<span class="lineno"> 331 </span>-- @
|
||||
<span class="lineno"> 332 </span>--
|
||||
<span class="lineno"> 333 </span>-- <<docs/gifs/doc_spriteE.gif>>
|
||||
|
|
@ -368,8 +368,8 @@ span.spaces { background: white }
|
|||
<span class="lineno"> 349 </span>-- Example:
|
||||
<span class="lineno"> 350 </span>--
|
||||
<span class="lineno"> 351 </span>-- @
|
||||
<span class="lineno"> 352 </span>-- do s1 \<- 'newSpriteSVG' $ 'withFillOpacity' 1 $ 'withFillColor' "blue" $ 'mkCircle' 3
|
||||
<span class="lineno"> 353 </span>-- 'newSpriteSVG' $ 'withFillOpacity' 1 $ 'withFillColor' "red" $ 'mkRect' 8 3
|
||||
<span class="lineno"> 352 </span>-- do s1 \<- 'newSpriteSVG' $ 'Reanimate.Svg.Constructors.withFillOpacity' 1 $ 'Reanimate.Svg.Constructors.withFillColor' "blue" $ 'Reanimate.Svg.Constructors.mkCircle' 3
|
||||
<span class="lineno"> 353 </span>-- 'newSpriteSVG' $ 'Reanimate.Svg.Constructors.withFillOpacity' 1 $ 'Reanimate.Svg.Constructors.withFillColor' "red" $ 'Reanimate.Svg.Constructors.mkRect' 8 3
|
||||
<span class="lineno"> 354 </span>-- 'wait' 1
|
||||
<span class="lineno"> 355 </span>-- 'spriteZ' s1 1
|
||||
<span class="lineno"> 356 </span>-- 'wait' 1
|
||||
|
|
@ -394,13 +394,13 @@ span.spaces { background: white }
|
|||
<span class="lineno"> 375 </span>--
|
||||
<span class="lineno"> 376 </span>-- @
|
||||
<span class="lineno"> 377 </span>-- do -- the rect lives through the entire 3s animation
|
||||
<span class="lineno"> 378 </span>-- 'newSpriteSVG_' $ 'translate' (-3) 0 $ 'mkRect' 4 4
|
||||
<span class="lineno"> 378 </span>-- 'newSpriteSVG_' $ 'Reanimate.Svg.Constructors.translate' (-3) 0 $ 'Reanimate.Svg.Constructors.mkRect' 4 4
|
||||
<span class="lineno"> 379 </span>-- 'wait' 1
|
||||
<span class="lineno"> 380 </span>-- 'spriteScope' $ do
|
||||
<span class="lineno"> 381 </span>-- -- the circle only lives for 1 second.
|
||||
<span class="lineno"> 382 </span>-- local \<- 'newSpriteSVG' $ 'translate' 3 0 $ 'mkCircle' 2
|
||||
<span class="lineno"> 383 </span>-- 'spriteE' local $ 'overBeginning' 0.3 'fadeInE'
|
||||
<span class="lineno"> 384 </span>-- 'spriteE' local $ 'overEnding' 0.3 'fadeOutE'
|
||||
<span class="lineno"> 382 </span>-- local \<- 'newSpriteSVG' $ 'Reanimate.Svg.Constructors.translate' 3 0 $ 'Reanimate.Svg.Constructors.mkCircle' 2
|
||||
<span class="lineno"> 383 </span>-- 'spriteE' local $ 'Reanimate.Effect.overBeginning' 0.3 'Reanimate.Effect.fadeInE'
|
||||
<span class="lineno"> 384 </span>-- 'spriteE' local $ 'Reanimate.Effect.overEnding' 0.3 'Reanimate.Effect.fadeOutE'
|
||||
<span class="lineno"> 385 </span>-- 'wait' 1
|
||||
<span class="lineno"> 386 </span>-- 'wait' 1
|
||||
<span class="lineno"> 387 </span>-- @
|
||||
|
|
|
|||
|
|
@ -24,169 +24,168 @@ span.spaces { background: white }
|
|||
<span class="lineno"> 5 </span>
|
||||
<span class="lineno"> 6 </span>import Control.Monad.ST (ST)
|
||||
<span class="lineno"> 7 </span>import qualified Data.Map as M
|
||||
<span class="lineno"> 8 </span>import Data.Maybe (fromMaybe)
|
||||
<span class="lineno"> 9 </span>import Data.STRef
|
||||
<span class="lineno"> 10 </span>import Reanimate.Animation (Duration, Time)
|
||||
<span class="lineno"> 11 </span>import Reanimate.Scene.Core (Scene, liftST, queryNow, wait)
|
||||
<span class="lineno"> 12 </span>
|
||||
<span class="lineno"> 13 </span>-- | Time dependent variable.
|
||||
<span class="lineno"> 14 </span>newtype Var s a = Var (STRef s (VarData a))
|
||||
<span class="lineno"> 15 </span>
|
||||
<span class="lineno"> 16 </span>-- Note: We must ensure that upon transforming an VarData,
|
||||
<span class="lineno"> 17 </span>-- 1. evarDefault old == evarDefault new
|
||||
<span class="lineno"> 18 </span>-- 2. isNothing (evarLastTime old) || isJust (evarLastTime new) i.e. once evarLastValue has a Just value,
|
||||
<span class="lineno"> 19 </span>-- it shouldn't be Nothing again.
|
||||
<span class="lineno"> 20 </span>-- 3. isNothing (evarLastTime var) => M.null (evarTimeline var)
|
||||
<span class="lineno"> 21 </span>data VarData a = VarData
|
||||
<span class="lineno"> 22 </span> { <span class="istickedoff"><span class="decl"><span class="istickedoff">evarDefault</span></span></span> :: a,
|
||||
<span class="lineno"> 23 </span> <span class="istickedoff"><span class="decl"><span class="istickedoff">evarTimeline</span></span></span> :: Timeline a,
|
||||
<span class="lineno"> 24 </span> <span class="istickedoff"><span class="decl"><span class="istickedoff">evarLastTime</span></span></span> :: Maybe Time,
|
||||
<span class="lineno"> 25 </span> <span class="istickedoff"><span class="decl"><span class="istickedoff">evarLastValue</span></span></span> :: a
|
||||
<span class="lineno"> 26 </span> }
|
||||
<span class="lineno"> 27 </span>
|
||||
<span class="lineno"> 28 </span>data Modifier a = StaticValue a | TweenValue Duration (a -> Time -> a)
|
||||
<span class="lineno"> 29 </span>
|
||||
<span class="lineno"> 30 </span>type Timeline a = M.Map Time (Modifier a)
|
||||
<span class="lineno"> 31 </span>
|
||||
<span class="lineno"> 32 </span>-- | Create a new variable with a default value.
|
||||
<span class="lineno"> 33 </span>-- Variables always have a defined value even if they are read at a timestamp that is
|
||||
<span class="lineno"> 34 </span>-- earlier than when the variable was created. For example:
|
||||
<span class="lineno"> 35 </span>--
|
||||
<span class="lineno"> 36 </span>-- @
|
||||
<span class="lineno"> 37 </span>-- do v \<- 'fork' ('wait' 10 \>\> 'newVar' 0) -- Create a variable at timestamp '10'.
|
||||
<span class="lineno"> 38 </span>-- 'readVar' v -- Read the variable at timestamp '0'.
|
||||
<span class="lineno"> 39 </span>-- -- The value of the variable will be '0'.
|
||||
<span class="lineno"> 40 </span>-- @
|
||||
<span class="lineno"> 41 </span>newVar :: a -> Scene s (Var s a)
|
||||
<span class="lineno"> 42 </span><span class="decl"><span class="istickedoff">newVar def = Var <$> liftST (newSTRef $ VarData def M.empty Nothing <span class="nottickedoff">def</span>)</span></span>
|
||||
<span class="lineno"> 43 </span>
|
||||
<span class="lineno"> 44 </span>-- | Read the value of a variable at the current timestamp.
|
||||
<span class="lineno"> 45 </span>readVar :: Var s a -> Scene s a
|
||||
<span class="lineno"> 46 </span><span class="decl"><span class="istickedoff">readVar (Var ref) = readVarData <$> liftST (readSTRef ref) <*> queryNow</span></span>
|
||||
<span class="lineno"> 47 </span>
|
||||
<span class="lineno"> 48 </span>unpackVar :: Var s a -> ST s (Time -> a)
|
||||
<span class="lineno"> 49 </span><span class="decl"><span class="istickedoff">unpackVar (Var ref) = readVarData <$> readSTRef ref</span></span>
|
||||
<span class="lineno"> 50 </span>
|
||||
<span class="lineno"> 51 </span>-- | Write the value of a variable at the current timestamp.
|
||||
<span class="lineno"> 52 </span>--
|
||||
<span class="lineno"> 53 </span>-- Example:
|
||||
<span class="lineno"> 54 </span>--
|
||||
<span class="lineno"> 55 </span>-- @
|
||||
<span class="lineno"> 56 </span>-- do v \<- 'newVar' 0
|
||||
<span class="lineno"> 57 </span>-- 'newSprite' $ 'mkCircle' \<$\> 'unVar' v
|
||||
<span class="lineno"> 58 </span>-- 'writeVar' v 1; 'wait' 1
|
||||
<span class="lineno"> 59 </span>-- 'writeVar' v 2; 'wait' 1
|
||||
<span class="lineno"> 60 </span>-- 'writeVar' v 3; 'wait' 1
|
||||
<span class="lineno"> 61 </span>-- @
|
||||
<span class="lineno"> 62 </span>--
|
||||
<span class="lineno"> 63 </span>-- <<docs/gifs/doc_writeVar.gif>>
|
||||
<span class="lineno"> 64 </span>writeVar :: Var s a -> a -> Scene s ()
|
||||
<span class="lineno"> 65 </span><span class="decl"><span class="istickedoff">writeVar (Var ref) val = do</span>
|
||||
<span class="lineno"> 66 </span><span class="spaces"> </span><span class="istickedoff">now <- queryNow</span>
|
||||
<span class="lineno"> 67 </span><span class="spaces"> </span><span class="istickedoff">liftST $ modifySTRef ref $ writeVarData now val</span></span>
|
||||
<span class="lineno"> 68 </span>
|
||||
<span class="lineno"> 69 </span>-- | Modify the value of a variable at the current timestamp and all future timestamps.
|
||||
<span class="lineno"> 70 </span>modifyVar :: Var s a -> (a -> a) -> Scene s ()
|
||||
<span class="lineno"> 71 </span><span class="decl"><span class="nottickedoff">modifyVar (Var ref) fn = do</span>
|
||||
<span class="lineno"> 72 </span><span class="spaces"> </span><span class="nottickedoff">now <- queryNow</span>
|
||||
<span class="lineno"> 73 </span><span class="spaces"> </span><span class="nottickedoff">liftST $ modifySTRef ref $ modifyVarData now fn</span></span>
|
||||
<span class="lineno"> 74 </span>
|
||||
<span class="lineno"> 75 </span>-- | Modify a variable between @now@ and @now+duration@.
|
||||
<span class="lineno"> 76 </span>tweenVar :: Var s a -> Duration -> (a -> Time -> a) -> Scene s ()
|
||||
<span class="lineno"> 77 </span><span class="decl"><span class="istickedoff">tweenVar _ dur _ | <span class="tickonlyfalse">dur < 0</span> = <span class="nottickedoff">error "Reanimate.tweenVar: durations must be non-negative"</span></span>
|
||||
<span class="lineno"> 78 </span><span class="spaces"></span><span class="istickedoff">tweenVar (Var ref) dur fn = do</span>
|
||||
<span class="lineno"> 79 </span><span class="spaces"> </span><span class="istickedoff">now <- queryNow</span>
|
||||
<span class="lineno"> 80 </span><span class="spaces"> </span><span class="istickedoff">liftST $ modifySTRef ref $ tweenVarData now dur fn</span>
|
||||
<span class="lineno"> 81 </span><span class="spaces"> </span><span class="istickedoff">wait dur</span></span>
|
||||
<span class="lineno"> 82 </span>
|
||||
<span class="lineno"> 83 </span>readVarData :: VarData a -> Time -> a
|
||||
<span class="lineno"> 84 </span><span class="decl"><span class="istickedoff">readVarData (VarData def _ Nothing _) _ = def</span>
|
||||
<span class="lineno"> 85 </span><span class="spaces"></span><span class="istickedoff">readVarData (VarData def timeline (Just lastTime) lastValue) now</span>
|
||||
<span class="lineno"> 86 </span><span class="spaces"> </span><span class="istickedoff">| now < lastTime = lookupTimeline timeline def now</span>
|
||||
<span class="lineno"> 87 </span><span class="spaces"> </span><span class="istickedoff">| <span class="tickonlytrue">otherwise</span> = lastValue</span></span>
|
||||
<span class="lineno"> 88 </span>
|
||||
<span class="lineno"> 89 </span>lookupTimeline :: Timeline a -> a -> Time -> a
|
||||
<span class="lineno"> 90 </span><span class="decl"><span class="istickedoff">lookupTimeline timeline def now = case M.lookupLE now timeline of</span>
|
||||
<span class="lineno"> 91 </span><span class="spaces"> </span><span class="istickedoff">Just (_, StaticValue sVal) -> sVal</span>
|
||||
<span class="lineno"> 92 </span><span class="spaces"> </span><span class="istickedoff">Just (t, TweenValue dur f)</span>
|
||||
<span class="lineno"> 93 </span><span class="spaces"> </span><span class="istickedoff">| <span class="tickonlytrue">t + dur > now</span> -> f <span class="nottickedoff">def</span> now</span>
|
||||
<span class="lineno"> 94 </span><span class="spaces"> </span><span class="istickedoff">_ -> def</span></span>
|
||||
<span class="lineno"> 95 </span>
|
||||
<span class="lineno"> 96 </span>writeVarData :: Time -> a -> VarData a -> VarData a
|
||||
<span class="lineno"> 97 </span><span class="decl"><span class="istickedoff">writeVarData now x var =</span>
|
||||
<span class="lineno"> 98 </span><span class="spaces"> </span><span class="istickedoff">let before = keepBefore now var</span>
|
||||
<span class="lineno"> 99 </span><span class="spaces"> </span><span class="istickedoff">after = VarData (evarDefault var) M.empty (Just now) x</span>
|
||||
<span class="lineno"> 100 </span><span class="spaces"> </span><span class="istickedoff">in after `elseVar` before</span></span>
|
||||
<span class="lineno"> 101 </span>
|
||||
<span class="lineno"> 102 </span>modifyVarData :: Time -> (a -> a) -> VarData a -> VarData a
|
||||
<span class="lineno"> 103 </span><span class="decl"><span class="nottickedoff">modifyVarData now fn var =</span>
|
||||
<span class="lineno"> 104 </span><span class="spaces"> </span><span class="nottickedoff">let before = keepBefore now var</span>
|
||||
<span class="lineno"> 105 </span><span class="spaces"> </span><span class="nottickedoff">after = keepFrom now var</span>
|
||||
<span class="lineno"> 106 </span><span class="spaces"> </span><span class="nottickedoff">timeline = flip M.map (evarTimeline after) $ \case</span>
|
||||
<span class="lineno"> 107 </span><span class="spaces"> </span><span class="nottickedoff">StaticValue s -> StaticValue $ fn s</span>
|
||||
<span class="lineno"> 108 </span><span class="spaces"> </span><span class="nottickedoff">TweenValue dur f -> TweenValue dur $ \a t -> fn (f a t)</span>
|
||||
<span class="lineno"> 109 </span><span class="spaces"> </span><span class="nottickedoff">in after {evarTimeline = timeline, evarLastValue = fn $ evarLastValue after} `elseVar` before</span></span>
|
||||
<span class="lineno"> 110 </span>
|
||||
<span class="lineno"> 111 </span>-- Note: The function passed here takes time on the scale 0 to 1
|
||||
<span class="lineno"> 112 </span>-- while the function in `TweenValue` takes time on an absolute scale.
|
||||
<span class="lineno"> 113 </span>tweenVarData :: Time -> Duration -> (a -> Time -> a) -> VarData a -> VarData a
|
||||
<span class="lineno"> 114 </span><span class="decl"><span class="istickedoff">tweenVarData st dur fn var@VarData {..} =</span>
|
||||
<span class="lineno"> 115 </span><span class="spaces"> </span><span class="istickedoff">let nd = st + dur</span>
|
||||
<span class="lineno"> 116 </span><span class="spaces"> </span><span class="istickedoff">before = keepBefore st var</span>
|
||||
<span class="lineno"> 117 </span><span class="spaces"> </span><span class="istickedoff">during = keepInRange (Just st) (Just nd) var</span>
|
||||
<span class="lineno"> 118 </span><span class="spaces"> </span><span class="istickedoff">tweenFn a t =</span>
|
||||
<span class="lineno"> 119 </span><span class="spaces"> </span><span class="istickedoff">let idx = (t - st) / dur</span>
|
||||
<span class="lineno"> 120 </span><span class="spaces"> </span><span class="istickedoff">idx' = if <span class="tickonlyfalse">isNaN idx</span> then <span class="nottickedoff">1</span> else idx</span>
|
||||
<span class="lineno"> 121 </span><span class="spaces"> </span><span class="istickedoff">in fn (readVarData (during {evarDefault = <span class="nottickedoff">a</span>}) t) idx'</span>
|
||||
<span class="lineno"> 122 </span><span class="spaces"> </span><span class="istickedoff">valueTweenEnd = tweenFn <span class="nottickedoff">evarDefault</span> nd -- we'll never use the def here, replace with error?</span>
|
||||
<span class="lineno"> 123 </span><span class="spaces"> </span><span class="istickedoff">after = VarData evarDefault (M.singleton st $ TweenValue dur tweenFn) (Just nd) valueTweenEnd</span>
|
||||
<span class="lineno"> 124 </span><span class="spaces"> </span><span class="istickedoff">in after `elseVar` before</span></span>
|
||||
<span class="lineno"> 125 </span>
|
||||
<span class="lineno"> 126 </span>-- Returns the union of two vars such that we use the second var if first var doesn't have a value.
|
||||
<span class="lineno"> 127 </span>-- Assumes both vars have same default value.
|
||||
<span class="lineno"> 128 </span>elseVar :: VarData a -> VarData a -> VarData a
|
||||
<span class="lineno"> 129 </span><span class="decl"><span class="istickedoff">elseVar var1 var2</span>
|
||||
<span class="lineno"> 130 </span><span class="spaces"> </span><span class="istickedoff">| Just t <- evarLastTime var1 =</span>
|
||||
<span class="lineno"> 131 </span><span class="spaces"> </span><span class="istickedoff">let afterTimeline = evarTimeline var1</span>
|
||||
<span class="lineno"> 132 </span><span class="spaces"> </span><span class="istickedoff">joinAt = fromMaybe t . fmap fst $ M.lookupMin afterTimeline</span>
|
||||
<span class="lineno"> 133 </span><span class="spaces"> </span><span class="istickedoff">beforeTimeline = case keepBefore joinAt var2 of</span>
|
||||
<span class="lineno"> 134 </span><span class="spaces"> </span><span class="istickedoff">x</span>
|
||||
<span class="lineno"> 135 </span><span class="spaces"> </span><span class="istickedoff">| Just lastTime <- evarLastTime x, lastTime < joinAt -> M.insert lastTime (StaticValue $ evarLastValue x) $ evarTimeline x</span>
|
||||
<span class="lineno"> 136 </span><span class="spaces"> </span><span class="istickedoff">| <span class="tickonlytrue">otherwise</span> -> evarTimeline x</span>
|
||||
<span class="lineno"> 137 </span><span class="spaces"> </span><span class="istickedoff">in var1 {evarTimeline = M.union afterTimeline beforeTimeline}</span>
|
||||
<span class="lineno"> 138 </span><span class="spaces"> </span><span class="istickedoff">| <span class="nottickedoff">otherwise</span> = <span class="nottickedoff">var2</span></span></span>
|
||||
<span class="lineno"> 139 </span>
|
||||
<span class="lineno"> 140 </span>-- Restrict a var to a given time interval.
|
||||
<span class="lineno"> 141 </span>keepInRange :: Maybe Time -> Maybe Time -> VarData a -> VarData a
|
||||
<span class="lineno"> 142 </span><span class="decl"><span class="istickedoff">keepInRange st nd = fromMaybe <span class="nottickedoff">id</span> (keepFrom <$> st) . fromMaybe <span class="nottickedoff">id</span> (keepBefore <$> nd)</span></span>
|
||||
<span class="lineno"> 143 </span>
|
||||
<span class="lineno"> 144 </span>-- Restrict a var to start at given timestamp.
|
||||
<span class="lineno"> 145 </span>keepFrom :: Time -> VarData a -> VarData a
|
||||
<span class="lineno"> 146 </span><span class="decl"><span class="istickedoff">keepFrom st VarData {..} =</span>
|
||||
<span class="lineno"> 147 </span><span class="spaces"> </span><span class="istickedoff">let <span class="nottickedoff">timeline' = M.dropWhileAntitone (< st) evarTimeline</span></span>
|
||||
<span class="lineno"> 148 </span><span class="spaces"> </span><span class="istickedoff">-- if there is no modifier in timeline starting at st,</span>
|
||||
<span class="lineno"> 149 </span><span class="spaces"> </span><span class="istickedoff">-- we must get the modifier that starts before and truncate it to start at st.</span>
|
||||
<span class="lineno"> 150 </span><span class="spaces"> </span><span class="istickedoff"><span class="nottickedoff">timeline'' = case M.lookupLE st evarTimeline of</span></span>
|
||||
<span class="lineno"> 151 </span><span class="spaces"> </span><span class="istickedoff"><span class="nottickedoff">Just (t, val@(StaticValue _))</span></span>
|
||||
<span class="lineno"> 152 </span><span class="spaces"> </span><span class="istickedoff"><span class="nottickedoff">| t < st -> M.insert st val timeline'</span></span>
|
||||
<span class="lineno"> 153 </span><span class="spaces"> </span><span class="istickedoff"><span class="nottickedoff">Just (t, TweenValue dur fn)</span></span>
|
||||
<span class="lineno"> 154 </span><span class="spaces"> </span><span class="istickedoff"><span class="nottickedoff">| t < st, t + dur > st -> M.insert st (TweenValue (t + dur - st) fn) timeline'</span></span>
|
||||
<span class="lineno"> 155 </span><span class="spaces"> </span><span class="istickedoff"><span class="nottickedoff">_ -> timeline'</span></span>
|
||||
<span class="lineno"> 156 </span><span class="spaces"> </span><span class="istickedoff">in VarData <span class="nottickedoff">evarDefault</span> <span class="nottickedoff">timeline''</span> (max evarLastTime $ Just st) evarLastValue</span></span>
|
||||
<span class="lineno"> 157 </span>
|
||||
<span class="lineno"> 158 </span>-- Restrict a var to end(clamp) at given timestamp.
|
||||
<span class="lineno"> 159 </span>keepBefore :: Time -> VarData a -> VarData a
|
||||
<span class="lineno"> 160 </span><span class="decl"><span class="istickedoff">keepBefore nd var@VarData {..} =</span>
|
||||
<span class="lineno"> 161 </span><span class="spaces"> </span><span class="istickedoff">let timeline' = M.takeWhileAntitone (< nd) evarTimeline</span>
|
||||
<span class="lineno"> 162 </span><span class="spaces"> </span><span class="istickedoff">lastModifier = M.lookupMax timeline'</span>
|
||||
<span class="lineno"> 163 </span><span class="spaces"> </span><span class="istickedoff">timeline'' = case lastModifier of</span>
|
||||
<span class="lineno"> 164 </span><span class="spaces"> </span><span class="istickedoff">Just (t, TweenValue dur fn)</span>
|
||||
<span class="lineno"> 165 </span><span class="spaces"> </span><span class="istickedoff">| <span class="tickonlyfalse">t + dur > nd</span> -> <span class="nottickedoff">M.insert t (TweenValue (nd - t) fn) timeline'</span></span>
|
||||
<span class="lineno"> 166 </span><span class="spaces"> </span><span class="istickedoff">_ -> timeline'</span>
|
||||
<span class="lineno"> 167 </span><span class="spaces"> </span><span class="istickedoff">lastTime = case lastModifier of</span>
|
||||
<span class="lineno"> 168 </span><span class="spaces"> </span><span class="istickedoff">Just (t, TweenValue dur _) -> Just $ min nd (t + dur)</span>
|
||||
<span class="lineno"> 169 </span><span class="spaces"> </span><span class="istickedoff">_ -> min nd <$> evarLastTime</span>
|
||||
<span class="lineno"> 170 </span><span class="spaces"> </span><span class="istickedoff">in VarData <span class="nottickedoff">evarDefault</span> timeline'' lastTime (fromMaybe evarDefault $ fmap (readVarData var) lastTime)</span></span>
|
||||
<span class="lineno"> 8 </span>import Data.STRef
|
||||
<span class="lineno"> 9 </span>import Reanimate.Animation (Duration, Time)
|
||||
<span class="lineno"> 10 </span>import Reanimate.Scene.Core (Scene, liftST, queryNow, wait)
|
||||
<span class="lineno"> 11 </span>
|
||||
<span class="lineno"> 12 </span>-- | Time dependent variable.
|
||||
<span class="lineno"> 13 </span>newtype Var s a = Var (STRef s (VarData a))
|
||||
<span class="lineno"> 14 </span>
|
||||
<span class="lineno"> 15 </span>-- Note: We must ensure that upon transforming an VarData,
|
||||
<span class="lineno"> 16 </span>-- 1. evarDefault old == evarDefault new
|
||||
<span class="lineno"> 17 </span>-- 2. isNothing (evarLastTime old) || isJust (evarLastTime new) i.e. once evarLastValue has a Just value,
|
||||
<span class="lineno"> 18 </span>-- it shouldn't be Nothing again.
|
||||
<span class="lineno"> 19 </span>-- 3. isNothing (evarLastTime var) => M.null (evarTimeline var)
|
||||
<span class="lineno"> 20 </span>data VarData a = VarData
|
||||
<span class="lineno"> 21 </span> { <span class="istickedoff"><span class="decl"><span class="istickedoff">evarDefault</span></span></span> :: a,
|
||||
<span class="lineno"> 22 </span> <span class="istickedoff"><span class="decl"><span class="istickedoff">evarTimeline</span></span></span> :: Timeline a,
|
||||
<span class="lineno"> 23 </span> <span class="istickedoff"><span class="decl"><span class="istickedoff">evarLastTime</span></span></span> :: Maybe Time,
|
||||
<span class="lineno"> 24 </span> <span class="istickedoff"><span class="decl"><span class="istickedoff">evarLastValue</span></span></span> :: a
|
||||
<span class="lineno"> 25 </span> }
|
||||
<span class="lineno"> 26 </span>
|
||||
<span class="lineno"> 27 </span>data Modifier a = StaticValue a | TweenValue Duration (a -> Time -> a)
|
||||
<span class="lineno"> 28 </span>
|
||||
<span class="lineno"> 29 </span>type Timeline a = M.Map Time (Modifier a)
|
||||
<span class="lineno"> 30 </span>
|
||||
<span class="lineno"> 31 </span>-- | Create a new variable with a default value.
|
||||
<span class="lineno"> 32 </span>-- Variables always have a defined value even if they are read at a timestamp that is
|
||||
<span class="lineno"> 33 </span>-- earlier than when the variable was created. For example:
|
||||
<span class="lineno"> 34 </span>--
|
||||
<span class="lineno"> 35 </span>-- @
|
||||
<span class="lineno"> 36 </span>-- do v \<- 'Reanimate.Scene.fork' ('wait' 10 \>\> 'newVar' 0) -- Create a variable at timestamp '10'.
|
||||
<span class="lineno"> 37 </span>-- 'readVar' v -- Read the variable at timestamp '0'.
|
||||
<span class="lineno"> 38 </span>-- -- The value of the variable will be '0'.
|
||||
<span class="lineno"> 39 </span>-- @
|
||||
<span class="lineno"> 40 </span>newVar :: a -> Scene s (Var s a)
|
||||
<span class="lineno"> 41 </span><span class="decl"><span class="istickedoff">newVar def = Var <$> liftST (newSTRef $ VarData def M.empty Nothing <span class="nottickedoff">def</span>)</span></span>
|
||||
<span class="lineno"> 42 </span>
|
||||
<span class="lineno"> 43 </span>-- | Read the value of a variable at the current timestamp.
|
||||
<span class="lineno"> 44 </span>readVar :: Var s a -> Scene s a
|
||||
<span class="lineno"> 45 </span><span class="decl"><span class="istickedoff">readVar (Var ref) = readVarData <$> liftST (readSTRef ref) <*> queryNow</span></span>
|
||||
<span class="lineno"> 46 </span>
|
||||
<span class="lineno"> 47 </span>unpackVar :: Var s a -> ST s (Time -> a)
|
||||
<span class="lineno"> 48 </span><span class="decl"><span class="istickedoff">unpackVar (Var ref) = readVarData <$> readSTRef ref</span></span>
|
||||
<span class="lineno"> 49 </span>
|
||||
<span class="lineno"> 50 </span>-- | Write the value of a variable at the current timestamp.
|
||||
<span class="lineno"> 51 </span>--
|
||||
<span class="lineno"> 52 </span>-- Example:
|
||||
<span class="lineno"> 53 </span>--
|
||||
<span class="lineno"> 54 </span>-- @
|
||||
<span class="lineno"> 55 </span>-- do v \<- 'newVar' 0
|
||||
<span class="lineno"> 56 </span>-- 'Reanimate.Scene.newSprite' $ 'Reanimate.Svg.Constructors.mkCircle' \<$\> 'Reanimate.Scene.unVar' v
|
||||
<span class="lineno"> 57 </span>-- 'writeVar' v 1; 'wait' 1
|
||||
<span class="lineno"> 58 </span>-- 'writeVar' v 2; 'wait' 1
|
||||
<span class="lineno"> 59 </span>-- 'writeVar' v 3; 'wait' 1
|
||||
<span class="lineno"> 60 </span>-- @
|
||||
<span class="lineno"> 61 </span>--
|
||||
<span class="lineno"> 62 </span>-- <<docs/gifs/doc_writeVar.gif>>
|
||||
<span class="lineno"> 63 </span>writeVar :: Var s a -> a -> Scene s ()
|
||||
<span class="lineno"> 64 </span><span class="decl"><span class="istickedoff">writeVar (Var ref) val = do</span>
|
||||
<span class="lineno"> 65 </span><span class="spaces"> </span><span class="istickedoff">now <- queryNow</span>
|
||||
<span class="lineno"> 66 </span><span class="spaces"> </span><span class="istickedoff">liftST $ modifySTRef ref $ writeVarData now val</span></span>
|
||||
<span class="lineno"> 67 </span>
|
||||
<span class="lineno"> 68 </span>-- | Modify the value of a variable at the current timestamp and all future timestamps.
|
||||
<span class="lineno"> 69 </span>modifyVar :: Var s a -> (a -> a) -> Scene s ()
|
||||
<span class="lineno"> 70 </span><span class="decl"><span class="nottickedoff">modifyVar (Var ref) fn = do</span>
|
||||
<span class="lineno"> 71 </span><span class="spaces"> </span><span class="nottickedoff">now <- queryNow</span>
|
||||
<span class="lineno"> 72 </span><span class="spaces"> </span><span class="nottickedoff">liftST $ modifySTRef ref $ modifyVarData now fn</span></span>
|
||||
<span class="lineno"> 73 </span>
|
||||
<span class="lineno"> 74 </span>-- | Modify a variable between @now@ and @now+duration@.
|
||||
<span class="lineno"> 75 </span>tweenVar :: Var s a -> Duration -> (a -> Time -> a) -> Scene s ()
|
||||
<span class="lineno"> 76 </span><span class="decl"><span class="istickedoff">tweenVar _ dur _ | <span class="tickonlyfalse">dur < 0</span> = <span class="nottickedoff">error "Reanimate.tweenVar: durations must be non-negative"</span></span>
|
||||
<span class="lineno"> 77 </span><span class="spaces"></span><span class="istickedoff">tweenVar (Var ref) dur fn = do</span>
|
||||
<span class="lineno"> 78 </span><span class="spaces"> </span><span class="istickedoff">now <- queryNow</span>
|
||||
<span class="lineno"> 79 </span><span class="spaces"> </span><span class="istickedoff">liftST $ modifySTRef ref $ tweenVarData now dur fn</span>
|
||||
<span class="lineno"> 80 </span><span class="spaces"> </span><span class="istickedoff">wait dur</span></span>
|
||||
<span class="lineno"> 81 </span>
|
||||
<span class="lineno"> 82 </span>readVarData :: VarData a -> Time -> a
|
||||
<span class="lineno"> 83 </span><span class="decl"><span class="istickedoff">readVarData (VarData def _ Nothing _) _ = def</span>
|
||||
<span class="lineno"> 84 </span><span class="spaces"></span><span class="istickedoff">readVarData (VarData def timeline (Just lastTime) lastValue) now</span>
|
||||
<span class="lineno"> 85 </span><span class="spaces"> </span><span class="istickedoff">| now < lastTime = lookupTimeline timeline def now</span>
|
||||
<span class="lineno"> 86 </span><span class="spaces"> </span><span class="istickedoff">| <span class="tickonlytrue">otherwise</span> = lastValue</span></span>
|
||||
<span class="lineno"> 87 </span>
|
||||
<span class="lineno"> 88 </span>lookupTimeline :: Timeline a -> a -> Time -> a
|
||||
<span class="lineno"> 89 </span><span class="decl"><span class="istickedoff">lookupTimeline timeline def now = case M.lookupLE now timeline of</span>
|
||||
<span class="lineno"> 90 </span><span class="spaces"> </span><span class="istickedoff">Just (_, StaticValue sVal) -> sVal</span>
|
||||
<span class="lineno"> 91 </span><span class="spaces"> </span><span class="istickedoff">Just (t, TweenValue dur f)</span>
|
||||
<span class="lineno"> 92 </span><span class="spaces"> </span><span class="istickedoff">| <span class="tickonlytrue">t + dur > now</span> -> f <span class="nottickedoff">def</span> now</span>
|
||||
<span class="lineno"> 93 </span><span class="spaces"> </span><span class="istickedoff">_ -> def</span></span>
|
||||
<span class="lineno"> 94 </span>
|
||||
<span class="lineno"> 95 </span>writeVarData :: Time -> a -> VarData a -> VarData a
|
||||
<span class="lineno"> 96 </span><span class="decl"><span class="istickedoff">writeVarData now x var =</span>
|
||||
<span class="lineno"> 97 </span><span class="spaces"> </span><span class="istickedoff">let before = keepBefore now var</span>
|
||||
<span class="lineno"> 98 </span><span class="spaces"> </span><span class="istickedoff">after = VarData (evarDefault var) M.empty (Just now) x</span>
|
||||
<span class="lineno"> 99 </span><span class="spaces"> </span><span class="istickedoff">in after `elseVar` before</span></span>
|
||||
<span class="lineno"> 100 </span>
|
||||
<span class="lineno"> 101 </span>modifyVarData :: Time -> (a -> a) -> VarData a -> VarData a
|
||||
<span class="lineno"> 102 </span><span class="decl"><span class="nottickedoff">modifyVarData now fn var =</span>
|
||||
<span class="lineno"> 103 </span><span class="spaces"> </span><span class="nottickedoff">let before = keepBefore now var</span>
|
||||
<span class="lineno"> 104 </span><span class="spaces"> </span><span class="nottickedoff">after = keepFrom now var</span>
|
||||
<span class="lineno"> 105 </span><span class="spaces"> </span><span class="nottickedoff">timeline = flip M.map (evarTimeline after) $ \case</span>
|
||||
<span class="lineno"> 106 </span><span class="spaces"> </span><span class="nottickedoff">StaticValue s -> StaticValue $ fn s</span>
|
||||
<span class="lineno"> 107 </span><span class="spaces"> </span><span class="nottickedoff">TweenValue dur f -> TweenValue dur $ \a t -> fn (f a t)</span>
|
||||
<span class="lineno"> 108 </span><span class="spaces"> </span><span class="nottickedoff">in after {evarTimeline = timeline, evarLastValue = fn $ evarLastValue after} `elseVar` before</span></span>
|
||||
<span class="lineno"> 109 </span>
|
||||
<span class="lineno"> 110 </span>-- Note: The function passed here takes time on the scale 0 to 1
|
||||
<span class="lineno"> 111 </span>-- while the function in `TweenValue` takes time on an absolute scale.
|
||||
<span class="lineno"> 112 </span>tweenVarData :: Time -> Duration -> (a -> Time -> a) -> VarData a -> VarData a
|
||||
<span class="lineno"> 113 </span><span class="decl"><span class="istickedoff">tweenVarData st dur fn var@VarData {..} =</span>
|
||||
<span class="lineno"> 114 </span><span class="spaces"> </span><span class="istickedoff">let nd = st + dur</span>
|
||||
<span class="lineno"> 115 </span><span class="spaces"> </span><span class="istickedoff">before = keepBefore st var</span>
|
||||
<span class="lineno"> 116 </span><span class="spaces"> </span><span class="istickedoff">during = keepInRange (Just st) (Just nd) var</span>
|
||||
<span class="lineno"> 117 </span><span class="spaces"> </span><span class="istickedoff">tweenFn a t =</span>
|
||||
<span class="lineno"> 118 </span><span class="spaces"> </span><span class="istickedoff">let idx = (t - st) / dur</span>
|
||||
<span class="lineno"> 119 </span><span class="spaces"> </span><span class="istickedoff">idx' = if <span class="tickonlyfalse">isNaN idx</span> then <span class="nottickedoff">1</span> else idx</span>
|
||||
<span class="lineno"> 120 </span><span class="spaces"> </span><span class="istickedoff">in fn (readVarData (during {evarDefault = <span class="nottickedoff">a</span>}) t) idx'</span>
|
||||
<span class="lineno"> 121 </span><span class="spaces"> </span><span class="istickedoff">valueTweenEnd = tweenFn <span class="nottickedoff">evarDefault</span> nd -- we'll never use the def here, replace with error?</span>
|
||||
<span class="lineno"> 122 </span><span class="spaces"> </span><span class="istickedoff">after = VarData evarDefault (M.singleton st $ TweenValue dur tweenFn) (Just nd) valueTweenEnd</span>
|
||||
<span class="lineno"> 123 </span><span class="spaces"> </span><span class="istickedoff">in after `elseVar` before</span></span>
|
||||
<span class="lineno"> 124 </span>
|
||||
<span class="lineno"> 125 </span>-- Returns the union of two vars such that we use the second var if first var doesn't have a value.
|
||||
<span class="lineno"> 126 </span>-- Assumes both vars have same default value.
|
||||
<span class="lineno"> 127 </span>elseVar :: VarData a -> VarData a -> VarData a
|
||||
<span class="lineno"> 128 </span><span class="decl"><span class="istickedoff">elseVar var1 var2</span>
|
||||
<span class="lineno"> 129 </span><span class="spaces"> </span><span class="istickedoff">| Just t <- evarLastTime var1 =</span>
|
||||
<span class="lineno"> 130 </span><span class="spaces"> </span><span class="istickedoff">let afterTimeline = evarTimeline var1</span>
|
||||
<span class="lineno"> 131 </span><span class="spaces"> </span><span class="istickedoff">joinAt = maybe t fst $ M.lookupMin afterTimeline</span>
|
||||
<span class="lineno"> 132 </span><span class="spaces"> </span><span class="istickedoff">beforeTimeline = case keepBefore joinAt var2 of</span>
|
||||
<span class="lineno"> 133 </span><span class="spaces"> </span><span class="istickedoff">x</span>
|
||||
<span class="lineno"> 134 </span><span class="spaces"> </span><span class="istickedoff">| Just lastTime <- evarLastTime x, lastTime < joinAt -> M.insert lastTime (StaticValue $ evarLastValue x) $ evarTimeline x</span>
|
||||
<span class="lineno"> 135 </span><span class="spaces"> </span><span class="istickedoff">| <span class="tickonlytrue">otherwise</span> -> evarTimeline x</span>
|
||||
<span class="lineno"> 136 </span><span class="spaces"> </span><span class="istickedoff">in var1 {evarTimeline = M.union afterTimeline beforeTimeline}</span>
|
||||
<span class="lineno"> 137 </span><span class="spaces"> </span><span class="istickedoff">| <span class="nottickedoff">otherwise</span> = <span class="nottickedoff">var2</span></span></span>
|
||||
<span class="lineno"> 138 </span>
|
||||
<span class="lineno"> 139 </span>-- Restrict a var to a given time interval.
|
||||
<span class="lineno"> 140 </span>keepInRange :: Maybe Time -> Maybe Time -> VarData a -> VarData a
|
||||
<span class="lineno"> 141 </span><span class="decl"><span class="istickedoff">keepInRange st nd = maybe <span class="nottickedoff">id</span> keepFrom st . maybe <span class="nottickedoff">id</span> keepBefore nd</span></span>
|
||||
<span class="lineno"> 142 </span>
|
||||
<span class="lineno"> 143 </span>-- Restrict a var to start at given timestamp.
|
||||
<span class="lineno"> 144 </span>keepFrom :: Time -> VarData a -> VarData a
|
||||
<span class="lineno"> 145 </span><span class="decl"><span class="istickedoff">keepFrom st VarData {..} =</span>
|
||||
<span class="lineno"> 146 </span><span class="spaces"> </span><span class="istickedoff">let <span class="nottickedoff">timeline' = M.dropWhileAntitone (< st) evarTimeline</span></span>
|
||||
<span class="lineno"> 147 </span><span class="spaces"> </span><span class="istickedoff">-- if there is no modifier in timeline starting at st,</span>
|
||||
<span class="lineno"> 148 </span><span class="spaces"> </span><span class="istickedoff">-- we must get the modifier that starts before and truncate it to start at st.</span>
|
||||
<span class="lineno"> 149 </span><span class="spaces"> </span><span class="istickedoff"><span class="nottickedoff">timeline'' = case M.lookupLE st evarTimeline of</span></span>
|
||||
<span class="lineno"> 150 </span><span class="spaces"> </span><span class="istickedoff"><span class="nottickedoff">Just (t, val@(StaticValue _))</span></span>
|
||||
<span class="lineno"> 151 </span><span class="spaces"> </span><span class="istickedoff"><span class="nottickedoff">| t < st -> M.insert st val timeline'</span></span>
|
||||
<span class="lineno"> 152 </span><span class="spaces"> </span><span class="istickedoff"><span class="nottickedoff">Just (t, TweenValue dur fn)</span></span>
|
||||
<span class="lineno"> 153 </span><span class="spaces"> </span><span class="istickedoff"><span class="nottickedoff">| t < st, t + dur > st -> M.insert st (TweenValue (t + dur - st) fn) timeline'</span></span>
|
||||
<span class="lineno"> 154 </span><span class="spaces"> </span><span class="istickedoff"><span class="nottickedoff">_ -> timeline'</span></span>
|
||||
<span class="lineno"> 155 </span><span class="spaces"> </span><span class="istickedoff">in VarData <span class="nottickedoff">evarDefault</span> <span class="nottickedoff">timeline''</span> (max evarLastTime $ Just st) evarLastValue</span></span>
|
||||
<span class="lineno"> 156 </span>
|
||||
<span class="lineno"> 157 </span>-- Restrict a var to end(clamp) at given timestamp.
|
||||
<span class="lineno"> 158 </span>keepBefore :: Time -> VarData a -> VarData a
|
||||
<span class="lineno"> 159 </span><span class="decl"><span class="istickedoff">keepBefore nd var@VarData {..} =</span>
|
||||
<span class="lineno"> 160 </span><span class="spaces"> </span><span class="istickedoff">let timeline' = M.takeWhileAntitone (< nd) evarTimeline</span>
|
||||
<span class="lineno"> 161 </span><span class="spaces"> </span><span class="istickedoff">lastModifier = M.lookupMax timeline'</span>
|
||||
<span class="lineno"> 162 </span><span class="spaces"> </span><span class="istickedoff">timeline'' = case lastModifier of</span>
|
||||
<span class="lineno"> 163 </span><span class="spaces"> </span><span class="istickedoff">Just (t, TweenValue dur fn)</span>
|
||||
<span class="lineno"> 164 </span><span class="spaces"> </span><span class="istickedoff">| <span class="tickonlyfalse">t + dur > nd</span> -> <span class="nottickedoff">M.insert t (TweenValue (nd - t) fn) timeline'</span></span>
|
||||
<span class="lineno"> 165 </span><span class="spaces"> </span><span class="istickedoff">_ -> timeline'</span>
|
||||
<span class="lineno"> 166 </span><span class="spaces"> </span><span class="istickedoff">lastTime = case lastModifier of</span>
|
||||
<span class="lineno"> 167 </span><span class="spaces"> </span><span class="istickedoff">Just (t, TweenValue dur _) -> Just $ min nd (t + dur)</span>
|
||||
<span class="lineno"> 168 </span><span class="spaces"> </span><span class="istickedoff">_ -> min nd <$> evarLastTime</span>
|
||||
<span class="lineno"> 169 </span><span class="spaces"> </span><span class="istickedoff">in VarData <span class="nottickedoff">evarDefault</span> timeline'' lastTime (maybe evarDefault (readVarData var) lastTime)</span></span>
|
||||
|
||||
</pre>
|
||||
</body>
|
||||
|
|
|
|||
Loading…
Reference in a new issue