save hair demo

app/src/main/assets/shaders/bg.frag

@@ -9,33 +9,7 @@ layout(location = 0) out vec4 outColor;
 // 纹理采样器
 layout(binding = 0) uniform sampler2D texSampler;
 
-layout(push_constant) uniform PushConstants {
-    float zoom;
-	float r;
-	float g;
-	float b;
-	float radius;
-	float ux;
-	float uy;
-} pushConstants;
-
 void main() {
-    // outFragColor = color;
+    // 采样纹理
-    // 获取当前片元的屏幕坐标（左下角为原点）
+    outColor = texture(texSampler, inTexCoord);
-    vec2 fragCoord = gl_FragCoord.xy;
-
-    // 屏幕中心（480x480 的中心是 (240, 240)）
-    vec2 center = vec2(240.0, 240.0);
-
-    // 计算到中心的距离（欧氏距离，单位：像素）
-    float dist = length(fragCoord - center);
-
-    // 判断是否在半径之外
-    if (dist > pushConstants.radius) {
-        // 使用 push constant 中的 RGB 颜色（注意 alpha 设为 1.0）
-        outColor = vec4(pushConstants.r, pushConstants.g, pushConstants.b, 1.0);
-    } else {
-        // 采样纹理
-        outColor = texture(texSampler, inTexCoord);
-    }
 }

app/src/main/assets/shaders/bg.vert

@@ -38,15 +38,7 @@ const vec2 texCoords[6] = vec2[6](
 
 // 定义 Push Constant，只有一个 float
 layout(push_constant) uniform PushConstants {
-    float zoom;
+    float myValue;
-	float r;
-	float g;
-	float b;
-	float radius;
-	float ux;
-	float uy;
-    float offset_x;
-	float offset_y;
 } pushConstants;
 
 
@@ -56,9 +48,7 @@ layout(location = 0) out vec2 outTexCoord;
 void main() {
     // 获取顶点位置
     vec2 position = positions[gl_VertexIndex];
-    position = position * pushConstants.zoom;
+    position = position * pushConstants.myValue;
-    position.x = position.x + (pushConstants.offset_x/480);
-	position.y = position.y + (pushConstants.offset_y/480);
     
     // 设置输出位置（Vulkan使用不同的坐标系）
     gl_Position = vec4(position, 0.0, 1.0);

app/src/main/assets/shaders/texture.frag

@@ -6,11 +6,7 @@ layout (location = 0) in vec2 inUV;
 layout (location = 1) in vec3 inNormal;
 
 layout(push_constant) uniform PushConstants {
-    float zoom;
+    float myValue;
-	float r;
-	float g;
-	float b;
-	float radius;
 	float ux;
 	float uy;
 } pushConstants;
@@ -20,25 +16,10 @@ layout (location = 0) out vec4 outFragColor;
 
 void main() 
 {
-    // outFragColor = color;
+    vec2 pos = vec2(pushConstants.ux/2048.f, pushConstants.uy/2048.f);
-    // 获取当前片元的屏幕坐标（左下角为原点）
+    vec2 uv = pos + vec2(inUV.x/8.f, inUV.y/8.f);
-    vec2 fragCoord = gl_FragCoord.xy;
+	vec4 color = texture(samplerColor, uv);
 
-    // 屏幕中心（480x480 的中心是 (240, 240)）
+    outFragColor = color;
-    vec2 center = vec2(240.0, 240.0);
-
-    // 计算到中心的距离（欧氏距离，单位：像素）
-    float dist = length(fragCoord - center);
-
-    // 判断是否在半径之外
-    if (dist > pushConstants.radius) {
-        // 使用 push constant 中的 RGB 颜色（注意 alpha 设为 1.0）
-        outFragColor = vec4(pushConstants.r, pushConstants.g, pushConstants.b, 1.0);
-    } else {
-        vec2 pos = vec2(pushConstants.ux/4096.f, pushConstants.uy/2048.f);
-        vec2 uv = pos + vec2(inUV.x/8.f, inUV.y/4.f);
-        vec4 color = texture(samplerColor, uv);
-        outFragColor = color;
-    }
 
 }

app/src/main/assets/shaders/texture.vert

@@ -17,15 +17,9 @@ layout (location = 0) out vec2 outUV;
 layout (location = 1) out vec3 outNormal;
 
 layout(push_constant) uniform PushConstants {
-    float zoom;
+    float myValue;
-	float r;
-	float g;
-	float b;
-	float radius;
 	float ux;
 	float uy;
-	float offset_x;
-	float offset_y;
 } pushConstants;
 
 out gl_PerVertex 
@@ -38,9 +32,7 @@ void main()
 	outUV = inUV;
 
 	vec2 position = vec2(inPos.xy*2 -1);
-    position = position * pushConstants.zoom;
+    position = position * pushConstants.myValue;
-	position.x = position.x + (pushConstants.offset_x/480);
-	position.y = position.y + (pushConstants.offset_y/480);
     gl_Position = vec4(position, 0.5, 1.0);
 
     vec4 pos = ubo.model * vec4(inPos, 1.0);

app/src/main/cpp/main.cpp

@@ -39,12 +39,9 @@ void android_main(struct android_app *pApp) {
     aout << "Welcome to android_main" << std::endl;
     g_android_app = pApp;
     g_assetManager = pApp->activity->assetManager;
-    //FaceApp application;
+    FaceApp application;
-    //g_Application = &application;
+    g_Application = &application;
-    if(g_Application == nullptr) {
+    application.SetInitArg(g_InitArgString);
-        g_Application = new FaceApp();
-    }
-    g_Application->SetInitArg(g_InitArgString);
     pApp->onAppCmd = handle_cmd;
     long long last_update_time = 0;
     android_app_set_motion_event_filter(pApp, nullptr);
@@ -76,11 +73,11 @@ void android_main(struct android_app *pApp) {
                     }
             }
         }
-        if(g_Application->isInited())
+        if(application.isInited())
         {
             auto frameTime = (start_time - _lastDrawFrameTime);
             _lastDrawFrameTime = chrono::duration_cast<chrono::milliseconds>(chrono::system_clock::now().time_since_epoch()).count();
-            g_Application->drawFrame(frameTime);
+            application.drawFrame(frameTime);
         }
         auto end_time = chrono::duration_cast<chrono::milliseconds>(chrono::system_clock::now().time_since_epoch()).count();
         auto frameTime = end_time - last_update_time;
@@ -92,9 +89,7 @@ void android_main(struct android_app *pApp) {
             this_thread::sleep_for(chrono::milliseconds((35-function_time)));
         }
     } while (!pApp->destroyRequested);
