update to plugin 7

Green-Sky · Jan 7, 2024 · 36b57cf · 36b57cf
1 parent 635f890
commit 36b57cf
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 12 deletions.
diff --git a/external/solanaceae_bridge b/external/solanaceae_bridge
diff --git a/external/solanaceae_crdtnotes b/external/solanaceae_crdtnotes
diff --git a/external/solanaceae_ircclient b/external/solanaceae_ircclient
diff --git a/external/solanaceae_ngc_ft1 b/external/solanaceae_ngc_ft1
diff --git a/external/solanaceae_plugin b/external/solanaceae_plugin
diff --git a/external/solanaceae_toxic_games b/external/solanaceae_toxic_games
diff --git a/plugins/plugin_ngcft1.cpp b/plugins/plugin_ngcft1.cpp
@@ -96,11 +96,10 @@ SOLANA_PLUGIN_EXPORT void solana_plugin_stop(void) {
 	g_ngcextep.reset();
 }
 
-SOLANA_PLUGIN_EXPORT void solana_plugin_tick(float delta) {
-	//std::cout << "PLUGIN NGCEXT TICK()\n";
-
-	g_ngcft1->iterate(delta);
+SOLANA_PLUGIN_EXPORT float solana_plugin_tick(float delta) {
+	const float ft_interval = g_ngcft1->iterate(delta);
 	g_sha1_ngcft1->iterate(delta);
+	return ft_interval;
 }
 
 } // extern C

diff --git a/plugins/plugin_zox_ngc.cpp b/plugins/plugin_zox_ngc.cpp
@@ -3,6 +3,7 @@
 #include <solanaceae/zox/ngc.hpp>
 
 #include <memory>
+#include <limits>
 #include <iostream>
 
 // fwd
@@ -57,9 +58,10 @@ SOLANA_PLUGIN_EXPORT void solana_plugin_stop(void) {
 	g_zngc.reset();
 }
 
-SOLANA_PLUGIN_EXPORT void solana_plugin_tick(float delta) {
+SOLANA_PLUGIN_EXPORT float solana_plugin_tick(float delta) {
 	(void)delta;
 	//std::cout << "PLUGIN ZNGC TICK()\n";
+	return std::numeric_limits<float>::max();
 }
 
 } // extern C

diff --git a/plugins/plugin_zox_ngc_hs.cpp b/plugins/plugin_zox_ngc_hs.cpp
@@ -94,9 +94,11 @@ SOLANA_PLUGIN_EXPORT void solana_plugin_stop(void) {
 	g_zngchs.reset();
 }
 
-SOLANA_PLUGIN_EXPORT void solana_plugin_tick(float delta) {
+SOLANA_PLUGIN_EXPORT float solana_plugin_tick(float delta) {
 	//std::cout << "PLUGIN ZNGCHS TICK()\n";
 	g_zngchs->tick(delta);
+
+	return 0.1f; // TODO: use the actual timers
 }
 
 } // extern C
+2 −4		plugins/plugin_crdtnotes.cpp
+7 −4		plugins/plugin_crdtnotes_imgui.cpp
+2 −4		plugins/plugin_crdtnotes_toxsync.cpp
+1 −1		solanaceae/ngc_ft1/cca.hpp
+2 −7		solanaceae/ngc_ft1/cubic.cpp
+1 −1		solanaceae/ngc_ft1/cubic.hpp
+2 −4		solanaceae/ngc_ft1/flow_only.cpp
+1 −1		solanaceae/ngc_ft1/flow_only.hpp
+1 −1		solanaceae/ngc_ft1/ledbat.cpp
+1 −1		solanaceae/ngc_ft1/ledbat.hpp
+27 −2		solanaceae/ngc_ft1/ngcft1.cpp
+1 −1		solanaceae/ngc_ft1/ngcft1.hpp
+14 −2		solanaceae/plugin/plugin.cpp
+4 −2		solanaceae/plugin/plugin.hpp
+24 −2		solanaceae/plugin/plugin_manager.cpp
+3 −1		solanaceae/plugin/plugin_manager.hpp
+11 −3		solanaceae/plugin/solana_plugin_v1.h