external/libfigure/dance.js

@@ -22,7 +22,7 @@ function invertPair(whostr, dialect) {
   }
 }
 
-export function labelForBeats(beats) {
+function labelForBeats(beats) {
   if (beats % 16 == 0)
     switch (beats / 16) {
       case 0:

external/libfigure/define-figure.js

@@ -7,15 +7,7 @@
 // language construct for defining dance moves
 // and related support functions for dealing with figures
 
-import { formalParamIsDancers } from "./param.js"
 import { libfigureObjectCopy, throw_up } from "./util.js"
-import {
-  FLATTEN_FORMAT_HTML,
-  FLATTEN_FORMAT_SAFE_TEXT,
-  FLATTEN_FORMAT_UNSAFE_TEXT,
-  Words,
-  words,
-} from "./words.js";
 
 // always freshly allocated
 function newFigure(optional_progression) {
@@ -26,7 +18,7 @@ function newFigure(optional_progression) {
   return m
 }
 
-export function figureBeats(f) {
+function figureBeats(f) {
   var defaultBeats = 8
   if (!f.move) return defaultBeats
   var idx = find_parameter_index_by_name("beats", parameters(f.move))
@@ -114,7 +106,7 @@ function find_parameter_index_by_name(name, parameters) {
 
 // ================
 
-export function parameter_strings(move, parameter_values, dialect) {
+function parameter_strings(move, parameter_values, dialect) {
   return parameter_strings_or_words(move, parameter_values, dialect, false)
 }
 
@@ -181,7 +173,7 @@ function heyLengthSubstitution(hey_length, dialect) {
 
 var moveSubstitutionPercentSRegexp = / *%S */g
 
-export function moveSubstitution(move_term, dialect) {
+function moveSubstitution(move_term, dialect) {
   var sub = moveSubstitutionWithEscape(move_term, dialect)
   return sub.replace(moveSubstitutionPercentSRegexp, " ").trim()
 }

external/libfigure/figure.js

@@ -13,10 +13,7 @@ import {
   defineRelatedMove2Way,
   goodBeatsMinMaxFn,
   goodBeatsMinFn,
-  moveSubstitution,
-  parameter_strings,
 } from "./define-figure.js"
-import { comma, words } from "./words.js";
 
 ////////////////////////////////////////////////
 // ALLEMANDE                                  //

external/libfigure/move.js

@@ -8,8 +8,6 @@
 // Properties of moves (strings).
 // Few dependencies to the rest of the system.
 
-import { deAliasMove  } from "./define-figure.js";
-
 var moveCaresAboutRotationsHash = {
   "do si do": true,
   allemande: true,
@@ -19,7 +17,7 @@ var moveCaresAboutRotationsHash = {
   "mad robin": true,
 }
 // it now seems to me that this should be defined by defineFigure -dm 03-07-2017
-export function moveCaresAboutRotations(move) {
+function moveCaresAboutRotations(move) {
   return moveCaresAboutRotationsHash[deAliasMove(move)]
 }
 
@@ -31,7 +29,7 @@ var moveCaresAboutPlacesHash = {
   "box circulate": true,
 }
 // it now seems to me that this should be defined by defineFigure -dm 03-07-2017
-export function moveCaresAboutPlaces(move) {
+function moveCaresAboutPlaces(move) {
   return moveCaresAboutPlacesHash[deAliasMove(move)]
 }
 
@@ -74,7 +72,7 @@ export const degreesToWords = function(degrees, optional_move) {
   return degrees.toString() + " degrees"
 }
 
-export function degreesToRotations(degrees) {
+function degreesToRotations(degrees) {
   if (degrees) {
     return degrees2rotations[degrees] || degrees.toString() + " degrees"
   } else {
@@ -82,7 +80,7 @@ export function degreesToRotations(degrees) {
   }
 }
 
-export function degreesToPlaces(degrees) {
+function degreesToPlaces(degrees) {
   if (degrees) {
     return degrees2places[degrees] || degrees.toString() + " degrees"
   } else {

external/libfigure/param.js

@@ -11,13 +11,7 @@
 //
 
 import { throw_up } from "./util.js"
-import { chooser, dancerMenuForChooser } from "./chooser.js"
-import {
-  degreesToPlaces,
-  degreesToRotations,
-  moveCaresAboutPlaces,
-  moveCaresAboutRotations,
-} from "./move.js";
+import { chooser } from "./chooser.js"
 
 const __params = {}
 
@@ -459,7 +453,7 @@ defineParam("lead_dancer_l1", {
   ui: "chooser_dancer",
 })
 
-export function formalParamIsDancers(param) {
+function formalParamIsDancers(param) {
   // harder to maintain implementation:
   // return ['who', 'who2', 'whom', 'lead'].indexOf(param.name) >= 0;
   return !!dancerMenuForChooser(param.ui)

external/libfigure/words.js

@@ -6,7 +6,7 @@ import {
 import { dancers } from "./chooser.js"
 import { moves } from "./define-figure.js"
 
-export function Words(arr) {
+function Words(arr) {
   this.arr = arr
 }
 

www/index.html

@@ -77,15 +77,6 @@
         background-color: hsl(180, 90%, 70%);
       }
 
-      .move {
-        list-style-type: none;
-        cursor: pointer;
-      }
-      .currentMove {
-        background-color: yellow;
-        list-style-type: '▶';
-      }
-
       .source {
         font-size: 0.8em;
         position: absolute;

www/js/interpreter.ts

@@ -536,7 +536,7 @@ function moveAsLowLevelMoves(move: Move, startingPos: Map<DancerIdentity, Semant
 
 function danceAsLowLevelMoves(moves: Move[], startingPos: Map<DancerIdentity, SemanticPosition>): Map<DancerIdentity, LowLevelMove[]> {
   const res = new Map<DancerIdentity, LowLevelMove[]>([...startingPos.keys()].map(id => [id, []]));
-  let currentPos = new Map<DancerIdentity, SemanticPosition>(startingPos);
+  let currentPos = startingPos;
   for (const move of moves) {
     const newMoves = moveAsLowLevelMoves(move, currentPos);
     for (const [id, newMoveList] of newMoves.entries()) {

www/js/main.ts

@@ -2,10 +2,8 @@ import * as animation from "./animation.js";
 import * as interpreter from "./interpreter.js";
 import * as renderer from "./renderer.js";
 import { DancerIdentity } from "./danceCommon.js";
-import { LibFigureDance, LibFigureMove, Move } from "./libfigureMapper.js";
+import { LibFigureDance, Move } from "./libfigureMapper.js";
 import { animateLowLevelMove, LowLevelMove } from "./lowLevelMove.js";
-import { figureBeats, figureToHtml } from "./libfigure/define-figure.js";
-import { labelForBeats } from "./libfigure/dance.js";
 
 const body = document.querySelector('body')!;
 
@@ -81,10 +79,6 @@ progressionLabel.htmlFor = 'progression';
 const playButton = document.createElement('button');
 playButton.innerText = "Play";
 
-const movesList = document.createElement('ul');
-
-wrapperDiv.appendChild(movesList);
-wrapperDiv.appendChild(document.createElement('br'));
 wrapperDiv.appendChild(bpmSelector);
 wrapperDiv.appendChild(bpmLabel);
 wrapperDiv.appendChild(playButton);
@@ -95,25 +89,14 @@ wrapperDiv.appendChild(document.createElement('br'));
 wrapperDiv.appendChild(beatSliderLabel);
 wrapperDiv.appendChild(beatDisplay);
 
-function drawAtCurrentBeat() {
-  r.drawSetsWithTrails(beatSlider.valueAsNumber, progressionSelector.valueAsNumber);
-
-  const currentMoves = movesList.getElementsByClassName('currentMove');
-  for (let i = 0; i < currentMoves.length; i++) {
-    currentMoves[i].classList.remove('currentMove');
-  }
-  movesList.getElementsByClassName('moveForBeat_' + Math.floor(beatSlider.valueAsNumber))[0]
-    .classList.add('currentMove');
-}
-
 beatSlider.addEventListener('input', (ev) => {
-  drawAtCurrentBeat();
+  r.drawSetsWithTrails(beatSlider.valueAsNumber, progressionSelector.valueAsNumber);
   beatDisplay.innerText = beatSlider.valueAsNumber.toFixed(1);
   restartAnimation(false);
 });
 
 progressionSelector.addEventListener('input', (ev) => {
-  drawAtCurrentBeat();
+  r.drawSetsWithTrails(beatSlider.valueAsNumber, progressionSelector.valueAsNumber);
   restartAnimation(false);
 });
 
@@ -148,61 +131,7 @@ playButton.addEventListener('click', (ev) => {
 });
 bpmSelector.addEventListener('change', (ev) => {
   restartAnimation(false);
-});
-
-// Two Hearts in Time by Isaac Banner. Selected arbitrarily.
-const exampleDance: LibFigureDance = [{ "parameter_values": [true, 8], "move": "petronella" }, { "parameter_values": [true, 8], "move": "petronella" }, { "parameter_values": ["neighbors", "balance", 16], "move": "swing" }, { "parameter_values": ["ladles", true, 540, 8], "move": "allemande" }, { "parameter_values": ["partners", "none", 8], "move": "swing" }, { "parameter_values": ["gentlespoons", 360, 6], "move": "mad robin" }, { "parameter_values": [true, 270, 6], "move": "circle" }, { "parameter_values": ["partners", 4], "move": "California twirl", "progression": 1 }];
-
-const dialect = {
-  moves: {},
-  dancers: {
-    ladle: "robin",
-    ladles: "robins",
-    gentlespoon: "lark",
-    gentlespoons: "larks",
-    "first ladle": "first robin",
-    "second ladle": "second robin",
-    "first gentlespoon": "first lark",
-    "second gentlespoon": "second lark",
-  },
-};
-
-let dance: LibFigureDance;
-function buildMovesList() {
-  removeAllChildNodes(movesList);
-
-  let currentBeat: number = 0;
-  let lastItem: HTMLLIElement | undefined;
-  for (const figure of dance) {
-    const startBeat = currentBeat;
-    currentBeat += figureBeats(figure);
-    const moveItem = document.createElement('li');
-    moveItem.innerHTML = "[" + labelForBeats(Math.floor(startBeat / 16) * 16) + " "
-      + "(" + startBeat + "-" + currentBeat + ")] "
-      + figureToHtml(figure, dialect);
-    moveItem.classList.add('move');
-    for (let beat = startBeat; beat < currentBeat; beat++) {
-      moveItem.classList.add('moveForBeat_' + beat);
-    }
-    if (startBeat === 0) moveItem.classList.add('currentMove');
-    moveItem.addEventListener('click', (ev) => {
-      setBeat(startBeat);
-      restartAnimation(false);
-    });
-    lastItem = moveItem;
-    movesList.appendChild(moveItem);
-  }
-  if (lastItem) {
-    lastItem.classList.add('moveForBeat_' + currentBeat);
-  }
-}
-
-function setBeat(beat: number) {
-  beatSlider.value = beat.toString();
-  beatDisplay.innerText = beat.toFixed(1);
-
-  drawAtCurrentBeat();
-}
+})
 function playAnimation(bpm: number, start: number, end: number) {
   const startTime = Date.now();
   const msPerBeat = (60 * 1000) / bpm;
@@ -224,7 +153,10 @@ function playAnimation(bpm: number, start: number, end: number) {
       changedProgression = true;
     }
 
-    setBeat(beat);
+    beatSlider.value = beat.toString();
+    beatDisplay.innerText = beat.toFixed(1);
+
+    r.drawSetsWithTrails(beat, progressionSelector.valueAsNumber);
     if (changedProgression) {
       restartAnimation(true);
       return;
@@ -235,6 +167,9 @@ function playAnimation(bpm: number, start: number, end: number) {
   anim();
 }
 
+// Two Hearts in Time by Isaac Banner. Selected arbitrarily.
+const exampleDance: LibFigureDance = [{ "parameter_values": [true, 8], "move": "petronella" }, { "parameter_values": [true, 8], "move": "petronella" }, { "parameter_values": ["neighbors", "balance", 16], "move": "swing" }, { "parameter_values": ["ladles", true, 540, 8], "move": "allemande" }, { "parameter_values": ["partners", "none", 8], "move": "swing" }, { "parameter_values": ["gentlespoons", 360, 6], "move": "mad robin" }, { "parameter_values": [true, 270, 6], "move": "circle" }, { "parameter_values": ["partners", 4], "move": "California twirl", "progression": 1 }];
+
 const danceJsonArea = document.createElement('textarea');
 danceJsonArea.value = JSON.stringify(exampleDance, undefined, 2);
 danceJsonArea.rows = 15;
@@ -245,9 +180,8 @@ wrapperDiv.appendChild(document.createElement('br'));
 wrapperDiv.appendChild(danceJsonArea);
 wrapperDiv.appendChild(loadDanceButton);
 
-const table = document.createElement('table');
-function loadDance() {
-  dance = JSON.parse(danceJsonArea.value);
+loadDanceButton.addEventListener('click', (ev) => {
+  const dance: LibFigureDance = JSON.parse(danceJsonArea.value);
   r.animation = interpreter.loadDance(dance);
   if (cancelAnim !== undefined) {
     cancelAnimationFrame(cancelAnim);
@@ -258,10 +192,7 @@ function loadDance() {
   beatDisplay.innerText = '0.0';
   r.drawSetsWithTrails(0);
   buildDebugTable();
-  buildMovesList();
-}
-loadDanceButton.addEventListener('click', loadDance);
-loadDance();
+});
 
 function createJsonCell(content: any, rowSpan?: number, id?: DancerIdentity) {
   const cell = document.createElement('td');
@@ -316,15 +247,13 @@ showDebugLabel.htmlFor = 'showDebug';
 body.appendChild(showDebug);
 body.appendChild(showDebugLabel);
 
+const table = document.createElement('table');
 table.id = 'debug'
 
-function removeAllChildNodes(html: HTMLElement) {
-  while (html.childNodes.length > 0) {
-    html.removeChild(html.childNodes[html.childNodes.length - 1]);
-  }
-}
 function buildDebugTable() {
-  removeAllChildNodes(table);
+  while (table.childNodes.length > 0) {
+    table.removeChild(table.childNodes[table.childNodes.length - 1]);
+  }
 
   const headerRow = document.createElement('tr');
   const roles = [DancerIdentity.OnesLark, DancerIdentity.OnesRobin,