light9 Changeset - c946ead4baf6

Changeset - c946ead4baf6

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

drewp@bigasterisk.com - 7 years ago 2018-06-01 02:34:32
drewp@bigasterisk.com

restore fade adjusters
Ignore-this: f356a5f2a1fe9fad2d0e578cf2898fd0

2 files changed with 22 insertions and 18 deletions:

light9/web/timeline/adjustable.coffee

light9/web/timeline/timeline.coffee

0 comments (0 inline, 0 general)

light9/web/timeline/adjustable.coffee

➞

Show inline comments

@@ @@ -137,36 +137,35 @@ class window.AdjustableFloatObject exten @@
     @config.graph.patchObject(@config.subj, @config.pred,
                               @config.graph.LiteralRoundedFloat(newValue),
                               @config.ctx)
 class window.AdjustableFade extends Adjustable
   constructor: (@yForV, @i0, @i1, @note, offset, ctx) ->
+  constructor: (@yForV, @zoomInX, @i0, @i1, @note, offset, ctx) ->
     super()
     @config = {
       getSuggestedTargetOffset: -> offset
       getTarget: @getTarget.bind(@)
       ctx: ctx
+    }
     @ctor2()
   getTarget: ->
     mid = @note.worldPts[@i0].x(.5).add(@note.worldPts[@i1].x(.5))
     $V([@note.zoomInX(mid.e(1)), @yForV(mid.e(2))])
     mid = @note.midPoint(@i0, @i1)
     $V([@zoomInX(mid.e(1)), @yForV(mid.e(2))])
   _getValue: ->
     mid = @note.worldPts[@i0].x(.5).add(@note.worldPts[@i1].x(.5))
     mid.e(1)
     @note.midPoint(@i0, @i1).e(1)
   continueDrag: (pos) ->
     # pos is vec2 of pixels relative to the drag start
     super(pos)
     graph = @note.graph
     U = (x) -> graph.Uri(x)
-    goalCenterSec = @note.zoomInX.invert(@initialTarget.e(1) + pos.e(1))
     goalCenterSec = @zoomInX.invert(@initialTarget.e(1) + pos.e(1))
     diamSec = @note.worldPts[@i1].e(1) - @note.worldPts[@i0].e(1)
     newSec0 = goalCenterSec - diamSec / 2
     newSec1 = goalCenterSec + diamSec / 2
     originSec = graph.floatValue(@note.uri, U(':originTime'))

light9/web/timeline/timeline.coffee

➞

Show inline comments

@@ @@ -486,23 +486,28 @@ class Note @@
     for curve in @graph.objects(subj, U(':curve'))
       if @graph.uriValue(curve, U(':attr')).equals(curveAttr)
         return @project.getCurvePoints(curve, originTime)
     throw new Error("curve #{@uri.value} has no attr #{curveAttr.value}")
   midPoint: (i0, i1) ->
     p0 = @worldPts[i0]
     p1 = @worldPts[i1]
     p0.x(.5).add(p1.x(.5))
   draw: ->
     if not @parentElem.isActiveNote(@uri)
       # stale redraw call
       return
     U = (x) => @graph.Uri(x)
     [pointUris, worldPts] = @getCurvePoints(@uri, U(':strength'))
+    [pointUris, @worldPts] = @getCurvePoints(@uri, U(':strength'))
     effect = @graph.uriValue(@uri, U(':effectClass'))
     yForV = (v) => @rowBotY + (@rowTopY - @rowBotY) * v
     dependOn = [@viewState.zoomSpec.t1(), @viewState.zoomSpec.t2(), @viewState.width()]
     screenPts = (new PIXI.Point(@viewState.zoomInX(pt.e(1)), yForV(pt.e(2))) for pt in worldPts)
+    screenPts = (new PIXI.Point(@viewState.zoomInX(pt.e(1)), yForV(pt.e(2))) for pt in @worldPts)
     @container.removeChildren()
     @graphics = new PIXI.Graphics({nativeLines: false})
     @graphics.interactive = true
     @container.addChild(@graphics)
