From 755134ba3f2fec73c4be5ac235b3c4dcda6aeb54 Mon Sep 17 00:00:00 2001 From: pipu Date: Fri, 10 Apr 2015 17:05:55 +0800 Subject: [PATCH] Update parse animation easing --- .../ActionTimeline/CCActionTimelineCache.cpp | 4 ++-- .../ActionTimeline/ActionTimelineEase.csb | Bin 1700 -> 1728 bytes 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimelineCache.cpp b/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimelineCache.cpp index 16e839a296..45cf6f836f 100644 --- a/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimelineCache.cpp +++ b/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimelineCache.cpp @@ -866,13 +866,13 @@ void ActionTimelineCache::loadEasingDataWithFlatBuffers(cocostudio::timeline::Fr auto points = flatbuffers->points(); if (points) { + std::vector easings; for (auto it = points->begin(); it != points->end(); ++it) { - std::vector easings; easings.push_back(it->x()); easings.push_back(it->y()); - frame->setEasingParams(easings); } + frame->setEasingParams(easings); } } diff --git a/tests/cpp-tests/Resources/ActionTimeline/ActionTimelineEase.csb b/tests/cpp-tests/Resources/ActionTimeline/ActionTimelineEase.csb index 0f6311348b9dabf30bcb426611347bf71dfa2cd3..3be00c33cf5b53e9a37b825f4399b2ea250ede2a 100644 GIT binary patch delta 564 zcmZ3&dw_R>2IGr~n(~Y;6FrR?D<;-1=g9O}@7xtX*=e#4qmSXoFIM)4FK62+FfcHP z05M2XFQ3ubI-m@!2q=UCmP}sBc$vfa^B1StQ^TAlw=fkbOkUY!7dBrTZiMmYV@}4- z%bjON6+4@0e|4NJ!d%7w!I^^;aqX>wl#K6D;7Uy9Q0LrQW zu>=tF05Jo@hr>XfhbO;bwo&Y01Tuj_EI{1%@Be=pAnj&)Mjpgx2I82>o-FdAGXMYo z2Z_7@(po?o226l_kntc(K=L4mfUE#H3I-yedR>5~!^A*pJ0@>raTa?66g2`1H`p^U zG}wb=9{iik#Tq2Y0MrN)f(d__oXhIXItQr0W%6ED@%kxHgRcN-kfUHB2r}XXP>cyk zgV-Q&0LX_pR0J%>0dz3Pq4GdH@#YzP9UTqL`JK?QSMMkE;3xS2yz=lSZ(@*2?}ae!)Z~{ z!bK24M2miaNG^gvLR!_L9}-RHh_mRz%enV?-!q&!jo@wYA}PL|R9qCD!nClR!#izt ze%xxc_a&x9aq4O#V}9(sW(@#{kl4&`I&vh|lpG@T?>ykW=x9*cwIKH?@z_^2X2pqV ztxcK+1^E+D-?jj@nqX%nG};m){=L2`A;V%@BUxAy1Nh_*37v0I0Hw>h8z4dICn?>O zqNK+T1i&Q|Qtj7uhpEoZyv6zLCoN)0i6@e->oO@*VuGr7ay`CI9P3IXT%?OFyW z6ge29Sf-0@6Tmjv(On!>m%