Mercurial > MadButterfly

changeset 858:ed49dc0a26f1 abs_n_rel_center

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move lightbar to correct position when it being up
author Thinker K.F. Li <thinker@codemud.net>
date Mon, 20 Sep 2010 22:43:44 +0800
parents ea1e88c40548
children e2bf6a93bb1c
files nodejs/animate.js nodejs/desktop.svg nodejs/testdesktop.js
diffstat 3 files changed, 70 insertions(+), 71 deletions(-) [+]
line wrap: on
line diff
--- a/nodejs/animate.js	Mon Sep 20 22:43:44 2010 +0800
+++ b/nodejs/animate.js	Mon Sep 20 22:43:44 2010 +0800
@@ -139,7 +139,6 @@
     mtx = multiply(scale, sh1);
     mtx = multiply(sh2, mtx);
     mtx = multiply(this.orig_mtx, mtx);
-    sys.puts([obj[0], obj[1], obj[2], obj[3], obj[4], obj[5]]);
     obj[0] = mtx[0];
     obj[1] = mtx[1];
     obj[2] = mtx[2];
--- a/nodejs/desktop.svg	Mon Sep 20 22:43:44 2010 +0800
+++ b/nodejs/desktop.svg	Mon Sep 20 22:43:44 2010 +0800
@@ -154,15 +154,15 @@
      inkscape:pageshadow="2"
      inkscape:zoom="1.56875"
      inkscape:cx="207.9"
-     inkscape:cy="240"
+     inkscape:cy="189.00398"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
-     inkscape:window-width="1920"
-     inkscape:window-height="1006"
-     inkscape:window-x="0"
-     inkscape:window-y="25"
-     inkscape:window-maximized="1" />
+     inkscape:window-width="1440"
+     inkscape:window-height="900"
+     inkscape:window-x="-1"
+     inkscape:window-y="-1"
+     inkscape:window-maximized="0" />
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -223,19 +223,19 @@
        inkscape:bbox-width="85.598946"
        inkscape:bbox-height="84.588799">
       <image
-         sodipodi:absref="/home/wycc/devel/md3/MadButterfly/nodejs/video.png"
+         sodipodi:absref="/usr/home/thinker/progm/MadButterfly/nodejs/video.png"
          xlink:href="video.png"
-         width="85.598946"
-         height="84.588799"
-         id="image2983"
-         x="63.266537"
+         inkscape:bbox-height="84.588799"
+         inkscape:bbox-width="85.598946"
+         inkscape:bbox-y="383.87928"
+         inkscape:bbox-x="35.992421"
+         inkscape:transform-center-y="0"
+         inkscape:transform-center-x="0"
          y="809.55243"
-         inkscape:transform-center-x="0"
-         inkscape:transform-center-y="0"
-         inkscape:bbox-x="35.992421"
-         inkscape:bbox-y="383.87928"
-         inkscape:bbox-width="85.598946"
-         inkscape:bbox-height="84.588799" />
+         x="63.266537"
+         id="image2983"
+         height="84.588799"
+         width="85.598946" />
     </g>
     <g
        id="g2917-8"
@@ -248,19 +248,19 @@
        inkscape:bbox-width="86.5"
        inkscape:bbox-height="76.928574">
       <image
-         sodipodi:absref="/home/wycc/devel/md3/MadButterfly/nodejs/music.png"
+         sodipodi:absref="/usr/home/thinker/progm/MadButterfly/nodejs/music.png"
          xlink:href="music.png"
-         width="86.5"
-         height="76.928574"
-         id="image3048"
-         x="63.00946"
+         inkscape:bbox-height="76.928574"
+         inkscape:bbox-width="86.5"
+         inkscape:bbox-y="386.37278"
+         inkscape:bbox-x="189.7836"
+         inkscape:transform-center-y="0"
+         inkscape:transform-center-x="0"
          y="814.71918"
-         inkscape:transform-center-x="0"
-         inkscape:transform-center-y="0"
-         inkscape:bbox-x="189.7836"
-         inkscape:bbox-y="386.37278"
-         inkscape:bbox-width="86.5"
-         inkscape:bbox-height="76.928574" />
+         x="63.00946"
+         id="image3048"
+         height="76.928574"
+         width="86.5" />
     </g>
     <g
        id="g2917-88"
@@ -273,19 +273,19 @@
        inkscape:bbox-width="84"
        inkscape:bbox-height="76.14286">
       <image
-         sodipodi:absref="/home/wycc/devel/md3/MadButterfly/nodejs/photo.png"
+         sodipodi:absref="/usr/home/thinker/progm/MadButterfly/nodejs/photo.png"
          xlink:href="photo.png"