@@ @@ -518,14 +523,14 @@ class Note @@
     @graphics.endFill()
     @_traceBorder(screenPts, 2, 0xffd900)
     @_addMouseBindings()
     curveWidthCalc = () => @project.curveWidth(worldPts)
     @_updateAdjusters(screenPts, worldPts, curveWidthCalc, yForV, @song)
     curveWidthCalc = () => @project.curveWidth(@worldPts)
     @_updateAdjusters(screenPts, @worldPts, curveWidthCalc, yForV, @viewState.zoomInX, @song)
     @_updateInlineAttrs(screenPts)
     @parentElem.noteDirty()
   _traceBorder: (screenPts, thick, color) ->
     @graphics.lineStyle(thick, color, 1)
     @graphics.moveTo(screenPts[0].x, screenPts[0].y)
@@ @@ -572,20 +577,20 @@ class Note @@
       return
     if @isDetached?
       return
     @_updateDisplay()
   _updateAdjusters: (screenPts, worldPts, curveWidthCalc, yForV, ctx) ->
+  _updateAdjusters: (screenPts, worldPts, curveWidthCalc, yForV, zoomInX, ctx) ->
     # todo: allow offset even on more narrow notes
     if screenPts[screenPts.length - 1].x - screenPts[0].x < 100 or screenPts[0].x > @parentElem.offsetWidth or screenPts[screenPts.length - 1].x < 0
       @clearAdjusters()
     else
       @_makeOffsetAdjuster(yForV, curveWidthCalc, ctx)
       @_makeCurvePointAdjusters(yForV, worldPts, ctx)
       @_makeFadeAdjusters(yForV, ctx, worldPts)
+      @_makeFadeAdjusters(yForV, zoomInX, ctx, worldPts)
   _updateInlineAttrs: (screenPts) ->
     w = 280
     leftX = Math.max(2, screenPts[Math.min(1, screenPts.length - 1)].x + 5)
     rightX = screenPts[Math.min(2, screenPts.length - 1)].x - 5
@@ @@ -653,22 +658,22 @@ class Note @@
         getValueForPos: (pos) =>
           @viewState.zoomInX.invert(pos.e(1)) - curveWidthCalc() / 2
         getSuggestedTargetOffset: () => $V([-10, 0])
       })
       adj
   _makeFadeAdjusters: (yForV, ctx, worldPts) ->
+  _makeFadeAdjusters: (yForV, zoomInX, ctx, worldPts) ->
     U = (x) => @graph.Uri(x)
     @_makeFadeAdjuster(yForV, ctx, @uri.value + '/fadeIn', 0, 1, $V([-50, -10]))
+    @_makeFadeAdjuster(yForV, zoomInX, ctx, @uri.value + '/fadeIn', 0, 1, $V([-50, -10]))
     n = worldPts.length
     @_makeFadeAdjuster(yForV, ctx, @uri.value + '/fadeOut', n - 2, n - 1, $V([50, -10]))
+    @_makeFadeAdjuster(yForV, zoomInX, ctx, @uri.value + '/fadeOut', n - 2, n - 1, $V([50, -10]))
   _makeFadeAdjuster: (yForV, ctx, adjId, i0, i1, offset) ->
     return # not ready- AdjustableFade looks in Note object
   _makeFadeAdjuster: (yForV, zoomInX, ctx, adjId, i0, i1, offset) ->
     @adjusterIds.add(adjId)
     @setAdjuster adjId, => new AdjustableFade(yForV, i0, i1, @, offset, ctx)
     @setAdjuster adjId, =>
       new AdjustableFade(yForV, zoomInX, i0, i1, @, offset, ctx)
   _suggestedOffset: (pt) ->
     if pt.e(2) > .5
       $V([0, 30])
     else
       $V([0, -30])

0 comments (0 inline, 0 general)