From: Vincent Vanwaelscappel Date: Thu, 29 Nov 2018 17:50:45 +0000 (+0100) Subject: wip #2384 @4 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=662a5c15604fb71ab1935d011caa72240f7fc391;p=Animations.git wip #2384 @4 --- diff --git a/AccorHotel-p12-13/AccorHotel-p12-13.zip b/AccorHotel-p12-13/AccorHotel-p12-13.zip new file mode 100644 index 0000000..80eb5f0 Binary files /dev/null and b/AccorHotel-p12-13/AccorHotel-p12-13.zip differ diff --git a/AccorHotel-p12-13/index.html b/AccorHotel-p12-13/index.html new file mode 100644 index 0000000..68af30a --- /dev/null +++ b/AccorHotel-p12-13/index.html @@ -0,0 +1 @@ +

\ No newline at end of file diff --git a/AccorHotel-p12-13/main.css b/AccorHotel-p12-13/main.css new file mode 100644 index 0000000..dee5067 --- /dev/null +++ b/AccorHotel-p12-13/main.css @@ -0,0 +1,20 @@ +body { + transition: opacity 0.5s; + opacity: 0; +} +#p14-imageholder-1, +#p15-imageholder-1 { + transition: transform 20s; + transform: scale(1.5); +} +#p14-imageholder-1.animate, +#p15-imageholder-1.animate { + transform: scale(1); +} +#p14-imageholder-1 { + transform-origin: 100% 50%; +} +#p15-imageholder-1 { + transform-origin: 0% 50%; +} +/*# sourceMappingURL=main.css.map */ \ No newline at end of file diff --git a/AccorHotel-p12-13/main.css.map b/AccorHotel-p12-13/main.css.map new file mode 100644 index 0000000..447386a --- /dev/null +++ b/AccorHotel-p12-13/main.css.map @@ -0,0 +1 @@ +{"version":3,"sources":["main.less"],"names":[],"mappings":"AAAA;EACC,wBAAA;EACA,UAAA;;AAID;AAAmB;EAClB,yBAAA;EACA,WAAW,UAAX;;AACA,kBAAC;AAAD,kBAAC;EACA,WAAW,QAAX;;AAGF;EACC,0BAAA;;AAGD;EACC,wBAAA","file":"main.css"} \ No newline at end of file diff --git a/AccorHotel-p12-13/main.js b/AccorHotel-p12-13/main.js new file mode 100644 index 0000000..6d591c2 --- /dev/null +++ b/AccorHotel-p12-13/main.js @@ -0,0 +1,148 @@ +$(function () { + setTimeout(start, 1000); +}); + +function start() { + $('body').css('opacity', 1); + $("#p15-imageholder-1,#p14-imageholder-1").addClass('animate'); + + var areas = { + "NA": { + "delay": 0, + "transition": "left", + "area": "#p14-u-211,#p14-u-212,#p14-u-213,#p14-u-214,#p14-u-215,#p14-u-216,#p14-u-217,#p14-u-218,#p14-u-219,#p14-u-220,#p14-u-221,#p14-u-222,#p14-u-223,#p14-u-224,#p14-u-225,#p14-u-226,#p14-u-227,#p14-u-228,#p14-u-229,#p14-u-230,#p14-u-231,#p14-u-232,#p14-u-233,#p14-u-234,#p14-u-235,#p14-u-236,#p14-u-237,#p14-u-238,#p14-u-239,#p14-u-240,#p14-u-241,#p14-u-242,#p14-u-243,#p14-u-244,#p14-u-245,#p14-u-246,#p14-u-247,#p14-u-248,#p14-u-249,#p14-u-250,#p14-u-251,#p14-u-252,#p14-u-253" + }, + "note": { + "delay": 0, + "transition": "opacity", + "area": "#p14-u-312,#p14-u-313,#p14-u-314,#p14-u-315,#p14-u-316,#p14-u-317,#p14-u-318,#p14-u-319,#p14-u-320,#p14-u-321,#p14-u-322,#p14-u-323,#p14-u-324,#p14-u-325,#p14-u-326,#p14-u-327,#p14-u-328,#p14-u-329,#p14-u-330,#p14-u-331,#p14-u-332,#p14-u-333,#p14-u-334,#p14-u-335,#p14-u-336,#p14-u-337,#p14-u-338,#p14-u-339,#p14-u-340,#p14-u-341,#p14-u-342,#p14-u-343,#p14-u-344,#p14-u-345,#p14-u-346,#p14-u-347,#p14-u-348,#p14-u-349,#p14-u-350,#p14-u-351,#p14-u-352,#p14-u-353,#p14-u-354,#p14-u-355,#p14-u-356,#p14-u-357,#p14-u-358,#p14-u-359,#p14-u-360,#p14-u-361,#p14-u-362,#p14-u-363,#p14-u-364,#p14-u-365,#p14-u-366,#p14-u-367,#p14-u-368,#p14-u-369,#p14-u-370,#p14-u-371,#p14-u-372,#p14-u-373,#p14-u-374,#p14-u-375,#p14-u-376,#p14-u-377,#p14-u-378,#p14-u-379,#p14-u-380,#p14-u-381,#p14-u-382,#p14-u-383,#p14-u-384,#p14-u-385,#p14-u-386,#p14-u-387,#p14-u-388,#p14-u-389,#p14-u-390,#p14-u-391,#p14-u-392,#p14-u-393,#p14-u-394,#p14-u-395,#p14-u-396,#p14-u-397,#p14-u-398,#p14-u-399,#p14-u-400" + }, + "SA": { + "delay": 1, + "transition": "bottom", + "area": "#p14-u-254,#p14-u-255,#p14-u-256,#p14-u-257,#p14-u-258,#p14-u-259,#p14-u-260,#p14-u-261,#p14-u-262,#p14-u-263,#p14-u-264,#p14-u-265,#p14-u-266,#p14-u-267,#p14-u-268,#p14-u-269,#p14-u-272,#p14-u-273,#p14-u-274,#p14-u-275,#p14-u-276,#p14-u-277,#p14-u-278,#p14-u-279,#p14-u-280,#p14-u-281,#p14-u-282,#p14-u-283,#p14-u-284,#p14-u-285,#p14-u-286,#p14-u-287,#p14-u-288,#p14-u-289,#p14-u-290,#p14-u-291,#p14-u-292,#p14-u-293,#p14-u-294,#p14-u-295,#p14-u-296,#p14-u-297,#p14-u-298,#p14-u-299,#p14-u-300,#p14-u-301,#p14-u-302,#p14-u-303,#p14-u-304,#p14-u-305,#p14-u-306,#p14-u-307,#p14-u-308,#p14-u-309,#p14-u-310,#p14-u-311" + }, + "FR": { + "delay": 2, + "transition": "left", + "area": "#p14-u-171,#p14-u-172,#p14-u-173,#p14-u-174,#p14-u-175,#p14-u-176,#p14-u-177,#p14-u-178,#p14-u-179,#p14-u-180,#p14-u-181,#p14-u-182,#p14-u-183,#p14-u-184,#p14-u-185,#p14-u-186,#p14-u-187,#p14-u-188,#p14-u-189,#p14-u-190,#p14-u-191,#p14-u-192,#p14-u-193,#p14-u-194,#p14-u-195,#p14-u-196,#p14-u-197,#p14-u-198,#p14-u-199,#p14-u-200,#p14-u-201,#p14-u-202,#p14-u-203,#p14-u-204,#p14-u-205,#p14-u-206,#p14-u-207,#p14-u-208,#p14-u-209,#p14-u-210" + }, + "EU": { + "delay": 3, + "transition": "top", + "area": "#p15-u-440,#p15-u-441,#p15-u-442,#p15-u-443,#p15-u-444,#p15-u-445,#p15-u-446,#p15-u-447,#p15-u-448,#p15-u-449,#p15-u-450,#p15-u-451,#p15-u-452,#p15-u-453,#p15-u-454,#p15-u-455,#p15-u-456,#p15-u-457,#p15-u-458,#p15-u-459,#p15-u-460,#p15-u-461,#p15-u-462,#p15-u-463,#p15-u-464,#p15-u-465,#p15-u-466,#p15-u-467,#p15-u-468,#p15-u-469,#p15-u-470,#p15-u-471,#p15-u-472,#p15-u-473,#p15-u-474,#p15-u-475,#p15-u-476,#p15-u-477,#p15-u-478,#p15-u-479" + }, + "ME": { + "delay": 4, + "transition": "bottom", + "area": "#p15-u-345,#p15-u-346,#p15-u-347,#p15-u-348,#p15-u-349,#p15-u-350,#p15-u-351,#p15-u-352,#p15-u-353,#p15-u-354,#p15-u-355,#p15-u-356,#p15-u-357,#p15-u-358,#p15-u-359,#p15-u-360,#p15-u-361,#p15-u-362,#p15-u-363,#p15-u-364,#p15-u-365,#p15-u-366,#p15-u-367,#p15-u-368,#p15-u-369,#p15-u-370,#p15-u-371,#p15-u-372,#p15-u-373,#p15-u-374,#p15-u-375,#p15-u-376,#p15-u-377,#p15-u-378,#p15-u-379,#p15-u-380,#p15-u-381,#p15-u-382,#p15-u-383,#p15-u-384,#p15-u-385,#p15-u-386,#p15-u-387,#p15-u-388,#p15-u-389,#p15-u-390,#p15-u-391,#p15-u-392" + }, + "AP": { + "delay": 5, + "transition": "right", + "area": "#p15-u-393,#p15-u-394,#p15-u-395,#p15-u-396,#p15-u-397,#p15-u-398,#p15-u-399,#p15-u-400,#p15-u-401,#p15-u-402,#p15-u-403,#p15-u-404,#p15-u-405,#p15-u-406,#p15-u-407,#p15-u-408,#p15-u-409,#p15-u-410,#p15-u-411,#p15-u-412,#p15-u-413,#p15-u-414,#p15-u-415,#p15-u-416,#p15-u-417,#p15-u-418,#p15-u-419,#p15-u-420,#p15-u-421,#p15-u-422,#p15-u-423,#p15-u-424,#p15-u-425,#p15-u-426,#p15-u-427,#p15-u-428,#p15-u-429,#p15-u-430,#p15-u-431,#p15-u-432,#p15-u-433,#p15-u-434,#p15-u-435,#p15-u-436,#p15-u-437,#p15-u-438,#p15-u-439" + }, + "GL": { + "delay": 6, + "transition": "left", + "area": "#p14-u-1,#p14-u-2,#p14-u-3,#p14-u-4,#p14-u-5,#p14-u-6,#p14-u-7,#p14-u-8,#p14-u-9,#p14-u-10,#p14-u-11,#p14-u-12,#p14-u-13,#p14-u-14,#p14-u-15,#p14-u-16,#p14-u-17,#p14-u-18,#p14-u-19,#p14-u-20,#p14-u-21,#p14-u-22,#p14-u-23,#p14-u-24,#p14-u-25,#p14-u-26,#p14-u-27,#p14-u-28,#p14-u-29,#p14-u-30,#p14-u-31,#p14-u-32,#p14-u-33,#p14-u-34,#p14-u-35,#p14-u-36,#p14-u-37,#p14-e-129,#p14-e-130,#p14-e-131,#p14-e-132,#p14-u-46,#p14-u-47,#p14-u-48,#p14-u-49,#p14-u-50,#p14-u-51,#p14-u-52,#p14-u-53,#p14-u-54,#p14-u-55,#p14-u-56,#p14-u-57,#p14-u-58,#p14-u-59,#p14-u-60,#p14-u-61,#p14-u-62,#p14-u-63,#p14-u-64,#p14-u-65,#p14-u-66,#p14-u-67,#p14-u-68,#p14-u-69,#p14-u-70,#p14-u-71,#p14-u-72,#p14-u-73,#p14-u-74,#p14-u-75,#p14-u-76,#p14-u-77,#p14-u-78,#p14-u-79,#p14-u-80,#p14-u-81,#p14-u-82,#p14-u-83,#p14-u-84,#p14-u-85,#p14-u-86,#p14-u-87,#p14-u-88,#p14-u-89,#p14-u-90,#p14-u-91,#p14-u-92,#p14-u-93,#p14-u-94,#p14-u-95,#p14-u-96,#p14-u-97,#p14-u-98,#p14-u-99,#p14-u-100,#p14-u-101,#p14-u-102,#p14-u-103,#p14-u-104,#p14-u-105,#p14-u-106,#p14-u-107,#p14-u-108,#p14-u-109,#p14-u-110,#p14-u-111,#p14-u-112,#p14-u-113,#p14-u-114,#p14-u-115,#p14-u-116,#p14-u-117,#p14-u-118,#p14-u-119,#p14-u-120,#p14-u-121,#p14-u-122,#p14-u-123,#p14-u-124,#p14-u-125,#p14-u-126,#p14-u-127,#p14-u-128,#p14-u-129,#p14-u-130,#p14-u-131,#p14-u-132,#p14-u-133,#p14-u-134,#p14-u-135,#p14-u-136,#p14-u-137,#p14-u-138,#p14-u-139,#p14-u-140,#p14-u-141,#p14-u-142,#p14-u-143,#p14-u-144,#p14-u-145,#p14-u-146,#p14-u-147,#p14-u-148,#p14-u-149,#p14-u-150,#p14-u-151,#p14-u-152,#p14-u-153,#p14-u-154,#p14-u-155,#p14-u-156,#p14-u-157,#p14-u-158,#p14-u-159,#p14-u-160,#p14-u-161,#p14-u-162,#p14-u-163,#p14-u-164,#p14-u-165,#p14-u-166,#p14-u-167,#p14-u-168,#p14-u-169,#p14-u-170" + }, + "description": { + "delay": 7, + "transition": "opacity", + "area": "#p15-u-1,#p15-u-2,#p15-u-3,#p15-u-4,#p15-u-5,#p15-u-6,#p15-u-7,#p15-u-8,#p15-u-9,#p15-u-10,#p15-u-11,#p15-u-12,#p15-u-13,#p15-u-14,#p15-u-15,#p15-u-16,#p15-u-17,#p15-u-18,#p15-u-19,#p15-u-20,#p15-u-21,#p15-u-22,#p15-u-23,#p15-u-24,#p15-u-25,#p15-u-26,#p15-u-27,#p15-u-28,#p15-u-29,#p15-u-30,#p15-u-31,#p15-u-32,#p15-u-33,#p15-u-34,#p15-u-35,#p15-u-36,#p15-u-37,#p15-u-38,#p15-u-39,#p15-u-40,#p15-u-41,#p15-u-42,#p15-u-43,#p15-u-44,#p15-u-45,#p15-u-46,#p15-u-47,#p15-u-48,#p15-u-49,#p15-u-50,#p15-u-51,#p15-u-52,#p15-u-53,#p15-u-54,#p15-u-55,#p15-u-56,#p15-u-57,#p15-u-58,#p15-u-59,#p15-u-60,#p15-u-61,#p15-u-62,#p15-u-63,#p15-u-64,#p15-u-65,#p15-u-66,#p15-u-67,#p15-u-68,#p15-u-69,#p15-u-70,#p15-u-71,#p15-u-72,#p15-u-73,#p15-u-74,#p15-u-75,#p15-u-76,#p15-u-77,#p15-u-78,#p15-u-79,#p15-u-80,#p15-u-81,#p15-u-82,#p15-u-83,#p15-u-84,#p15-u-85,#p15-u-86,#p15-u-87,#p15-u-88,#p15-u-89,#p15-u-90,#p15-u-91,#p15-u-92,#p15-u-93,#p15-u-94,#p15-u-95,#p15-u-96,#p15-u-97,#p15-u-98,#p15-u-99,#p15-u-100,#p15-u-101,#p15-u-102,#p15-u-103,#p15-u-104,#p15-u-105,#p15-u-106,#p15-u-107,#p15-u-108,#p15-u-109,#p15-u-110,#p15-u-111,#p15-u-112,#p15-u-113,#p15-u-114,#p15-u-115,#p15-u-116,#p15-u-117,#p15-u-118,#p15-u-119,#p15-u-120,#p15-u-121,#p15-u-122,#p15-u-123,#p15-u-124,#p15-u-125,#p15-u-126,#p15-u-127,#p15-u-128,#p15-u-129,#p15-u-130,#p15-u-131,#p15-u-132,#p15-u-133,#p15-u-134,#p15-u-135,#p15-u-136,#p15-u-137,#p15-u-138,#p15-u-139,#p15-u-140,#p15-u-141,#p15-u-142,#p15-u-143,#p15-u-144,#p15-u-145,#p15-u-146,#p15-u-147,#p15-u-148,#p15-u-149,#p15-u-150,#p15-u-151,#p15-u-152,#p15-u-153,#p15-u-154,#p15-u-155,#p15-u-156,#p15-u-157,#p15-u-158,#p15-u-159,#p15-u-160,#p15-u-161,#p15-u-162,#p15-u-163,#p15-u-164,#p15-u-165,#p15-u-166,#p15-u-167,#p15-u-168,#p15-u-169,#p15-u-170,#p15-u-171,#p15-u-172,#p15-u-173,#p15-u-174,#p15-u-175,#p15-u-176,#p15-u-177,#p15-u-178,#p15-u-179,#p15-u-180,#p15-u-181,#p15-u-182,#p15-u-183,#p15-u-184,#p15-u-185,#p15-u-186,#p15-u-187,#p15-u-188,#p15-u-189,#p15-u-190,#p15-u-191,#p15-u-192,#p15-u-193,#p15-u-194,#p15-u-195,#p15-u-196,#p15-u-197,#p15-u-198,#p15-u-199,#p15-u-200,#p15-u-201,#p15-u-202,#p15-u-203,#p15-u-204,#p15-u-205,#p15-u-206,#p15-u-207,#p15-u-208,#p15-u-209,#p15-u-210,#p15-u-211,#p15-u-212,#p15-u-213,#p15-u-214,#p15-u-215,#p15-u-216,#p15-u-217,#p15-u-218,#p15-u-219,#p15-u-220,#p15-u-221,#p15-u-222,#p15-u-223,#p15-u-224,#p15-u-225,#p15-u-226,#p15-u-227,#p15-u-228,#p15-u-229,#p15-u-230,#p15-u-231,#p15-u-232,#p15-u-233,#p15-u-234,#p15-u-235,#p15-u-236,#p15-u-237,#p15-u-238,#p15-u-239,#p15-u-240,#p15-u-241,#p15-u-242,#p15-u-243,#p15-u-244,#p15-u-245,#p15-u-246,#p15-u-247,#p15-u-248,#p15-u-249,#p15-u-250,#p15-u-251,#p15-u-252,#p15-u-253,#p15-u-254,#p15-u-255,#p15-u-256,#p15-u-257,#p15-u-258,#p15-u-259,#p15-u-260,#p15-u-261,#p15-u-262,#p15-u-263,#p15-u-264,#p15-u-265,#p15-u-266,#p15-u-267,#p15-u-268,#p15-u-269,#p15-u-270,#p15-u-271,#p15-u-272,#p15-u-273,#p15-u-274,#p15-u-275,#p15-u-276,#p15-u-277,#p15-u-278,#p15-u-279,#p15-u-280,#p15-u-281,#p15-u-282,#p15-u-283,#p15-u-284,#p15-u-285,#p15-u-286,#p15-u-287,#p15-u-288,#p15-u-289,#p15-u-290,#p15-u-291,#p15-u-292,#p15-u-293,#p15-u-294,#p15-u-295,#p15-u-296,#p15-u-297,#p15-u-298,#p15-u-299,#p15-u-300,#p15-u-301,#p15-u-302,#p15-u-303,#p15-u-304,#p15-u-305,#p15-u-306,#p15-u-307,#p15-u-308,#p15-u-309,#p15-u-310,#p15-u-311,#p15-u-312,#p15-u-313,#p15-u-314,#p15-u-315,#p15-u-316,#p15-u-317,#p15-u-318,#p15-u-319,#p15-u-320,#p15-u-321,#p15-u-322,#p15-u-323,#p15-u-324,#p15-u-325,#p15-u-326,#p15-u-327,#p15-u-328,#p15-u-329,#p15-u-330,#p15-u-331,#p15-u-332,#p15-u-333,#p15-u-334,#p15-u-335,#p15-u-336,#p15-u-337,#p15-u-338,#p15-u-339,#p15-u-340,#p15-u-341,#p15-u-342,#p15-u-343,#p15-u-344,#p15-u-480,#p15-u-481" + } + }; + + if (areas === undefined) { + var m = 1; + var areas = {}; + areas['NA'] = {delay: 0, transition: 'left', area: selectTextInArea([50, 288, 130, 113]).join(',')}; + areas['note'] = {delay: 0, transition: 'opacity', area: selectTextInArea([378, 779, 156, 19]).join(',')}; + areas['SA'] = {delay: 1, transition: 'bottom', area: selectTextInArea([446, 626, 113, 114]).join(',')}; + areas['FR'] = {delay: 2, transition: 'left', area: selectTextInArea([448, 333, 105, 97]).join(',')}; + areas['EU'] = {delay: 3, transition: 'top', area: selectTextInArea([660, 63, 110, 99]).join(',')}; + areas['ME'] = {delay: 4, transition: 'bottom', area: selectTextInArea([788, 508, 125, 101]).join(',')}; + areas['AP'] = {delay: 5, transition: 'right', area: selectTextInArea([1050, 413, 101, 94]).join(',')}; + areas['GL'] = {delay: 6, transition: 'left', area: selectTextInArea([-100, 471, 391, 341]).join(',')}; + areas['description'] = {delay: 7, transition: 'opacity', area: selectTextInArea([668, 728, 336, 74]).join(',')}; + console.log('var areas = ' + JSON.stringify(areas) + ';'); + } + + var m = 1.5; + $.each(areas, function (k, data) { + var offset = 40; + var props = {delay: m * (data.delay + 0.8)}; + if (data.transition === 'left') { + props.x = '-=' + offset; + } else if (data.transition === 'right') { + props.x = '+=' + offset; + } else if (data.transition === 'top') { + props.y = '-=' + offset; + } else if (data.transition === 'bottom') { + props.y = '+=' + offset; + } + props.opacity = 0; + console.log(props); + TweenMax.from($(data.area), 0.8 * m, props); + }); +} + +function nToDelay(n) { + console.log(n); + if (n >= 0) { + res = "+=" + n; + } else { + res = '-=' + Math.abs(n); + } + console.log(res); + return res; +} + +function selectTextInArea(rect, excludeSelectors) { + var selectRect = { + left: rect[0], + top: rect[1], + width: rect[2], + height: rect[3], + right: rect[0] + rect[2], + bottom: rect[1] + rect[2] + }; + + if (excludeSelectors === undefined) { + excludeSelectors = ['image']; + } + + var res = []; + $('use,path').each(function () { + for (var i = 0; i < excludeSelectors; i++) { + if ($(this).find(excludeSelectors[i]).length > 0) { + return; + } + } + if ($(this).closest('symbol,clipPath').length > 0) { + return; + } + + var rect = $(this).get(0).getBoundingClientRect(); + + var intersect = intersectRect(rect, selectRect); + if ($(this).attr('id') == 'p14-u-18') { + console.log(intersect, rect, selectRect); + } + + if (intersect) { + res.push('#' + $(this).attr('id')); + } + }); + + + return res; +} + +function intersectRect(r1, r2) { + return !(r2.left > r1.right || + r2.right < r1.left || + r2.top > r1.bottom || + r2.bottom < r1.top); +} \ No newline at end of file diff --git a/AccorHotel-p12-13/main.less b/AccorHotel-p12-13/main.less new file mode 100644 index 0000000..0f5a868 --- /dev/null +++ b/AccorHotel-p12-13/main.less @@ -0,0 +1,20 @@ +body { + transition: opacity 0.5s; + opacity: 0; +} + + +#p14-imageholder-1,#p15-imageholder-1{ + transition:transform 20s; + transform: scale(1.5); + &.animate{ + transform: scale(1); + } +} +#p14-imageholder-1 { + transform-origin: 100% 50%; +} + +#p15-imageholder-1 { + transform-origin: 0% 50%; +} \ No newline at end of file diff --git a/AccordHotel-p80/main.js b/AccordHotel-p80/main.js index 9d97d91..e833d38 100644 --- a/AccordHotel-p80/main.js +++ b/AccordHotel-p80/main.js @@ -5,19 +5,19 @@ $(function () { function start() { var elements = { "#p83-image-2": {delay: 0, animation: 'fade'}, - "#p82-image-1": {delay: 1, animation: 'blink'}, + "#p82-image-1": {delay: 1, animation: 'fade'}, '#p82-image-2': {delay: 2, animation: 'fade'}, - '#p82-image-3': {delay: 3, animation: 'blink'}, + '#p82-image-3': {delay: 3, animation: 'fade'}, "#p83-image-1": {delay: 4, animation: 'fade'}, - "#p83-image-3": {delay: 5, animation: 'blink'}, + "#p83-image-3": {delay: 5, animation: 'fade'}, "#p83-image-4": {delay: 6, animation: 'fade'}, - '#p83-e-46,#p82-e-81,#p82-e-82,#p82-e-83': {delay: 8, animation: 'blink'}, + '#p83-e-46,#p82-e-81,#p82-e-82,#p82-e-83': {delay: 7, animation: 'fade'}, }; $.each(elements, function (id, infos) { var e = $(id); - var delay =infos.delay* (0.6 + Math.random() * 0.2); + var delay =infos.delay*.8; var tl = new TimelineMax({delay: delay}); if (infos.animation === 'blink') { tl.to(e, 0, {opacity: 0.6}, '+=0.1'); @@ -28,7 +28,7 @@ function start() { tl.to(e, 0, {opacity: 0}, "+=0.02"); tl.to(e, 0, {opacity: 1}, "+=0.5"); } else { - tl.to(e, 0.6, {opacity: 1}); + tl.to(e, 1, {opacity: 1}); } tl.timeScale(0.9 + Math.random() * 0.2); });