-         width="84"
-         height="76.14286"
-         id="image3049"
-         x="63.624115"
+         inkscape:bbox-height="76.14286"
+         inkscape:bbox-width="84"
+         inkscape:bbox-y="392.95458"
+         inkscape:bbox-x="354.2955"
+         inkscape:transform-center-y="0"
+         inkscape:transform-center-x="0"
          y="809.93323"
-         inkscape:transform-center-x="0"
-         inkscape:transform-center-y="0"
-         inkscape:bbox-x="354.2955"
-         inkscape:bbox-y="392.95458"
-         inkscape:bbox-width="84"
-         inkscape:bbox-height="76.14286" />
+         x="63.624115"
+         id="image3049"
+         height="76.14286"
+         width="84" />
     </g>
     <g
        id="g2917-8-6"
@@ -298,19 +298,19 @@
        inkscape:bbox-width="84.571426"
        inkscape:bbox-height="75.14286">
       <image
-         sodipodi:absref="/home/wycc/devel/md3/MadButterfly/nodejs/tool.png"
+         sodipodi:absref="/usr/home/thinker/progm/MadButterfly/nodejs/tool.png"
          xlink:href="tool.png"
-         width="84.571426"
-         height="75.14286"
-         id="image3168"
-         x="63.521473"
+         inkscape:bbox-height="75.14286"
+         inkscape:bbox-width="84.571426"
+         inkscape:bbox-y="389.0568"
+         inkscape:bbox-x="526.42387"
+         inkscape:transform-center-y="0"
+         inkscape:transform-center-x="0"
          y="810.79041"
-         inkscape:transform-center-x="0"
-         inkscape:transform-center-y="0"
-         inkscape:bbox-x="526.42387"
-         inkscape:bbox-y="389.0568"
-         inkscape:bbox-width="84.571426"
-         inkscape:bbox-height="75.14286" />
+         x="63.521473"
+         id="image3168"
+         height="75.14286"
+         width="84.571426" />
     </g>
     <rect
        style="fill:#dfdf49;fill-opacity:1"
@@ -336,8 +336,8 @@
        id="text2931"
        inkscape:transform-center-x="0"
        inkscape:transform-center-y="0"
-       inkscape:bbox-x="140.30434"
-       inkscape:bbox-y="273.84843"
+       inkscape:bbox-x="126.28044"
+       inkscape:bbox-y="271.84843"
        inkscape:bbox-width="488.15625"
        inkscape:bbox-height="32.382812"
        mbname="line1"><tspan
@@ -348,8 +348,8 @@
          y="185.925"
          id="tspan2935"
          style="font-size:16px"
-         inkscape:bbox-x="140.56215"
-         inkscape:bbox-y="290.74687"
+         inkscape:bbox-x="126.53825"
+         inkscape:bbox-y="288.74687"
          inkscape:bbox-width="487.89844"
          inkscape:bbox-height="15.484375">Lim JeongHee (J.Lim) &amp; JoKwon (2AM) - The Road to Break Up</tspan><tspan
          sodipodi:role="line"
@@ -358,8 +358,8 @@
          x="124.96794"
          y="205.925"
          style="font-size:16px"
-         inkscape:bbox-x="140.30434"
-         inkscape:bbox-y="273.84843"
+         inkscape:bbox-x="126.28044"
+         inkscape:bbox-y="271.84843"
          inkscape:bbox-width="75.335938"
          inkscape:bbox-height="12.101562"
          id="tspan2941">7:00-7:30</tspan></text>
@@ -372,7 +372,7 @@
        inkscape:transform-center-x="0"
        inkscape:transform-center-y="0"
        inkscape:bbox-x="126.28044"
-       inkscape:bbox-y="212.01578"
+       inkscape:bbox-y="210.01578"
        inkscape:bbox-width="488.15625"
        inkscape:bbox-height="32.382812"
        mbname="line2"><tspan
@@ -384,7 +384,7 @@
          id="tspan2935-1"
          style="font-size:16px"
          inkscape:bbox-x="126.53825"
-         inkscape:bbox-y="228.91422"
+         inkscape:bbox-y="226.91422"
          inkscape:bbox-width="487.89844"
          inkscape:bbox-height="15.484375">Lim JeongHee (J.Lim) &amp; JoKwon (2AM) - The Road to Break Up</tspan><tspan
          sodipodi:role="line"
@@ -394,7 +394,7 @@
          y="267.75766"
          style="font-size:16px"
          inkscape:bbox-x="126.28044"
