pyrite-dev/assaultfish
13
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

looks good

Browse source
This commit is contained in:
Nishi 2026-01-29 17:28:39 +09:00
commit 829e6a9b76
5 changed files with 59 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
data/mdl/crate.gsm
View file

Binary file not shown.

BIN
data/mdl/fish.gsm
View file

Binary file not shown.

2
engine/include/GearSrc/TypeDefs.h
View file

@ -258,12 +258,12 @@ struct _GSNetClient {
unsigned int rxseq; unsigned int rxseq;
unsigned int rxindex; unsigned int rxindex;
unsigned int rxtotal; unsigned int rxtotal;
unsigned int rxstate;
unsigned int txseq; unsigned int txseq;
unsigned int txindex; unsigned int txindex;
unsigned int txtotal; unsigned int txtotal;
unsigned int txstate; unsigned int txstate;
unsigned long txtick;
GSBinary* rx; GSBinary* rx;
GSBinary* tx; GSBinary* tx;

3
engine/src/core.c
View file

@ -158,8 +158,7 @@ void GSEngineLoop(GSEngine engine) {
tick += 1.0 / engine->tps; tick += 1.0 / engine->tps;
if(tick >= 1) { if(tick >= 1) {
engine->tps_sampled += engine->tps; engine->tps_sampled = engine->tps;
engine->tps_sampled /= 2;
tick = tick - 1; tick = tick - 1;
} }

63
engine/src/net/net_client.c
View file

@ -1,6 +1,9 @@
#include <GearSrc/Net.h> #include <GearSrc/Net.h>
#include <GearSrc/Log.h> #include <GearSrc/Log.h>
#include <GearSrc/Endian.h>
#include <stb_ds.h>
GSNetClient GSNetClientOpen(GSClient client, const char* hostname, int port) { GSNetClient GSNetClientOpen(GSClient client, const char* hostname, int port) {
GSNetClient net = malloc(sizeof(*net)); GSNetClient net = malloc(sizeof(*net));
@ -16,6 +19,11 @@ GSNetClient GSNetClientOpen(GSClient client, const char* hostname, int port) {
return NULL; return NULL;
} }
GSBinary b;
b.data = strdup("Hello");
b.size = 5;
arrput(net->tx, b);
return net; return net;
} }
@ -32,20 +40,65 @@ void GSNetClientStep(GSNetClient net) {
GSNetPacketRead(net->fd, &pkt, &addr); GSNetPacketRead(net->fd, &pkt, &addr);
if(pkt.header.flag & GSNetPacketFlagAcknowledge) { if(pkt.header.flag & GSNetPacketFlagAcknowledge) {
if(net->txstate == WaitingAcknowledge && net->txindex == pkt.header.index && net->txseq == pkt.header.seq) { if(arrlen(net->tx) > 0 && net->txstate == WaitingAcknowledge && net->txindex == pkt.header.index && net->txseq == pkt.header.seq) {
GSLog(net->engine, GSLogDebug, "ACK received for %d:%d", net->txindex, net->txseq); GSLog(net->engine, GSLogDebug, "Received ACK packet %d:%d", net->txindex, net->txseq);
if(net->txseq == net->txtotal) net->txstate = Acknowledged; net->txstate = Acknowledged;
net->txseq++;
if(net->txseq == (net->txtotal + 1)){
net->txseq = 0;
net->txindex++;
arrdel(net->tx, 0);
}
} }
} else { } else {
if(net->rxstate == Acknowledged && net->rxindex == pkt.header.index && net->rxseq == pkt.header.seq) { if(net->rxindex == pkt.header.index && net->rxseq == pkt.header.seq) {
GSLog(net->engine, GSLogDebug, "Received packet %d:%d", net->rxindex, net->rxseq);
pkt.header.flag |= GSNetPacketFlagAcknowledge; pkt.header.flag |= GSNetPacketFlagAcknowledge;
pkt.header.index = net->rxindex; pkt.header.index = net->rxindex;
pkt.header.seq = net->rxseq; pkt.header.seq = net->rxseq;
pkt.size = 0; pkt.size = 0;
GSNetPacketWrite(net->fd, &pkt, &addr); if(net->rxseq == 0){
net->rxtotal = GSEndianSwapU32BE(*(GSU32*)pkt.data);
} }
GSNetPacketWrite(net->fd, &pkt, &addr);
net->rxseq++;
if(net->rxseq == (net->rxtotal + 1)){
net->rxseq = 0;
net->rxindex++;
}
}
}
}
if(arrlen(net->tx) > 0){
if(net->txstate == Acknowledged){
int n = net->tx[0].size;
if(net->txseq == 0){
net->txtotal = 0;
while(n > 0){
n -= 508 - sizeof(pkt.header);
net->txtotal++;
}
}
net->txstate = WaitingAcknowledge;
if(net->engine->param->get_tick != NULL) net->txtick = net->engine->param->get_tick();
GSLog(net->engine, GSLogDebug, "Sent packet %d:%d", net->txindex, net->txseq);
}else if(net->engine->param->get_tick == NULL){
}else if((net->engine->param->get_tick() - net->txtick) >= 500){
GSLog(net->engine, GSLogDebug, "Lost pcaket %d:%d", net->txindex, net->txseq);
net->txstate = Acknowledged;
} }
} }
} }