Move the various *Helper / *Native files to geometry/internal and ren…

…ame them to *Native.kt for uniformity PiperOrigin-RevId: 684442381
mmrech · Oct 10, 2024 · a1d842c · a1d842c
1 parent fcac605
commit a1d842c
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/ink/geometry/internal/jni/affine_transform_jni.cc b/ink/geometry/internal/jni/affine_transform_jni.cc
@@ -30,7 +30,7 @@ using ::ink::Quad;
 
 extern "C" {
 
-JNI_METHOD(geometry, AffineTransformHelper, void, nativeApplyParallelogram)
+JNI_METHOD(geometry_internal, AffineTransformNative, void, applyParallelogram)
 (JNIEnv* env, jclass clazz, jfloat affine_transform_A,
  jfloat affine_transform_B, jfloat affine_transform_C,
  jfloat affine_transform_D, jfloat affine_transform_E,

diff --git a/ink/geometry/internal/jni/parallelogram_jni.cc b/ink/geometry/internal/jni/parallelogram_jni.cc
@@ -35,7 +35,7 @@ using ::ink::Vec;
 
 extern "C" {
 
-JNI_METHOD(geometry, ParallelogramNative, jobject, nativeCreateBoundingBox)
+JNI_METHOD(geometry_internal, ParallelogramNative, jobject, createBoundingBox)
 (JNIEnv* env, jclass clazz, jfloat center_x, jfloat center_y, jfloat width,
  jfloat height, jfloat rotation, jfloat shear_factor,
  jclass immutable_box_class, jclass immutable_vec_class) {
@@ -48,7 +48,7 @@ JNI_METHOD(geometry, ParallelogramNative, jobject, nativeCreateBoundingBox)
                                           immutable_vec_class);
 }
 
-JNI_METHOD(geometry, ParallelogramNative, void, nativePopulateBoundingBox)
+JNI_METHOD(geometry_internal, ParallelogramNative, void, populateBoundingBox)
 (JNIEnv* env, jclass clazz, jfloat center_x, jfloat center_y, jfloat width,
  jfloat height, jfloat rotation, jfloat shear_factor, jobject mutable_box) {
   Quad quad = Quad::FromCenterDimensionsRotationAndShear(
@@ -59,7 +59,7 @@ JNI_METHOD(geometry, ParallelogramNative, void, nativePopulateBoundingBox)
                                Envelope(quad).AsRect().value());
 }
 
-JNI_METHOD(geometry, ParallelogramNative, jobjectArray, nativeCreateSemiAxes)
+JNI_METHOD(geometry_internal, ParallelogramNative, jobjectArray, createSemiAxes)
 (JNIEnv* env, jclass clazz, jfloat center_x, jfloat center_y, jfloat width,
  jfloat height, jfloat rotation, jfloat shear_factor,
  jclass immutable_vec_class) {
@@ -78,7 +78,7 @@ JNI_METHOD(geometry, ParallelogramNative, jobjectArray, nativeCreateSemiAxes)
   return vector_array;
 }
 
-JNI_METHOD(geometry, ParallelogramNative, void, nativePopulateSemiAxes)
+JNI_METHOD(geometry_internal, ParallelogramNative, void, populateSemiAxes)
 (JNIEnv* env, jclass clazz, jfloat center_x, jfloat center_y, jfloat width,
  jfloat height, jfloat rotation, jfloat shear_factor, jobject out_axis1,
  jobject out_axis2) {

diff --git a/ink/geometry/internal/jni/rect_jni.cc b/ink/geometry/internal/jni/rect_jni.cc
@@ -28,7 +28,7 @@ using ::ink::Rect;
 
 extern "C" {
 
-JNI_METHOD(geometry, BoxHelper, jobject, nativeCreateCenter)
+JNI_METHOD(geometry_internal, BoxNative, jobject, createCenter)
 (JNIEnv* env, jclass clazz, float rect_x_min, jfloat rect_y_min,
  jfloat rect_x_max, jfloat rect_y_max, jclass immutable_vec_class) {
   Rect rect =
@@ -38,7 +38,7 @@ JNI_METHOD(geometry, BoxHelper, jobject, nativeCreateCenter)
   return ink::CreateJImmutableVecFromPoint(env, point, immutable_vec_class);
 }
 
-JNI_METHOD(geometry, BoxHelper, void, nativePopulateCenter)
+JNI_METHOD(geometry_internal, BoxNative, void, populateCenter)
 (JNIEnv* env, jclass clazz, float rect_x_min, jfloat rect_y_min,
  jfloat rect_x_max, jfloat rect_y_max, jobject mutable_vec) {
   Rect rect =
@@ -48,15 +48,15 @@ JNI_METHOD(geometry, BoxHelper, void, nativePopulateCenter)
   ink::FillJMutableVecFromPoint(env, mutable_vec, point);
 }
 
-JNI_METHOD(geometry, BoxHelper, jboolean, nativeContainsPoint)
+JNI_METHOD(geometry_internal, BoxNative, jboolean, containsPoint)
 (JNIEnv* env, jclass clazz, jfloat rect_x_min, jfloat rect_y_min,
  jfloat rect_x_max, jfloat rect_y_max, jfloat point_x, jfloat point_y) {
   Rect rect =
       Rect::FromTwoPoints({rect_x_min, rect_y_min}, {rect_x_max, rect_y_max});
   return rect.Contains(Point{point_x, point_y});
 }
 
-JNI_METHOD(geometry, BoxHelper, jboolean, nativeContainsBox)
+JNI_METHOD(geometry_internal, BoxNative, jboolean, containsBox)
 (JNIEnv* env, jclass clazz, jfloat rect_x_min, jfloat rect_y_min,
  jfloat rect_x_max, jfloat rect_y_max, jfloat other_x_min, jfloat other_y_min,
  jfloat other_x_max, jfloat other_y_max) {

diff --git a/ink/geometry/internal/jni/vec_jni.cc b/ink/geometry/internal/jni/vec_jni.cc
@@ -26,29 +26,29 @@ using ::ink::Vec;
 
 extern "C" {
 
-JNI_METHOD(geometry, VecNative, jobject, unitVec)
+JNI_METHOD(geometry_internal, VecNative, jobject, unitVec)
 (JNIEnv* env, jclass clazz, jfloat vec_X, jfloat vec_Y,
  jclass immutable_vec_class) {
   return CreateJImmutableVecFromVec(env, Vec{vec_X, vec_Y}.AsUnitVec(),
                                     immutable_vec_class);
 }
 
-JNI_METHOD(geometry, VecNative, void, populateUnitVec)
+JNI_METHOD(geometry_internal, VecNative, void, populateUnitVec)
 (JNIEnv* env, jclass clazz, jfloat vec_X, jfloat vec_Y,
  jobject output_mutable_vec) {
   FillJMutableVecFromVec(env, output_mutable_vec,
                          Vec{vec_X, vec_Y}.AsUnitVec());
 }
 
-JNI_METHOD(geometry, VecNative, jfloat, absoluteAngleBetween)
+JNI_METHOD(geometry_internal, VecNative, jfloat, absoluteAngleBetween)
 (JNIEnv* env, jclass clazz, jfloat first_vec_X, jfloat first_vec_Y,
  jfloat second_vec_X, jfloat second_vec_Y) {
   return Vec::AbsoluteAngleBetween(Vec{first_vec_X, first_vec_Y},
                                    Vec{second_vec_X, second_vec_Y})
       .ValueInRadians();
 }
 
-JNI_METHOD(geometry, VecNative, jfloat, signedAngleBetween)
+JNI_METHOD(geometry_internal, VecNative, jfloat, signedAngleBetween)
 (JNIEnv* env, jclass clazz, jfloat first_vec_X, jfloat first_vec_Y,
  jfloat second_vec_X, jfloat second_vec_Y) {
   return Vec::SignedAngleBetween(Vec{first_vec_X, first_vec_Y},