Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

UDP networking improvements and experiments (send CMD_STEP_FORWARD_SIMULATION as 4 bytes command, status 8 bytes, instead of enormous command/status packages.

Browse Source 
Change some timeouts to use actual RTC time instead of dummy loops 1024*1024*1024.
Fix type conected -> connected
This commit is contained in:
erwincoumans
2017-01-28 22:14:45 -08:00
parent 2ea7111933
commit 87bce5eacf
9 changed files with 110 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
examples/SharedMemory/PhysicsClientUDP.cpp
View File

@@ -184,7 +184,7 @@ struct UdpNetworkedInternalData
break;
case ENET_EVENT_TYPE_DISCONNECT:
printf("%s disconected.\n", m_event.peer->data);
printf("%s disconnected.\n", m_event.peer->data);
break;
default:
@@ -239,13 +239,24 @@ struct UdpNetworkedInternalData
{
SharedMemoryStatus* statPtr = (SharedMemoryStatus*)&m_event.packet->data[4];
m_lastStatus = *statPtr;
int streamOffsetInBytes = 4 + sizeof(SharedMemoryStatus);
int numStreamBytes = packetSizeInBytes - streamOffsetInBytes;
m_stream.resize(numStreamBytes);
for (int i = 0; i < numStreamBytes; i++)
if (statPtr->m_type == CMD_STEP_FORWARD_SIMULATION_COMPLETED)
{
m_stream[i] = m_event.packet->data[i + streamOffsetInBytes];
SharedMemoryStatus dummy;
dummy.m_type = CMD_STEP_FORWARD_SIMULATION_COMPLETED;
m_lastStatus = dummy;
m_stream.resize(0);
}
else
{
m_lastStatus = *statPtr;
int streamOffsetInBytes = 4 + sizeof(SharedMemoryStatus);
int numStreamBytes = packetSizeInBytes - streamOffsetInBytes;
m_stream.resize(numStreamBytes);
for (int i = 0; i < numStreamBytes; i++)
{
m_stream[i] = m_event.packet->data[i + streamOffsetInBytes];
}
}
}
else
@@ -258,7 +269,7 @@ struct UdpNetworkedInternalData
}
case ENET_EVENT_TYPE_DISCONNECT:
{
printf("%s disconected.\n", m_event.peer->data);
printf("%s disconnected.\n", m_event.peer->data);
break;
}
@@ -360,9 +371,19 @@ void UDPThreadFunc(void* userPtr, void* lsMemory)
if (hasCommand)
{
int sz = 0;
ENetPacket *packet = 0;
int sz = sizeof(SharedMemoryCommand);
ENetPacket *packet = enet_packet_create(&args->m_clientCmd, sz, ENET_PACKET_FLAG_RELIABLE);
if (args->m_clientCmd.m_type == CMD_STEP_FORWARD_SIMULATION)
{
sz = sizeof(int);
packet = enet_packet_create(&args->m_clientCmd.m_type, sz, ENET_PACKET_FLAG_RELIABLE);
}
else
{
sz = sizeof(SharedMemoryCommand);
packet = enet_packet_create(&args->m_clientCmd, sz, ENET_PACKET_FLAG_RELIABLE);
}
int res;
res = enet_peer_send(args->m_peer, 0, packet);
args->m_cs->lock();
@@ -476,13 +497,14 @@ bool UdpNetworkedPhysicsProcessor::processCommand(const struct SharedMemoryComma
bool UdpNetworkedPhysicsProcessor::receiveStatus(struct SharedMemoryStatus& serverStatusOut, char* bufferServerToClient, int bufferSizeInBytes)
{
if (gVerboseNetworkMessagesClient)
{
printf("UdpNetworkedPhysicsProcessor::receiveStatus\n");
}
bool hasStatus = false;
if (m_data->m_hasStatus)
{
if (gVerboseNetworkMessagesClient)
{
printf("UdpNetworkedPhysicsProcessor::receiveStatus\n");
}
hasStatus = true;
serverStatusOut = m_data->m_lastStatus;
int numStreamBytes = m_data->m_stream.size();
@@ -553,9 +575,9 @@ bool UdpNetworkedPhysicsProcessor::connect()
}
}
return true;
unsigned int sharedParam = m_data->m_cs->getSharedParam(1);
bool isConnected = (sharedParam == eUDP_Connected);
return isConnected;
}
void UdpNetworkedPhysicsProcessor::disconnect()