bugfix: tagetview add mirror function

pixpark · Dec 25, 2023 · f34e472 · f34e472
1 parent e5d79b8
commit f34e472
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -27,6 +27,8 @@ It is GPU-based and comes with built-in beauty effects filters that can achieve
 
 It supports platforms including iOS, Mac, Android, and it can theoretically be ported to any platform that supports OpenGL/ES.
 
+The face key points detection currently utilizes the [Face++](https://www.faceplusplus.com.cn/) library, but it will be replaced with either ncnn or mnn in the future.
+
 ## Effects Preview
 **Skin whitening & smoothing**: 
 

diff --git a/android/app/src/main/java/com/pixpark/GPUPixel/MainActivity.java b/android/app/src/main/java/com/pixpark/GPUPixel/MainActivity.java
@@ -47,7 +47,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         // preview
         surfaceView = findViewById(R.id.surfaceView);
-
+        surfaceView.setMirror(true);
         // 美颜滤镜
         filter = GPUPixelFilter.create("FaceBeautyFilter");
 

diff --git a/android/gpupixel/src/main/java/com/pixpark/gpupixel/GPUPixel.java b/android/gpupixel/src/main/java/com/pixpark/gpupixel/GPUPixel.java
@@ -182,6 +182,7 @@ public void runOnPostDraw(Runnable runnable) {
     public static native void nativeTargetViewFinalize(final long classID);
     public static native void nativeTargetViewOnSizeChanged(final long classID, final int width, final int height);
     public static native void nativeTargetViewSetFillMode(final long classID, final int fillMode);
+    public static native void nativeTargetViewSetMirror(final long classID, final boolean mirror);
     // context
     public static native void nativeContextInit();
     public static native void nativeContextDestroy();

diff --git a/android/gpupixel/src/main/java/com/pixpark/gpupixel/GPUPixelView.java b/android/gpupixel/src/main/java/com/pixpark/gpupixel/GPUPixelView.java
@@ -72,6 +72,16 @@ public void run() {
         });
     }
 
+    public void setMirror(final boolean mirror) {
+        GPUPixel.getInstance().runOnDraw(new Runnable() {
+            @Override
+            public void run() {
+                if (mNativeClassID != 0)
+                    GPUPixel.nativeTargetViewSetMirror(mNativeClassID, mirror);
+            }
+        });
+    }
+
     public int getSurfaceWidth() {
         return mGLSurfaceView.getWidth();
     }

diff --git a/src/GPUPixelJNI.cc b/src/GPUPixelJNI.cc
@@ -236,6 +236,14 @@ extern "C" void Java_com_pixpark_gpupixel_GPUPixel_nativeTargetViewSetFillMode(
   ((TargetView*)classId)->setFillMode((TargetView::FillMode)fillMode);
 };
 
+
+extern "C"
+JNIEXPORT void JNICALL
+Java_com_pixpark_gpupixel_GPUPixel_nativeTargetViewSetMirror(JNIEnv *env, jclass clazz,
+                                                             jlong class_id, jboolean mirror) {
+    ((TargetView*)class_id)->setMirror(mirror);
+}
+
 extern "C" jlong Java_com_pixpark_gpupixel_GPUPixel_nativeFilterCreate(
     JNIEnv* env,
     jobject obj,
@@ -365,4 +373,4 @@ extern "C" void JNIEXPORT JNICALL JNI_OnUnLoad(JavaVM* jvm, void* reserved) {
 //  RTC_CHECK(rtc::CleanupSSL()) << "Failed to CleanupSSL()";
 }
 
-#endif
+#endif
diff --git a/src/target/TargetView.cc b/src/target/TargetView.cc
@@ -76,6 +76,13 @@ void TargetView::setFillMode(FillMode fillMode) {
   }
 }
 
+void TargetView::setMirror(bool mirror) {
+  if (_mirror != mirror) {
+    _mirror = mirror;
+  }
+}
+
+
 void TargetView::onSizeChanged(int width, int height) {
   if (_viewWidth != width || _viewHeight != height) {
     _viewWidth = width;
@@ -214,8 +221,13 @@ const GLfloat* TargetView::_getTexureCoordinate(RotationMode rotationMode) {
   };
 
   switch (rotationMode) {
-    case NoRotation:
-      return noRotationTextureCoordinates;
+    case NoRotation: {
+      if(_mirror) {
+        return horizontalFlipTextureCoordinates;
+      } else {
+        return noRotationTextureCoordinates;
+      }
+    }
     case RotateLeft:
       return rotateLeftTextureCoordinates;
     case RotateRight:

diff --git a/src/target/TargetView.h b/src/target/TargetView.h
@@ -30,13 +30,15 @@ class TargetView : public Target {
                                    RotationMode rotationMode = NoRotation,
                                    int texIdx = 0) override;
   void setFillMode(FillMode fillMode);
+  void setMirror(bool mirror);
   void onSizeChanged(int width, int height);
   virtual void update(int64_t frameTime) override;
 
  private:
   int _viewWidth;
   int _viewHeight;
   FillMode _fillMode;
+  bool _mirror = false;
   GLProgram* _displayProgram;
   GLuint _positionAttribLocation;
   GLuint _texCoordAttribLocation;