v1.2.0

Aghajari · Aug 14, 2021 · 7ad983f · 7ad983f
1 parent bb93fc5
commit 7ad983f
Show file tree

Hide file tree

Showing 22 changed files with 262 additions and 274 deletions.
diff --git a/AXrLottie/build.gradle b/AXrLottie/build.gradle
@@ -1,4 +1,6 @@
-apply plugin: 'com.android.library'
+plugins {
+    id 'com.android.library'
+}
 
 android {
     compileSdkVersion 30
@@ -13,6 +15,7 @@ android {
         consumerProguardFiles "consumer-rules.pro"
         externalNativeBuild {
             cmake {
+                arguments "-DANDROID_ARM_NEON=OFF"
                 cppFlags "-std=c++14"
             }
         }
@@ -36,70 +39,18 @@ android {
 
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'androidx.annotation:annotation:1.1.0'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    implementation 'androidx.appcompat:appcompat:1.3.1'
+    implementation 'androidx.annotation:annotation:1.2.0'
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 }
 
+// PUBLISH
 
-//JCenter
-apply plugin: 'com.github.dcendents.android-maven'
-apply plugin: 'com.jfrog.bintray'
-
-def artifact = new Properties()
-artifact.load(new FileInputStream("deploy.settings"))
-
-version=artifact.version
-group=artifact.groupId
-
-install {
-    repositories.mavenInstaller {
-        pom.project {
-            packaging 'aar'
-            groupId artifact.groupId
-            artifactId artifact.id
-            version artifact.version
-            name artifact.id // pom.project.name must be same as bintray.pkg.name
-            url artifact.siteUrl
-            inceptionYear '2020' // HARDCODED
-            licenses {
-                license { // HARDCODED
-                    name 'The Apache Software License, Version 2.0'
-                    url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
-                    distribution 'repo'
-                }
-            }
-            scm {
-                connection artifact.gitUrl
-                developerConnection artifact.gitUrl
-                url artifact.siteUrl
-            }
-        }
-    }
-}
-
-def properties = new Properties()
-properties.load(new FileInputStream("local.properties"))
-
-bintray {
-    user = properties.getProperty("bintray.user")
-    key = properties.getProperty("bintray.apikey")
-
-    configurations = ['archives']
-    pkg {
-        repo = "Aghajari"
-        name = artifact.id
-        websiteUrl = artifact.siteUrl
-        vcsUrl = artifact.gitUrl
-        licenses = artifact.licenses
-        publish = true
-        version {
-            name = artifact.version
-        }
-    }
-}
+apply plugin: 'maven'
+apply plugin: 'maven-publish'
+apply plugin: 'signing'
 
 task sourcesJar(type: Jar) {
     from android.sourceSets.main.java.srcDirs
@@ -111,6 +62,12 @@ task javadoc(type: Javadoc) {
     classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
 }
 
+afterEvaluate {
+    javadoc.classpath += files(android.libraryVariants.collect { variant ->
+        variant.javaCompileProvider.get().classpath.files
+    })
+}
+
 task javadocJar(type: Jar, dependsOn: javadoc) {
     classifier = 'javadoc'
     from javadoc.destinationDir
@@ -121,13 +78,65 @@ artifacts {
     archives sourcesJar
 }
 
-repositories {
-    maven { url 'https://maven.google.com' }
-    mavenCentral()
+signing {
+    useInMemoryPgpKeys(
+            rootProject.ext["signing.keyId"],
+            rootProject.ext["signing.key"],
+            rootProject.ext["signing.password"],
+    )
+    sign publishing.publications
 }
 
 tasks.withType(Javadoc) {
     options.addStringOption('Xdoclint:none', '-quiet')
     options.addStringOption('encoding', 'UTF-8')
     options.addStringOption('charSet', 'UTF-8')
-}
+}
+
+def artifact = new Properties()
+artifact.load(new FileInputStream("deploy.settings"))
+
+version = artifact.version
+group = artifact.groupId
+archivesBaseName = artifact.id
+
+afterEvaluate {
+    publishing {
+        publications {
+            release(MavenPublication) {
+                groupId artifact.groupId
+                artifactId artifact.id
+                version artifact.version
+                from components.release
+
+                pom {
+                    name = artifact.id
+                    packaging = 'aar'
+                    description = 'AXrLottie (Android) Renders animations and vectors exported in the bodymovin JSON format. (Using rLottie)'
+                    url = artifact.siteUrl
+
+                    scm {
+                        connection = artifact.gitUrl
+                        developerConnection = artifact.gitUrl
+                        url = artifact.siteUrl
+                    }
+
+                    licenses {
+                        license {
+                            name = 'The Apache License, Version 2.0'
+                            url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+                        }
+                    }
+
+                    developers {
+                        developer {
+                            id = 'Aghajari'
+                            name = 'AmirHossein Aghajari'
+                            email = '[email protected]'
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/AXrLottie/output/aar/AXrLottie-release.aar b/AXrLottie/output/aar/AXrLottie-release.aar
diff --git a/AXrLottie/src/main/cpp/src/lottie/lottieitem.cpp b/AXrLottie/src/main/cpp/src/lottie/lottieitem.cpp
@@ -597,11 +597,21 @@ void renderer::CompLayer::renderMatteLayer(VPainter *painter, const VRle &mask,
         srcBitmap.updateLuma();
     }
 
+    auto clip = layerPainter.clipBoundingRect();
+
+    // if the layer has only one renderer then use it as the clip rect
+    // when blending 2 buffer and copy back to final buffer to avoid
+    // unnecessary pixel processing.
+    if (layer->renderList().size() == 1)
+    {
+        clip = layer->renderList()[0]->rle().boundingRect();
+    }
+
     // 2.3 draw src buffer as mask
-    layerPainter.drawBitmap(VPoint(), srcBitmap);
+    layerPainter.drawBitmap(clip, srcBitmap, clip);
     layerPainter.end();
     // 3. draw the result buffer into painter
-    painter->drawBitmap(VPoint(), layerBitmap);
+    painter->drawBitmap(clip, layerBitmap, clip);
 
     cache.release_surface(srcBitmap);
     cache.release_surface(layerBitmap);

diff --git a/AXrLottie/src/main/cpp/src/lottie/lottieitem_capi.cpp b/AXrLottie/src/main/cpp/src/lottie/lottieitem_capi.cpp
@@ -121,7 +121,7 @@ void renderer::Layer::buildLayerNode()
             auto        ptPtr = reinterpret_cast<const float *>(pts.data());
             auto        elmPtr = reinterpret_cast<const char *>(elm.data());
             cNode.mPath.ptPtr = ptPtr;
-            cNode.mPath.ptCount = pts.size();
+            cNode.mPath.ptCount = 2 * pts.size();
             cNode.mPath.elmPtr = elmPtr;
             cNode.mPath.elmCount = elm.size();
             cNode.mAlpha = uchar(mask.mCombinedAlpha * 255.0f);

diff --git a/AXrLottie/src/main/cpp/src/lottie/lottiemodel.cpp b/AXrLottie/src/main/cpp/src/lottie/lottiemodel.cpp
@@ -205,7 +205,7 @@ void model::Dash::getDashInfo(int frameNo, std::vector<float> &result) const
 {
     result.clear();
 
-    if (mData.empty()) return;
+    if (mData.size() <= 1) return;
 
     if (result.capacity() < mData.size()) result.reserve(mData.size() + 1);
 

diff --git a/AXrLottie/src/main/cpp/src/lottie/lottiemodel.h b/AXrLottie/src/main/cpp/src/lottie/lottiemodel.h
@@ -688,7 +688,9 @@ class Layer : public Group {
         int     inFrame() const noexcept { return mInFrame; }
         int     outFrame() const noexcept { return mOutFrame; }
         int     startFrame() const noexcept { return mStartFrame; }
-        Color   solidColor() const noexcept { return mExtra->mSolidColor; }
+        Color   solidColor() const noexcept {
+            return mExtra ? mExtra->mSolidColor : Color();
+        }
         bool    autoOrient() const noexcept { return mAutoOrient; }
         int     timeRemap(int frameNo) const;
         VSize   layerSize() const { return mLayerSize; }
@@ -705,10 +707,7 @@ class Layer : public Group {
         {
             return mTransform ? mTransform->opacity(frameNo) : 1.0f;
         }
-        Asset *asset() const
-        {
-            return (mExtra && mExtra->mAsset) ? mExtra->mAsset : nullptr;
-        }
+        Asset *asset() const { return mExtra ? mExtra->mAsset : nullptr; }
         struct Extra {
             Color               mSolidColor;
             std::string         mPreCompRefId;