From 9665e4191e0f06e57a8f0fd606f6d2c9a82d6af7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Madar=C3=A1sz?= Date: Sun, 18 Feb 2024 14:36:48 +0100 Subject: [PATCH] wip: rpc v_v sig --- engine/joint/v4k.h | 4 ++++ engine/split/v4k_math.c | 2 ++ engine/split/v4k_netsync.c | 2 ++ engine/v4k.c | 4 ++++ 4 files changed, 12 insertions(+) diff --git a/engine/joint/v4k.h b/engine/joint/v4k.h index abe07e3..f429410 100644 --- a/engine/joint/v4k.h +++ b/engine/joint/v4k.h @@ -365442,6 +365442,8 @@ float signf (float a) { return (a < 0) ? -1.f : 1.f; } float clampf(float v,float a,float b){return maxf(minf(b,v),a); } float mixf(float a,float b,float t) { return a*(1-t)+b*t; } float slerpf(float a,float b,float t) { + a = fmod(a, 360); if (a < 0) a += 360; + b = fmod(b, 360); if (b < 0) b += 360; float diff = b - a; if (diff < 0.0) diff += 360.0; @@ -366790,6 +366792,7 @@ typedef struct rpc_call { #define RPC_SIGNATURE_i_s UINT64_C(0xf7b73162829ed667) #define RPC_SIGNATURE_s_s UINT64_C(0x97deedd17d9afb12) #define RPC_SIGNATURE_s_v UINT64_C(0x09c16a1242049b80) +#define RPC_SIGNATURE_v_v UINT64_C(0xc210c270b6f06552) #define RPC_SIGNATURE_v_s UINT64_C(0xc1746990ab73ed24) static @@ -366842,6 +366845,7 @@ char *rpc_full(unsigned id, const char* method, unsigned num_args, char *args[]) case RPC_SIGNATURE_i_s: return va("%d %d", id, (int)(intptr_t)found->function(args[0]) ); case RPC_SIGNATURE_s_s: return va("%d %s", id, (char*)found->function(args[0]) ); case RPC_SIGNATURE_s_v: return va("%d %s", id, (char*)found->function() ); + case RPC_SIGNATURE_v_v: return found->function(), va("%d", id); case RPC_SIGNATURE_v_s: return found->function(args[0]), va("%d", id); default: break; } diff --git a/engine/split/v4k_math.c b/engine/split/v4k_math.c index 264ba14..ba6249b 100644 --- a/engine/split/v4k_math.c +++ b/engine/split/v4k_math.c @@ -91,6 +91,8 @@ float signf (float a) { return (a < 0) ? -1.f : 1.f; } float clampf(float v,float a,float b){return maxf(minf(b,v),a); } float mixf(float a,float b,float t) { return a*(1-t)+b*t; } float slerpf(float a,float b,float t) { + a = fmod(a, 360); if (a < 0) a += 360; + b = fmod(b, 360); if (b < 0) b += 360; float diff = b - a; if (diff < 0.0) diff += 360.0; diff --git a/engine/split/v4k_netsync.c b/engine/split/v4k_netsync.c index ad792a0..4d8d925 100644 --- a/engine/split/v4k_netsync.c +++ b/engine/split/v4k_netsync.c @@ -11,6 +11,7 @@ typedef struct rpc_call { #define RPC_SIGNATURE_i_s UINT64_C(0xf7b73162829ed667) #define RPC_SIGNATURE_s_s UINT64_C(0x97deedd17d9afb12) #define RPC_SIGNATURE_s_v UINT64_C(0x09c16a1242049b80) +#define RPC_SIGNATURE_v_v UINT64_C(0xc210c270b6f06552) #define RPC_SIGNATURE_v_s UINT64_C(0xc1746990ab73ed24) static @@ -63,6 +64,7 @@ char *rpc_full(unsigned id, const char* method, unsigned num_args, char *args[]) case RPC_SIGNATURE_i_s: return va("%d %d", id, (int)(intptr_t)found->function(args[0]) ); case RPC_SIGNATURE_s_s: return va("%d %s", id, (char*)found->function(args[0]) ); case RPC_SIGNATURE_s_v: return va("%d %s", id, (char*)found->function() ); + case RPC_SIGNATURE_v_v: return found->function(), va("%d", id); case RPC_SIGNATURE_v_s: return found->function(args[0]), va("%d", id); default: break; } diff --git a/engine/v4k.c b/engine/v4k.c index bb45504..c1d3e4d 100644 --- a/engine/v4k.c +++ b/engine/v4k.c @@ -12580,6 +12580,8 @@ float signf (float a) { return (a < 0) ? -1.f : 1.f; } float clampf(float v,float a,float b){return maxf(minf(b,v),a); } float mixf(float a,float b,float t) { return a*(1-t)+b*t; } float slerpf(float a,float b,float t) { + a = fmod(a, 360); if (a < 0) a += 360; + b = fmod(b, 360); if (b < 0) b += 360; float diff = b - a; if (diff < 0.0) diff += 360.0; @@ -13928,6 +13930,7 @@ typedef struct rpc_call { #define RPC_SIGNATURE_i_s UINT64_C(0xf7b73162829ed667) #define RPC_SIGNATURE_s_s UINT64_C(0x97deedd17d9afb12) #define RPC_SIGNATURE_s_v UINT64_C(0x09c16a1242049b80) +#define RPC_SIGNATURE_v_v UINT64_C(0xc210c270b6f06552) #define RPC_SIGNATURE_v_s UINT64_C(0xc1746990ab73ed24) static @@ -13980,6 +13983,7 @@ char *rpc_full(unsigned id, const char* method, unsigned num_args, char *args[]) case RPC_SIGNATURE_i_s: return va("%d %d", id, (int)(intptr_t)found->function(args[0]) ); case RPC_SIGNATURE_s_s: return va("%d %s", id, (char*)found->function(args[0]) ); case RPC_SIGNATURE_s_v: return va("%d %s", id, (char*)found->function() ); + case RPC_SIGNATURE_v_v: return found->function(), va("%d", id); case RPC_SIGNATURE_v_s: return found->function(args[0]), va("%d", id); default: break; }