From 1fed963d8259593c45fef14511f224467671c4f2 Mon Sep 17 00:00:00 2001 From: marauder2k7 Date: Fri, 20 Feb 2026 16:33:36 +0000 Subject: [PATCH] updates Fixed streaming logic to only happen when we are not editing a mission, also some issues with objects that cannot be streamed eg camera, and player. Reverted limits --- Engine/source/console/sim.cpp | 14 -------------- Engine/source/console/simManager.cpp | 20 ++++++++++++++++++++ Engine/source/console/simObject.cpp | 20 ++++++++++++++------ Engine/source/sim/netConnection.cpp | 4 ++-- Engine/source/sim/netGhost.cpp | 2 +- 5 files changed, 37 insertions(+), 23 deletions(-) diff --git a/Engine/source/console/sim.cpp b/Engine/source/console/sim.cpp index 86ebe05fc..3d5b20a9e 100644 --- a/Engine/source/console/sim.cpp +++ b/Engine/source/console/sim.cpp @@ -267,17 +267,3 @@ DefineEngineFunction( isValidObjectName, bool, (const char * name), , "( string ConsoleFunctionGroupEnd( SimFunctions ); -void SceneStreaming::processTick() -{ - if (smStreaming) - { - for (U32 i = 0; i < mMaxObjects && !smPendingRegister.empty(); i++) - { - SimObject* obj = smPendingRegister.first(); - smPendingRegister.pop_front(); - - if (!obj->onAdd()) - obj->unregisterObject(); - } - } -} diff --git a/Engine/source/console/simManager.cpp b/Engine/source/console/simManager.cpp index 66ec2be6f..0a91cf262 100644 --- a/Engine/source/console/simManager.cpp +++ b/Engine/source/console/simManager.cpp @@ -628,3 +628,23 @@ void SimDataBlockGroup::sort() dQsort(mObjectList.address(), mObjectList.size(),sizeof(SimObject *),compareModifiedKey); } } + +void SceneStreaming::processTick() +{ + if (true) + { + for (U32 i = 0; i < mMaxObjects && !smPendingRegister.empty(); i++) + { + SimObject* obj = smPendingRegister.first(); + smPendingRegister.pop_front(); + + Sim::gIdDictionary->insert(obj); + + Sim::gNameDictionary->insert(obj); + + + if (!obj->onAdd()) + obj->unregisterObject(); + } + } +} diff --git a/Engine/source/console/simObject.cpp b/Engine/source/console/simObject.cpp index 8e4743ddb..41ec9c8a4 100644 --- a/Engine/source/console/simObject.cpp +++ b/Engine/source/console/simObject.cpp @@ -44,6 +44,8 @@ #include "sim/netObject.h" #include "scene/sceneObject.h" +#include "T3D/camera.h" +#include "T3D/player.h" ImplementBitfieldType(GameTypeMasksType, "The type of animation effect to apply to this material.\n" @@ -114,7 +116,7 @@ namespace Sim extern SimIdDictionary *gIdDictionary; extern U32 gNextObjectId; } - +extern bool gEditingMission; //----------------------------------------------------------------------------- @@ -723,15 +725,21 @@ bool SimObject::registerObject() AssertFatal(Sim::gIdDictionary && Sim::gNameDictionary, "SimObject::registerObject - tried to register an object before Sim::init()!"); - Sim::gIdDictionary->insert(this); - - Sim::gNameDictionary->insert(this); - - if (Sim::sgStreamingInstance->smStreaming && dynamic_cast(this)) + + if (true && dynamic_cast(this) && + !(dynamic_cast(this) || dynamic_cast(this)) && + !gEditingMission + ) { Sim::sgStreamingInstance->smPendingRegister.push_back(this); return true; // pretend success } + else + { + Sim::gIdDictionary->insert(this); + + Sim::gNameDictionary->insert(this); + } // Notify object bool ret = onAdd(); diff --git a/Engine/source/sim/netConnection.cpp b/Engine/source/sim/netConnection.cpp index 245a3fa06..1e18d2708 100644 --- a/Engine/source/sim/netConnection.cpp +++ b/Engine/source/sim/netConnection.cpp @@ -215,7 +215,7 @@ U32 NetConnection::getSequence() static U32 gPacketRateToServer = 32; static U32 gPacketUpdateDelayToServer = 32; static U32 gPacketRateToClient = 10; -static U32 gPacketSize = 1500; +static U32 gPacketSize = 508; void NetConnection::consoleInit() { @@ -319,7 +319,7 @@ void NetConnection::checkMaxRate() // These changes introduced in T3D 1.1 Preview reduce the packet headroom which leads // to some spells and effects running out of room when dynamic variables are used // to send launch-time parameters to clients. - packetSize = 1500; + packetSize = 512; } gPacketUpdateDelayToServer = 1024 / packetRateToServer; diff --git a/Engine/source/sim/netGhost.cpp b/Engine/source/sim/netGhost.cpp index 83d350eb5..bad595adf 100644 --- a/Engine/source/sim/netGhost.cpp +++ b/Engine/source/sim/netGhost.cpp @@ -425,7 +425,7 @@ void NetConnection::ghostWritePacket(BitStream *bstream, PacketNotify *notify) bstream->writeInt(sendSize - 3, GhostIndexBitSize); S32 bytesThisPacket = 0; - U32 maxBytesPerPacket = mGhostByteBudget; + U32 maxBytesPerPacket = mMaxRate.packetSize; // for(i = mGhostZeroUpdateIndex - 1; i >= 0 && !bstream->isFull(); i--) {