Merge pull request #12 from doggycoder/master

request merge

Author: aiyaapp

AiyaEffectsSDK/libs/arm64-v8a/libayeffects.so

@@ -121,6 +121,14 @@ public void draw(){
         onDraw();
     }
 
+    public void setVertBuffer(FloatBuffer buffer){
+        this.mVerBuffer=buffer;
+    }
+
+    public void setTexBuffer(FloatBuffer buffer){
+        this.mTexBuffer=buffer;
+    }
+
     public void setMatrix(float[] matrix){
         this.matrix=matrix;
     }

AiyaEffectsSDK/libs/armeabi-v7a/libayeffects.so

@@ -0,0 +1,29 @@
+package com.aiyaapp.camera.sdk.filter;
+
+import android.content.res.Resources;
+
+/**
+ * Created by aiya on 2017/4/12.
+ */
+
+public class BaseFilter extends AFilter {
+
+    private String vert;
+    private String frag;
+
+    public BaseFilter(String vert,String frag){
+        super(null);
+        this.vert=vert;
+        this.frag=frag;
+    }
+
+    @Override
+    protected void onCreate() {
+        createProgram(vert,frag);
+    }
+
+    @Override
+    protected void onSizeChanged(int width, int height) {
+
+    }
+}

AiyaEffectsSDK/libs/x86/libayeffects.so

@@ -28,4 +28,5 @@ protected void onCreate() {
     protected void onSizeChanged(int width, int height) {
 
     }
+
 }

AiyaEffectsSDK/src/main/java/com/aiyaapp/camera/sdk/filter/AFilter.java

@@ -16,8 +16,8 @@ buildscript {
 }
 
 ext{
-    vCode=24
-    vName="v2.0.4"
+    vCode=26
+    vName="v2.1.0"
 }
 
 

AiyaEffectsSDK/src/main/java/com/aiyaapp/camera/sdk/filter/BaseFilter.java

@@ -1,21 +1,21 @@
 {
   "format" : "1",
-  "name":"豹纹耳",
+  "name":"兔耳朵",
   "nodes" : [
     { 
       "type":"2dAnim",
 	  "dirname" : "erduo",   
-      "number"      : 25,     
-      "width" : 276,         
-      "height" : 107,
+      "number"      : 20,     
+      "width" : 310,         
+      "height" : 252,
       "duration" : 50,       
       "isloop" : 1,           
       "Triggertype" : 0,     
       "untilFinish" : 1,      
       "position" : "foreheadCenter",   
-      "anchorX" : 137,       
-      "anchorY" : 60,
-      "ratio" : 1.7,          
+      "anchorX" : 154,       
+      "anchorY" : 82,
+      "ratio" : 1.8,          
       "fullscreen" : 0
     }
   ]