diff options
| author | François Frisch | 2012-03-19 17:19:17 -0700 |
|---|---|---|
| committer | François Frisch | 2012-03-19 18:30:22 -0700 |
| commit | 4de5574b6cd4ab4335867960f1f974a9a89778c7 (patch) | |
| tree | c30fdb396d8a1da8e8f69d58d33b176f6f394772 /node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.html | |
| parent | 5201941c1cc38bcec7c091a9ef00cf80e1779626 (diff) | |
| download | ninja-4de5574b6cd4ab4335867960f1f974a9a89778c7.tar.gz | |
Reformating carousel
Diffstat (limited to 'node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.html')
| -rwxr-xr-x | node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.html | 49 |
1 files changed, 6 insertions, 43 deletions
diff --git a/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.html b/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.html index 08b5ffa4..6774026b 100755 --- a/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.html +++ b/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.html | |||
| @@ -83,7 +83,7 @@ | |||
| 83 | "cameraRotationAxisX": 1, | 83 | "cameraRotationAxisX": 1, |
| 84 | "cameraRotationAxisY": 0, | 84 | "cameraRotationAxisY": 0, |
| 85 | "cameraRotationAxisZ": 0, | 85 | "cameraRotationAxisZ": 0, |
| 86 | "scale": 380 | 86 | "scale": 210 |
| 87 | }, | 87 | }, |
| 88 | "bindings": { | 88 | "bindings": { |
| 89 | "objects": { | 89 | "objects": { |
| @@ -92,8 +92,8 @@ | |||
| 92 | "oneway": true | 92 | "oneway": true |
| 93 | }, | 93 | }, |
| 94 | "path": { | 94 | "path": { |
| 95 | "boundObject": {"@": "pathLerp1"}, | 95 | "boundObject": {"@": "path2"}, |
| 96 | "boundObjectPropertyPath": "resultPath", | 96 | "boundObjectPropertyPath": "path", |
| 97 | "oneway": true | 97 | "oneway": true |
| 98 | }, | 98 | }, |
| 99 | "cameraRotationAngle": { | 99 | "cameraRotationAngle": { |
| @@ -113,20 +113,6 @@ | |||
| 113 | } | 113 | } |
| 114 | } | 114 | } |
| 115 | }, | 115 | }, |
| 116 | "path1": { | ||
| 117 | "module": "montage/ui/flow-path", | ||
| 118 | "name": "FlowPath", | ||
| 119 | "properties": { | ||
| 120 | "evalPath": [ | ||
| 121 | "path.translateX = slide.time-slide.index*155+50", | ||
| 122 | "path.translateY = (slide.index%3)*240", | ||
| 123 | "path.translateZ = -slide.time/3", | ||
| 124 | "path.rotateX = slide.speed/200", | ||
| 125 | "path.rotateY = 1", | ||
| 126 | "path.rotateZ = slide.time/500" | ||
| 127 | ] | ||
| 128 | } | ||
| 129 | }, | ||
| 130 | "path2": { | 116 | "path2": { |
| 131 | "module": "montage/ui/flow-path", | 117 | "module": "montage/ui/flow-path", |
| 132 | "name": "FlowPath", | 118 | "name": "FlowPath", |
| @@ -134,35 +120,12 @@ | |||
| 134 | "evalPath": [ | 120 | "evalPath": [ |
| 135 | "path.translateX = slide.time", | 121 | "path.translateX = slide.time", |
| 136 | "path.translateY = 0", | 122 | "path.translateY = 0", |
| 137 | "path.translateZ = slide.time*slide.time/-1500", | 123 | "path.translateZ = Math.pow(1.1, -slide.time*slide.time/30000)*600-600", |
| 138 | "path.rotateX = 0", | 124 | "path.rotateX = 0", |
| 139 | "path.rotateY = slide.time/1200", | 125 | "path.rotateY = 0", |
| 140 | "path.rotateZ = slide.speed/1500" | 126 | "path.rotateZ = slide.speed/1500" |
| 141 | ] | 127 | ] |
| 142 | } | 128 | } |
| 143 | }, | ||
| 144 | "pathLerp1": { | ||
| 145 | "module": "montage/ui/flow-path-lerp", | ||
| 146 | "name": "FlowPathLerp", | ||
| 147 | "properties": { | ||
| 148 | "interpolant": 1 | ||
| 149 | }, | ||
| 150 | "bindings": { | ||
| 151 | "path1": { | ||
| 152 | "boundObject": {"@": "path1"}, | ||
| 153 | "boundObjectPropertyPath": "path", | ||
| 154 | "oneway": true | ||
| 155 | }, | ||
| 156 | "path2": { | ||
| 157 | "boundObject": {"@": "path2"}, | ||
| 158 | "boundObjectPropertyPath": "path", | ||
| 159 | "oneway": true | ||
| 160 | }, | ||
| 161 | "interpolant": { | ||
| 162 | "boundObject": {"@": "slider1"}, | ||
| 163 | "boundObjectPropertyPath": "value" | ||
| 164 | } | ||
| 165 | } | ||
| 166 | } | 129 | } |
| 167 | 130 | ||
| 168 | } | 131 | } |
| @@ -172,7 +135,7 @@ | |||
| 172 | <body> | 135 | <body> |
| 173 | 136 | ||
| 174 | <div data-montage-id="montage-google-picasa-carousel" class="montage-google-picasa-carousel"> | 137 | <div data-montage-id="montage-google-picasa-carousel" class="montage-google-picasa-carousel"> |
| 175 | <div id="flow" class="flow" style="-webkit-perspective: 1400px; -webkit-transform-style: preserve-3d; width:800px; height:320px; border:1px;"> | 138 | <div id="flow" class="flow" style="-webkit-perspective: 1400px; -webkit-transform-style: preserve-3d; width:800px; height:160px; border:1px;"> |
| 176 | <img id="image" class="image"/> | 139 | <img id="image" class="image"/> |
| 177 | </div> | 140 | </div> |
| 178 | </div> | 141 | </div> |