diff options
author | Jose Antonio Marquez | 2012-02-02 18:00:45 -0800 |
---|---|---|
committer | Jose Antonio Marquez | 2012-02-02 18:00:45 -0800 |
commit | 04d89daed90c35a4393773ca2e2d0ac3a4c15cd4 (patch) | |
tree | d0041abc7379ef38b20cce148e5dea6f531b8569 /node_modules/montage/ui/flow-path-cubic.js | |
parent | 4d8306b638c53899403a4f0328c02bf1ab893e8f (diff) | |
parent | c630ead20487c3948fa36448d3e7d5f7b5cba782 (diff) | |
download | ninja-04d89daed90c35a4393773ca2e2d0ac3a4c15cd4.tar.gz |
Merge branch 'refs/heads/NinjaInternal' into FileIO
Conflicts:
.gitignore
js/ninja.reel/ninja.js
Diffstat (limited to 'node_modules/montage/ui/flow-path-cubic.js')
-rwxr-xr-x | node_modules/montage/ui/flow-path-cubic.js | 32 |
1 files changed, 13 insertions, 19 deletions
diff --git a/node_modules/montage/ui/flow-path-cubic.js b/node_modules/montage/ui/flow-path-cubic.js index 989b19ad..a4be0dbe 100755 --- a/node_modules/montage/ui/flow-path-cubic.js +++ b/node_modules/montage/ui/flow-path-cubic.js | |||
@@ -1,18 +1,12 @@ | |||
1 | /* <copyright> | ||
2 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
3 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
5 | </copyright> */ | ||
6 | |||
7 | var Montage = require("montage").Montage; | 1 | var Montage = require("montage").Montage; |
8 | 2 | ||
9 | var FlowPathCubic = exports.FlowPathCubic = Montage.create(Montage, { | 3 | var FlowPathCubic = exports.FlowPathCubic = Montage.create(Montage, { |
10 | 4 | ||
11 | _variable: { | 5 | _variable: { |
12 | enumerable: false, | 6 | enumerable: false, |
13 | value: "time" | 7 | value: "time" |
14 | }, | 8 | }, |
15 | 9 | ||
16 | variable: { | 10 | variable: { |
17 | get: function () { | 11 | get: function () { |
18 | return this._variable; | 12 | return this._variable; |
@@ -29,12 +23,12 @@ var FlowPathCubic = exports.FlowPathCubic = Montage.create(Montage, { | |||
29 | this._updatePath(); | 23 | this._updatePath(); |
30 | } | 24 | } |
31 | }, | 25 | }, |
32 | 26 | ||
33 | _a: { | 27 | _a: { |
34 | enumerable: false, | 28 | enumerable: false, |
35 | value: 0 | 29 | value: 0 |
36 | }, | 30 | }, |
37 | 31 | ||
38 | a: { | 32 | a: { |
39 | get: function () { | 33 | get: function () { |
40 | return this._a; | 34 | return this._a; |
@@ -49,7 +43,7 @@ var FlowPathCubic = exports.FlowPathCubic = Montage.create(Montage, { | |||
49 | enumerable: false, | 43 | enumerable: false, |
50 | value: 0 | 44 | value: 0 |
51 | }, | 45 | }, |
52 | 46 | ||
53 | b: { | 47 | b: { |
54 | get: function () { | 48 | get: function () { |
55 | return this._b; | 49 | return this._b; |
@@ -64,7 +58,7 @@ var FlowPathCubic = exports.FlowPathCubic = Montage.create(Montage, { | |||
64 | enumerable: false, | 58 | enumerable: false, |
65 | value: 0 | 59 | value: 0 |
66 | }, | 60 | }, |
67 | 61 | ||
68 | c: { | 62 | c: { |
69 | get: function () { | 63 | get: function () { |
70 | return this._c; | 64 | return this._c; |
@@ -79,7 +73,7 @@ var FlowPathCubic = exports.FlowPathCubic = Montage.create(Montage, { | |||
79 | enumerable: false, | 73 | enumerable: false, |
80 | value: 0 | 74 | value: 0 |
81 | }, | 75 | }, |
82 | 76 | ||
83 | d: { | 77 | d: { |
84 | get: function () { | 78 | get: function () { |
85 | return this._d; | 79 | return this._d; |
@@ -89,12 +83,12 @@ var FlowPathCubic = exports.FlowPathCubic = Montage.create(Montage, { | |||
89 | this._updatePath(); | 83 | this._updatePath(); |
90 | } | 84 | } |
91 | }, | 85 | }, |
92 | 86 | ||
93 | _path: { | 87 | _path: { |
94 | enumerable: false, | 88 | enumerable: false, |
95 | value: "0" | 89 | value: "0" |
96 | }, | 90 | }, |
97 | 91 | ||
98 | path: { | 92 | path: { |
99 | get: function () { | 93 | get: function () { |
100 | return this._path; | 94 | return this._path; |
@@ -103,13 +97,13 @@ var FlowPathCubic = exports.FlowPathCubic = Montage.create(Montage, { | |||
103 | this._path = value; | 97 | this._path = value; |
104 | } | 98 | } |
105 | }, | 99 | }, |
106 | 100 | ||
107 | _updatePath: { | 101 | _updatePath: { |
108 | enumerable: false, | 102 | enumerable: false, |
109 | value: function () { | 103 | value: function () { |
110 | var s = "slide."+this._variable; | 104 | var s = "slide."+this._variable; |
111 | 105 | ||
112 | this.path = "("+this._a+")*"+s+"*"+s+"*"+s+"+("+this._b+")*"+s+"*"+s+"+("+this._c+")*"+s+"+("+this._d+")"; | 106 | this.path = "("+this._a+")*"+s+"*"+s+"*"+s+"+("+this._b+")*"+s+"*"+s+"+("+this._c+")*"+s+"+("+this._d+")"; |
113 | } | 107 | } |
114 | } | 108 | } |
115 | }); \ No newline at end of file | 109 | }); |