-         inkscape:bbox-y="212.01578"
+         inkscape:bbox-y="210.01578"
          inkscape:bbox-width="75.335938"
          inkscape:bbox-height="12.101562"
          id="tspan2941-9">7:30-8:30</tspan></text>
@@ -407,7 +407,7 @@
        inkscape:transform-center-x="0"
        inkscape:transform-center-y="0"
        inkscape:bbox-x="126.05388"
-       inkscape:bbox-y="150.18311"
+       inkscape:bbox-y="152.18311"
        inkscape:bbox-width="488.38281"
        inkscape:bbox-height="32.382812"
        mbname="line3"><tspan
@@ -419,7 +419,7 @@
          id="tspan2935-2"
          style="font-size:16px"
          inkscape:bbox-x="126.53825"
-         inkscape:bbox-y="167.08154"
+         inkscape:bbox-y="169.08154"
          inkscape:bbox-width="487.89844"
          inkscape:bbox-height="15.484375">Lim JeongHee (J.Lim) &amp; JoKwon (2AM) - The Road to Break Up</tspan><tspan
          sodipodi:role="line"
@@ -429,8 +429,8 @@
          y="329.59033"
          style="font-size:16px"
          inkscape:bbox-x="126.05388"
-         inkscape:bbox-y="150.18311"
-         inkscape:bbox-width="85.75"
+         inkscape:bbox-y="152.18311"
+         inkscape:bbox-width="75.5625"
          inkscape:bbox-height="12.101562"
          id="tspan2941-0">8:30-9:30</tspan></text>
     <text
@@ -442,7 +442,7 @@
        inkscape:transform-center-x="0"
        inkscape:transform-center-y="0"
        inkscape:bbox-x="125.97575"
-       inkscape:bbox-y="88.350433"
+       inkscape:bbox-y="90.350433"
        inkscape:bbox-width="488.46094"
        inkscape:bbox-height="32.382812"
        mbname="line4"><tspan
@@ -454,7 +454,7 @@
          id="tspan2935-11"
          style="font-size:16px"
          inkscape:bbox-x="126.53825"
-         inkscape:bbox-y="105.24887"
+         inkscape:bbox-y="107.24887"
          inkscape:bbox-width="487.89844"
          inkscape:bbox-height="15.484375">Lim JeongHee (J.Lim) &amp; JoKwon (2AM) - The Road to Break Up</tspan><tspan
          sodipodi:role="line"
@@ -464,7 +464,7 @@
          y="391.423"
          style="font-size:16px"
          inkscape:bbox-x="125.97575"
-         inkscape:bbox-y="88.350433"
+         inkscape:bbox-y="90.350433"
          inkscape:bbox-width="85.828125"
          inkscape:bbox-height="12.101562"
          id="tspan2941-90">9:30-10:30</tspan></text>
@@ -477,7 +477,7 @@
        inkscape:transform-center-x="0"
        inkscape:transform-center-y="0"
        inkscape:bbox-x="126.53825"
-       inkscape:bbox-y="26.517761"
+       inkscape:bbox-y="28.517761"
        inkscape:bbox-width="487.89844"
        inkscape:bbox-height="32.382812"
        mbname="line5"><tspan
@@ -489,7 +489,7 @@
          id="tspan2935-7"
          style="font-size:16px"
          inkscape:bbox-x="126.53825"
-         inkscape:bbox-y="43.416199"
+         inkscape:bbox-y="45.416199"
          inkscape:bbox-width="487.89844"
          inkscape:bbox-height="15.484375">Lim JeongHee (J.Lim) &amp; JoKwon (2AM) - The Road to Break Up</tspan><tspan
          sodipodi:role="line"
@@ -499,7 +499,7 @@
          y="453.25568"
          style="font-size:16px"
          inkscape:bbox-x="126.72575"
-         inkscape:bbox-y="26.517761"
+         inkscape:bbox-y="28.517761"
          inkscape:bbox-width="95.265625"
          inkscape:bbox-height="12.101562"
          id="tspan2941-7">10:30-11:30</tspan></text>
--- a/nodejs/testdesktop.js	Mon Sep 20 22:43:44 2010 +0800
+++ b/nodejs/testdesktop.js	Mon Sep 20 22:43:44 2010 +0800
@@ -64,7 +64,7 @@
 	return;
     }
     var target = lines[line];
-    var sy = target.center.y - 20 - lightbar.center.y;
+    var sy = target.center.y - lightbar.center.y;
     sys.puts(sy);
     var an = new animate.linear(app,lightbar,0,sy,0.3);
     an.start();