light9 Changeset - e0e5f2dce1a6

Changeset - e0e5f2dce1a6

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Drew Perttula - 7 years ago 2018-05-08 06:24:37
drewp@bigasterisk.com

get some notes drawing, barely
Ignore-this: c4c667e1edab798c28c0a7416ffe2e09

1 file changed with 25 insertions and 18 deletions:

light9/web/timeline/timeline.coffee

0 comments (0 inline, 0 general)

light9/web/timeline/timeline.coffee

➞

Show inline comments

@@ @@ -73,8 +73,9 @@ class Project @@
     worldPts = []
     uris = @graph.objects(curve, @graph.Uri(':point'))
     for pt in uris
       v = $V([xOffset + @graph.floatValue(pt, @graph.Uri(':time')),
               @graph.floatValue(pt, @graph.Uri(':value'))])
       tm = @graph.floatValue(pt, @graph.Uri(':time'))
       val = @graph.floatValue(pt, @graph.Uri(':value'))
       v = $V([xOffset + tm, val])
       v.uri = pt
       worldPts.push(v)
     worldPts.sort((a,b) -> a.e(1) > b.e(1))
@@ @@ -98,6 +99,7 @@ class TimelineEditor extends Polymer.Ele @@
     viewState: { type: Object }
     debug: {type: String}
     graph: {type: Object, notify: true}
     project: {type: Object}
     setAdjuster: {type: Function, notify: true}
     playerSong: {type: String, notify: true}
     followPlayerSong: {type: Boolean, notify: true, value: true}
@@ @@ -113,18 +115,20 @@ class TimelineEditor extends Polymer.Ele @@
   @listeners:
     'iron-resize': '_onIronResize'
   @observers: [
     'setSong(playerSong, followPlayerSong)'
     'setSong(playerSong, followPlayerSong)',
     'onGraph(graph)',
+    ]
   _onIronResize: ->
     @width(@offsetWidth)
   _onSongTime: (t) ->
     @viewState.cursor.t(t)
+    #@viewState.cursor.t(t)
   _onSongDuration: (d) ->
     d = 700 if d < 1 # bug is that asco isn't giving duration, but 0 makes the scale corrupt
     @viewState.zoomSpec.duration(d)
+    #@viewState.zoomSpec.duration(d)
   setSong: (s) ->
     @song = @playerSong if @followPlayerSong
   onGraph: (graph) ->
     @project = new Project(graph)
   connectedCallback: ->
     super.connectedCallback()
     ko.options.deferUpdates = true;
@@ @@ -164,13 +168,14 @@ class TimelineEditor extends Polymer.Ele @@
+    "
   attached: ->
     super()
     @dia = @$.dia
     ko.computed(@zoomOrLayoutChanged.bind(@))
     ko.computed(@songTimeChanged.bind(@))
     @trackMouse()
     @bindKeys()
-    @bindWheelZoom(@dia.querySelector('svg'))
     @bindWheelZoom(@dia)
     @forwardMouseEventsToAdjustersCanvas()
     @makeZoomAdjs()
@@ @@ -363,7 +368,7 @@ class TimeZoomed extends Polymer.Element @@
     zoom: { type: Object, notify: true, observer: 'onZoom' } # viewState.zoomSpec
     zoomFlattened: { type: Object, notify: true }
   @observers: [
     'onGraph(graph, setAdjuster, song, zoomInX)'
+    'onGraph(graph, setAdjuster, song, zoomInX, project)'
+  ]
   @listeners: {'iron-resize': 'update'}
   update: ->
@@ @@ -376,9 +381,8 @@ class TimeZoomed extends Polymer.Element @@
       @zoomFlattened = ko.toJS(@zoom)
     ko.computed(updateZoomFlattened.bind(@))
   connectedCallback: ->
      super.connectedCallback()
   constructor: ->
     super()
      @stage = new PIXI.Container()
      @renderer = PIXI.autoDetectRenderer({
@@ @@ -386,9 +390,11 @@ class TimeZoomed extends Polymer.Element @@
      })
   connectedCallback: ->
     super.connectedCallback()
      @$.rows.appendChild(@renderer.view);
      # iron-resize should be doing this but it never fires
      setInterval(@update.bind(@), 1000)
@@ @@ -398,7 +404,7 @@ class TimeZoomed extends Polymer.Element @@
     U = (x) => @graph.Uri(x)
     log('assign rows',@song, 'graph has', @graph.quads().length)
     graphics = new PIXI.Graphics()
+    graphics = new PIXI.Graphics({nativeLines: true})
     for uri in _.sortBy(@graph.objects(@song, U(':note')), 'uri')
       #should only make new ones
@@ @@ -413,16 +419,16 @@ class TimeZoomed extends Polymer.Element @@
           [@pointUris, @worldPts] = @project.getCurvePoints(curve, originTime)
           curveWidthCalc = () => @_curveWidth(@worldPts)
           screenPts = ($V([@zoomInX(pt.e(1)), @offsetTop + (1 - pt.e(2)) * @offsetHeight]) for pt in @worldPts)
           h = 150 #@offsetHeight
           screenPts = ($V([@zoomInX(pt.e(1)), @offsetTop + (1 - pt.e(2)) * h]) for pt in @worldPts)
           graphics.beginFill(0xFF3300);
-          graphics.lineStyle(2, 0xffd900, 1);
+          graphics.lineStyle(4, 0xffd900, 1)
           graphics.moveTo(screenPts[0].e(1), screenPts[0].e(2))
           for p in screenPts
+          for p in screenPts.slice(1)
             graphics.lineTo(p.e(1), p.e(2))
-         graphics.endFill();
          graphics.endFill()
      @rows = []#(new NoteRow(@graph, @dia, @song, @zoomInX, @noteUris, i, @selection) for i in [0...ROW_COUNT])
@@ @@ -573,6 +579,7 @@ class Note @@
         @_updateAdjusters(screenPts, curveWidthCalc, yForV, U(@song))
         @_updateInlineAttrs(screenPts)
     return
   _updateAdjusters: (screenPts, curveWidthCalc, yForV, ctx) ->
     if screenPts[screenPts.length - 1].e(1) - screenPts[0].e(1) < 100
       @clearAdjusters()

0 comments (0 inline, 0 general)