update android platform code

qimiko · May 19, 2024 · 1c50e85 · 1c50e85
1 parent b1f7c36
commit 1c50e85
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 10 deletions.
diff --git a/src/android.cpp b/src/android.cpp
@@ -1,4 +1,4 @@
-#include <Geode/loader/Dispatch.hpp>
+#include <Geode/cocos/platform/android/jni/JniHelper.h>
 #include <time.h>
 
 #include "input.hpp"
@@ -9,14 +9,58 @@ std::uint64_t platform_get_time() {
 	return (now.tv_sec * 1000) + (now.tv_nsec / 1'000'000);
 }
 
-$execute {
-	using namespace geode;
+void clearJNIExceptions() {
+	auto vm = cocos2d::JniHelper::getJavaVM();
+
+	JNIEnv* env;
+	if (vm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6) == JNI_OK) {
+			env->ExceptionClear();
+	}
+}
+
+bool reportPlatformCapability(std::string id) {
+	cocos2d::JniMethodInfo t;
+	if (cocos2d::JniHelper::getStaticMethodInfo(t, "com/geode/launcher/utils/GeodeUtils", "reportPlatformCapability", "(Ljava/lang/String;)Z")) {
+		jstring stringArg1 = t.env->NewStringUTF(id.c_str());
+
+		auto r = t.env->CallStaticBooleanMethod(t.classID, t.methodID, stringArg1);
+
+		t.env->DeleteLocalRef(stringArg1);
+		t.env->DeleteLocalRef(t.classID);
+
+		return r;
+	} else {
+		clearJNIExceptions();
+	}
 
-	// TODO: stabilze some sort of input timestamp api
-	new EventListener(+[](std::uint64_t timestamp) {
-		ExtendedCCKeyboardDispatcher::setTimestamp(timestamp);
-		ExtendedCCTouchDispatcher::setTimestamp(timestamp);
+	return false;
+}
+
+void JNICALL JNI_setNextInputTimestamp(JNIEnv* env, jobject, jlong timestamp) {
+	auto timestampMs = timestamp / 1'000'000;
+	ExtendedCCKeyboardDispatcher::setTimestamp(timestampMs);
+	ExtendedCCTouchDispatcher::setTimestamp(timestampMs);
+}
+
+static JNINativeMethod methods[] = {
+  {
+		"setNextInputTimestamp",
+		"(J)V",
+		reinterpret_cast<void*>(&JNI_setNextInputTimestamp)
+	},
+};
+
+$execute {
+	auto vm = cocos2d::JniHelper::getJavaVM();
 
-		return ListenerResult::Propagate;
-	}, DispatchFilter<std::uint64_t>("geode.loader/android-next-input-timestamp"));
+	JNIEnv* env;
+	if (vm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6) == JNI_OK) {
+			auto clazz = env->FindClass("com/geode/launcher/utils/GeodeUtils");
+			if (env->RegisterNatives(clazz, methods, 1) != 0) {
+				// method was not found
+				clearJNIExceptions();
+			} else {
+				reportPlatformCapability("timestamp_inputs");
+			}
+	}
 }
diff --git a/src/main.cpp b/src/main.cpp
@@ -55,7 +55,7 @@ void CustomGJBaseGameLayer::queueButton(int btnType, bool push, bool secondPlaye
 #endif
 
 #if DEBUG_STEPS
-	geode::log::debug("queueing input type={} down={} p2={} at time {}", btnType, push, secondPlayer, currentTime);
+	geode::log::debug("queueing input type={} down={} p2={} at time {} (ts {} -> {})", btnType, push, secondPlayer, currentTime, timeRelativeBegin, inputTimestamp);
 #endif
 
 	// if you felt like it, you could calculate the step too