RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

QtLottie: Move everything to Lottie namespace.

This commit is contained in:
John Preston 2019-05-15 19:54:08 +03:00
parent ab82ff0fb7
commit 26c29f6af7
4 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Telegram/SourceFiles/lottie/lottie_animation.cpp
View File

@ -16,7 +16,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include <QFile>
#include "logs.h"
#include "rasterrenderer/lottierasterrenderer.h"
#include "rasterrenderer/rasterrenderer.h"
namespace Lottie {
@ -43,7 +43,7 @@ std::unique_ptr<Animation> FromFile(const QString &path) {
}
std::unique_ptr<Animation> FromData(const QByteArray &data) {
return std::make_unique<Lottie::Animation>(data);
return std::make_unique<Animation>(data);
}
Animation::Animation(const QByteArray &content)

4
Telegram/SourceFiles/lottie/lottie_frame_renderer.cpp
View File

@ -8,7 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "lottie/lottie_frame_renderer.h"
#include "lottie/lottie_animation.h"
#include "rasterrenderer/lottierasterrenderer.h"
#include "rasterrenderer/rasterrenderer.h"
#include "logs.h"
#include <range/v3/algorithm/find.hpp>
@ -215,7 +215,7 @@ void SharedState::renderFrame(
const auto updated = crl::now();
LottieRasterRenderer renderer(&p);
RasterRenderer renderer(&p);
_scene.render(renderer, frame);
const auto finished = crl::now();

2
Telegram/ThirdParty/qtlottie vendored

@ -1 +1 @@
Subproject commit 15be485c6914a48b0031ceaa15a5ff53f5214985
Subproject commit 20913173a9e72bd09d06a16245b15e9bd6dde517

9
Telegram/gyp/lib_lottie.gyp
View File

@ -77,7 +77,7 @@
'<(lottie_loc)/bodymovin/bmfreeformshape.cpp',
'<(lottie_loc)/bodymovin/bmtrimpath.cpp',
'<(lottie_loc)/bodymovin/bmpathtrimmer.cpp',
'<(lottie_loc)/bodymovin/lottierenderer.cpp',
'<(lottie_loc)/bodymovin/renderer.cpp',
'<(lottie_loc)/bodymovin/trimpath.cpp',
'<(lottie_loc)/bodymovin/bmfilleffect.cpp',
'<(lottie_loc)/bodymovin/bmrepeater.cpp',
@ -87,7 +87,6 @@
'<(lottie_loc)/bodymovin/beziereasing.h',
'<(lottie_loc)/bodymovin/bmbase.h',
'<(lottie_loc)/bodymovin/bmbasictransform.h',
'<(lottie_loc)/bodymovin/bmconstants.h',
'<(lottie_loc)/bodymovin/bmellipse.h',
'<(lottie_loc)/bodymovin/bmfill.h',
'<(lottie_loc)/bodymovin/bmfilleffect.h',
@ -107,13 +106,13 @@
'<(lottie_loc)/bodymovin/bmstroke.h',
'<(lottie_loc)/bodymovin/bmtrimpath.h',
'<(lottie_loc)/bodymovin/trimpath.h',
'<(lottie_loc)/bodymovin/lottierenderer.h',
'<(lottie_loc)/bodymovin/renderer.h',
'<(lottie_loc)/bodymovin/bmpathtrimmer.h',
# taken from qtlottie/src/imports/imports.pro
'<(lottie_loc)/imports/rasterrenderer/lottierasterrenderer.cpp',
'<(lottie_loc)/imports/rasterrenderer/rasterrenderer.cpp',
'<(lottie_loc)/imports/rasterrenderer/lottierasterrenderer.h',
'<(lottie_loc)/imports/rasterrenderer/rasterrenderer.h',
# added to qtlottie/src/bodymovin/bodymovin.pro
'<(lottie_loc)/bodymovin/bmasset.cpp',