-    //application.cleanup();
+    application.cleanup();
-    g_Application->cleanupSecondInit();
-    g_Application->clearnSecondFaceApp();
 }
 }
 
@@ -159,7 +154,7 @@ Java_com_hmwl_face_1sdk_FaceActivity_SetCppInitArg(JNIEnv *env, jobject thiz, js
 extern "C"
 JNIEXPORT void JNICALL
 Java_com_hmwl_face_1sdk_FaceActivity_StopRunning(JNIEnv *env, jobject thiz) {
-    g_Application->Stop();
+    g_Application->_running = false;
 }
 
 JavaVM* g_jvm = nullptr;

app/src/main/java/com/hmwl/face_sdk/FaceActivity.java

@@ -94,12 +94,12 @@ public class FaceActivity extends GameActivity implements FaceLandmarkerHelper.L
                             {
                                 detectFace(image);
                             }
-//                            else
+                            else
-//                            {
+                            {
-//                                image.close();
+                                image.close();
-//                            }
+                            }
                         } finally {
-                            image.close(); // 确保在这里关闭
+                            //image.close(); // 确保在这里关闭
                             //Log.d("Camera", "Image closed, ready for next frame");
                         }
                     }

app/src/main/java/com/hmwl/face_sdk/FaceLandmarkerHelper.kt

@@ -192,7 +192,7 @@ class FaceLandmarkerHelper(
                 Bitmap.Config.ARGB_8888
             )
         imageProxy.use { bitmapBuffer.copyPixelsFromBuffer(imageProxy.planes[0].buffer) }
-        //imageProxy.close()
+        imageProxy.close()
 
         val matrix = Matrix().apply {
             // Rotate the frame received from the camera to be in the same direction as it'll be shown

app/src/main/java/com/hmwl/face_sdk/InitArg.java

@@ -4,23 +4,12 @@ import org.json.JSONObject;
 public class InitArg {
     public int action_fps;
     public float zoom;
-    public float r;
+
-    public float g;
-    public float b;
-    public float radius;
-    public float offset_x;
-    public float offset_y;
     public String toJson() {
         try {
             JSONObject jsonObject = new JSONObject();
             jsonObject.put("action_fps", action_fps);
             jsonObject.put("zoom", zoom);
-            jsonObject.put("r", r);
-            jsonObject.put("g", g);
-            jsonObject.put("b", b);
-            jsonObject.put("radius", radius);
-            jsonObject.put("offset_x", offset_x);
-            jsonObject.put("offset_y", offset_y);
             return jsonObject.toString();
         } catch (Exception e) {
             e.printStackTrace();

example/build.gradle

@@ -9,7 +9,7 @@ android {
     compileSdk 36
 
     defaultConfig {
-        applicationId "com.inewme.uvmirror.f20260113"
+        applicationId "com.inewme.uvmirror.f20260420"
         minSdk 30
         targetSdk 36
         versionCode 1