From 4de5574b6cd4ab4335867960f1f974a9a89778c7 Mon Sep 17 00:00:00 2001 From: François Frisch Date: Mon, 19 Mar 2012 17:19:17 -0700 Subject: Reformating carousel --- .../ui/picasa-carousel.reel/picasa-carousel.html | 49 +++------------------- 1 file changed, 6 insertions(+), 43 deletions(-) (limited to 'node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.html') 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 @@ "cameraRotationAxisX": 1, "cameraRotationAxisY": 0, "cameraRotationAxisZ": 0, - "scale": 380 + "scale": 210 }, "bindings": { "objects": { @@ -92,8 +92,8 @@ "oneway": true }, "path": { - "boundObject": {"@": "pathLerp1"}, - "boundObjectPropertyPath": "resultPath", + "boundObject": {"@": "path2"}, + "boundObjectPropertyPath": "path", "oneway": true }, "cameraRotationAngle": { @@ -113,20 +113,6 @@ } } }, - "path1": { - "module": "montage/ui/flow-path", - "name": "FlowPath", - "properties": { - "evalPath": [ - "path.translateX = slide.time-slide.index*155+50", - "path.translateY = (slide.index%3)*240", - "path.translateZ = -slide.time/3", - "path.rotateX = slide.speed/200", - "path.rotateY = 1", - "path.rotateZ = slide.time/500" - ] - } - }, "path2": { "module": "montage/ui/flow-path", "name": "FlowPath", @@ -134,35 +120,12 @@ "evalPath": [ "path.translateX = slide.time", "path.translateY = 0", - "path.translateZ = slide.time*slide.time/-1500", + "path.translateZ = Math.pow(1.1, -slide.time*slide.time/30000)*600-600", "path.rotateX = 0", - "path.rotateY = slide.time/1200", + "path.rotateY = 0", "path.rotateZ = slide.speed/1500" ] } - }, - "pathLerp1": { - "module": "montage/ui/flow-path-lerp", - "name": "FlowPathLerp", - "properties": { - "interpolant": 1 - }, - "bindings": { - "path1": { - "boundObject": {"@": "path1"}, - "boundObjectPropertyPath": "path", - "oneway": true - }, - "path2": { - "boundObject": {"@": "path2"}, - "boundObjectPropertyPath": "path", - "oneway": true - }, - "interpolant": { - "boundObject": {"@": "slider1"}, - "boundObjectPropertyPath": "value" - } - } } } @@ -172,7 +135,7 @@

-- cgit v1.2.3