evert/osb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename global WorldTimestep var to more appropriate name

Browse Source
This commit is contained in:
Kae 2023-08-15 13:38:40 +10:00
parent 3bc2034c15
commit af74a2f491
21 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/client/StarClientApplication.cpp
View File

@ -185,14 +185,14 @@ void ClientApplication::applicationInit(ApplicationControllerPtr appController)
bool borderless = configuration->get("borderless").toBool(); bool borderless = configuration->get("borderless").toBool();
bool maximized = configuration->get("maximized").toBool(); bool maximized = configuration->get("maximized").toBool();
float updateRate = 1.0f / WorldTimestep; float updateRate = 1.0f / GlobalTimestep;
if (auto jUpdateRate = configuration->get("updateRate")) { if (auto jUpdateRate = configuration->get("updateRate")) {
updateRate = jUpdateRate.toFloat(); updateRate = jUpdateRate.toFloat();
WorldTimestep = 1.0f / updateRate; GlobalTimestep = 1.0f / updateRate;
} }
if (auto jServerUpdateRate = configuration->get("serverUpdateRate")) if (auto jServerUpdateRate = configuration->get("serverUpdateRate"))
ServerWorldTimestep = 1.0f / jServerUpdateRate.toFloat(); ServerGlobalTimestep = 1.0f / jServerUpdateRate.toFloat();
appController->setTargetUpdateRate(updateRate); appController->setTargetUpdateRate(updateRate);
appController->setApplicationTitle(assets->json("/client.config:windowTitle").toString()); appController->setApplicationTitle(assets->json("/client.config:windowTitle").toString());
@ -346,7 +346,7 @@ void ClientApplication::processInput(InputEvent const& event) {
} }
void ClientApplication::update() { void ClientApplication::update() {
float dt = WorldTimestep * GlobalTimescale; float dt = GlobalTimestep * GlobalTimescale;
if (m_state >= MainAppState::Title) { if (m_state >= MainAppState::Title) {
if (auto p2pNetworkingService = appController()->p2pNetworkingService()) { if (auto p2pNetworkingService = appController()->p2pNetworkingService()) {
if (auto join = p2pNetworkingService->pullPendingJoin()) { if (auto join = p2pNetworkingService->pullPendingJoin()) {

2
source/game/StarAmbient.cpp
View File

@ -105,7 +105,7 @@ AudioInstancePtr AmbientManager::updateAmbient(AmbientNoisesDescriptionPtr curre
} }
if (m_volumeChanged) { if (m_volumeChanged) {
if (m_delay > 0) if (m_delay > 0)
m_delay -= WorldTimestep; m_delay -= GlobalTimestep;
else { else {
m_volumeChanged = false; m_volumeChanged = false;
if (m_currentTrack) { if (m_currentTrack) {

4
source/game/StarGameTimers.hpp
View File

@ -13,8 +13,8 @@ struct GameTimer {
float time; float time;
float timer; float timer;
bool tick(float dt = WorldTimestep); // returns true if time is up bool tick(float dt = GlobalTimestep); // returns true if time is up
bool wrapTick(float dt = WorldTimestep); // auto resets bool wrapTick(float dt = GlobalTimestep); // auto resets
void reset(); void reset();
void setDone(); void setDone();
void invert(); void invert();

4
source/game/StarGameTypes.cpp
View File

@ -3,8 +3,8 @@
namespace Star { namespace Star {
float GlobalTimescale = 1.0f; float GlobalTimescale = 1.0f;
float WorldTimestep = 1.0f / 60.0f; float GlobalTimestep = 1.0f / 60.0f;
float ServerWorldTimestep = 1.0f / 60.0f; float ServerGlobalTimestep = 1.0f / 60.0f;
EnumMap<Direction> const DirectionNames{ EnumMap<Direction> const DirectionNames{
{Direction::Left, "left"}, {Direction::Left, "left"},

4
source/game/StarGameTypes.hpp
View File

@ -94,8 +94,8 @@ extern EnumMap<Rarity> const RarityNames;
unsigned const TilePixels = 8; unsigned const TilePixels = 8;
extern float GlobalTimescale; extern float GlobalTimescale;
extern float WorldTimestep; extern float GlobalTimestep;
extern float ServerWorldTimestep; extern float ServerGlobalTimestep;
float const SystemWorldTimestep = 1.0f / 20.0f; float const SystemWorldTimestep = 1.0f / 20.0f;
size_t const WorldSectorSize = 32; size_t const WorldSectorSize = 32;

2
source/game/StarItemDrop.cpp
View File

@ -250,7 +250,7 @@ void ItemDrop::update(float dt, uint64_t) {
m_ageItemsTimer.setElapsedTime(0.0); m_ageItemsTimer.setElapsedTime(0.0);
} }
} else { } else {
m_netGroup.tickNetInterpolation(WorldTimestep); m_netGroup.tickNetInterpolation(GlobalTimestep);
Root::singleton().itemDatabase()->loadItem(m_itemDescriptor.get(), m_item); Root::singleton().itemDatabase()->loadItem(m_itemDescriptor.get(), m_item);
m_movementController.tickSlave(dt); m_movementController.tickSlave(dt);
} }

2
source/game/StarMonster.cpp
View File

@ -466,7 +466,7 @@ void Monster::update(float dt, uint64_t) {
m_statusController->tickMaster(dt); m_statusController->tickMaster(dt);
updateStatus(dt); updateStatus(dt);
} else { } else {
m_netGroup.tickNetInterpolation(WorldTimestep); m_netGroup.tickNetInterpolation(GlobalTimestep);
m_statusController->tickSlave(dt); m_statusController->tickSlave(dt);
updateStatus(dt); updateStatus(dt);

2
source/game/StarMovementController.cpp
View File

@ -170,7 +170,7 @@ DataStream& operator<<(DataStream& ds, MovementParameters const& movementParamet
MovementController::MovementController(MovementParameters const& parameters) { MovementController::MovementController(MovementParameters const& parameters) {
m_resting = false; m_resting = false;
m_timeStep = WorldTimestep; m_timeStep = GlobalTimestep;
m_liquidPercentage = 0.0f; m_liquidPercentage = 0.0f;
m_liquidId = EmptyLiquidId; m_liquidId = EmptyLiquidId;

2
source/game/StarMovementController.hpp
View File

@ -184,7 +184,7 @@ public:
// Stores dt value for Lua calls. // Stores dt value for Lua calls.
void setTimestep(float dt); void setTimestep(float dt);
// Integrates the ActorMovementController one WorldTimestep and applies all // Integrates the ActorMovementController one GlobalTimestep and applies all
// forces. // forces.
void tickMaster(float dt); void tickMaster(float dt);

2
source/game/StarNpc.cpp
View File

@ -458,7 +458,7 @@ void Npc::update(float dt, uint64_t) {
m_humanoid.setDance(m_dance); m_humanoid.setDance(m_dance);
} else { } else {
m_netGroup.tickNetInterpolation(WorldTimestep); m_netGroup.tickNetInterpolation(GlobalTimestep);
m_movementController->tickSlave(dt); m_movementController->tickSlave(dt);
m_statusController->tickSlave(dt); m_statusController->tickSlave(dt);

2
source/game/StarPlant.cpp
View File

@ -733,7 +733,7 @@ void Plant::update(float dt, uint64_t) {
m_windLevel += damageEffectPercentage * 20; m_windLevel += damageEffectPercentage * 20;
} }
m_netGroup.tickNetInterpolation(WorldTimestep); m_netGroup.tickNetInterpolation(GlobalTimestep);
} }
} }

2
source/game/StarPlantDrop.cpp
View File

@ -236,7 +236,7 @@ void PlantDrop::update(float dt, uint64_t) {
} }
} }
} else { } else {
m_netGroup.tickNetInterpolation(WorldTimestep); m_netGroup.tickNetInterpolation(GlobalTimestep);
if (m_spawnedDropEffects && !m_spawnedDrops.get()) if (m_spawnedDropEffects && !m_spawnedDrops.get())
m_spawnedDropEffects = false; // false positive assumption over already having done the effect m_spawnedDropEffects = false; // false positive assumption over already having done the effect

4
source/game/StarPlayer.cpp
View File

@ -945,7 +945,7 @@ void Player::update(float dt, uint64_t) {
m_statusController->resetResource("breath"); m_statusController->resetResource("breath");
} }
m_log->addPlayTime(WorldTimestep); m_log->addPlayTime(GlobalTimestep);
if (m_ageItemsTimer.wrapTick(dt)) { if (m_ageItemsTimer.wrapTick(dt)) {
auto itemDatabase = Root::singleton().itemDatabase(); auto itemDatabase = Root::singleton().itemDatabase();
@ -970,7 +970,7 @@ void Player::update(float dt, uint64_t) {
m_interestingObjects = m_questManager->interestingObjects(); m_interestingObjects = m_questManager->interestingObjects();
} else { } else {
m_netGroup.tickNetInterpolation(WorldTimestep); m_netGroup.tickNetInterpolation(GlobalTimestep);
m_movementController->tickSlave(dt); m_movementController->tickSlave(dt);
m_techController->tickSlave(dt); m_techController->tickSlave(dt);
m_statusController->tickSlave(dt); m_statusController->tickSlave(dt);

2
source/game/StarProjectile.cpp
View File

@ -336,7 +336,7 @@ void Projectile::update(float dt, uint64_t) {
} }
} }
} else { } else {
m_netGroup.tickNetInterpolation(WorldTimestep); m_netGroup.tickNetInterpolation(GlobalTimestep);
m_movementController->tickSlave(dt); m_movementController->tickSlave(dt);
m_travelLine.min() = m_travelLine.max(); m_travelLine.min() = m_travelLine.max();
m_travelLine.max() = m_movementController->position(); m_travelLine.max() = m_movementController->position();

4
source/game/StarVehicle.cpp
View File

@ -273,7 +273,7 @@ void Vehicle::update(float dt, uint64_t) {
m_scriptComponent.update(m_scriptComponent.updateDt(dt)); m_scriptComponent.update(m_scriptComponent.updateDt(dt));
eraseWhere(m_aliveMasterConnections, [](auto& p) { eraseWhere(m_aliveMasterConnections, [](auto& p) {
return p.second.tick(WorldTimestep); return p.second.tick(GlobalTimestep);
}); });
for (auto& loungePositionPair : m_loungePositions) { for (auto& loungePositionPair : m_loungePositions) {
@ -285,7 +285,7 @@ void Vehicle::update(float dt, uint64_t) {
} }
} }
} else { } else {
m_netGroup.tickNetInterpolation(WorldTimestep); m_netGroup.tickNetInterpolation(GlobalTimestep);
m_movementController.tickSlave(dt); m_movementController.tickSlave(dt);

8
source/game/StarWorldClient.cpp
View File

@ -58,7 +58,7 @@ WorldClient::WorldClient(PlayerPtr mainPlayer) {
return m_tileArray->tile({x, y}).collision; return m_tileArray->tile({x, y}).collision;
}); });
m_modifiedTilePredictionTimeout = (int)round(m_clientConfig.getFloat("modifiedTilePredictionTimeout") / WorldTimestep); m_modifiedTilePredictionTimeout = (int)round(m_clientConfig.getFloat("modifiedTilePredictionTimeout") / GlobalTimestep);
m_latency = 0.0; m_latency = 0.0;
@ -756,7 +756,7 @@ void WorldClient::handleIncomingPackets(List<PacketPtr> const& packets) {
} }
} else if (auto entityUpdateSet = as<EntityUpdateSetPacket>(packet)) { } else if (auto entityUpdateSet = as<EntityUpdateSetPacket>(packet)) {
float interpolationLeadTime = m_interpolationTracker.interpolationLeadSteps() * WorldTimestep; float interpolationLeadTime = m_interpolationTracker.interpolationLeadSteps() * GlobalTimestep;
m_entityMap->forAllEntities([&](EntityPtr const& entity) { m_entityMap->forAllEntities([&](EntityPtr const& entity) {
EntityId entityId = entity->entityId(); EntityId entityId = entity->entityId();
if (connectionForEntity(entityId) == entityUpdateSet->forConnection) { if (connectionForEntity(entityId) == entityUpdateSet->forConnection) {
@ -767,7 +767,7 @@ void WorldClient::handleIncomingPackets(List<PacketPtr> const& packets) {
} else if (auto entityDestroy = as<EntityDestroyPacket>(packet)) { } else if (auto entityDestroy = as<EntityDestroyPacket>(packet)) {
if (auto entity = m_entityMap->entity(entityDestroy->entityId)) { if (auto entity = m_entityMap->entity(entityDestroy->entityId)) {
entity->readNetState(entityDestroy->finalNetState, m_interpolationTracker.interpolationLeadSteps() * WorldTimestep); entity->readNetState(entityDestroy->finalNetState, m_interpolationTracker.interpolationLeadSteps() * GlobalTimestep);
// Before destroying the entity, we should make sure that the entity is // Before destroying the entity, we should make sure that the entity is
// using the absolute latest data, so we disable interpolation. // using the absolute latest data, so we disable interpolation.
@ -874,7 +874,7 @@ void WorldClient::handleIncomingPackets(List<PacketPtr> const& packets) {
tryGiveMainPlayerItem(itemDatabase->item(giveItem->item)); tryGiveMainPlayerItem(itemDatabase->item(giveItem->item));
} else if (auto stepUpdate = as<StepUpdatePacket>(packet)) { } else if (auto stepUpdate = as<StepUpdatePacket>(packet)) {
m_currentServerStep = ((double)stepUpdate->remoteStep * (WorldTimestep / ServerWorldTimestep)); m_currentServerStep = ((double)stepUpdate->remoteStep * (GlobalTimestep / ServerGlobalTimestep));
m_interpolationTracker.receiveStepUpdate(m_currentServerStep); m_interpolationTracker.receiveStepUpdate(m_currentServerStep);
} else if (auto environmentUpdatePacket = as<EnvironmentUpdatePacket>(packet)) { } else if (auto environmentUpdatePacket = as<EnvironmentUpdatePacket>(packet)) {

8
source/game/StarWorldServer.cpp
View File

@ -430,7 +430,7 @@ void WorldServer::handleIncomingPackets(ConnectionId clientId, List<PacketPtr> c
} }
} else if (auto entityUpdateSet = as<EntityUpdateSetPacket>(packet)) { } else if (auto entityUpdateSet = as<EntityUpdateSetPacket>(packet)) {
float interpolationLeadTime = clientInfo->interpolationTracker.interpolationLeadSteps() * WorldTimestep; float interpolationLeadTime = clientInfo->interpolationTracker.interpolationLeadSteps() * GlobalTimestep;
m_entityMap->forAllEntities([&](EntityPtr const& entity) { m_entityMap->forAllEntities([&](EntityPtr const& entity) {
EntityId entityId = entity->entityId(); EntityId entityId = entity->entityId();
if (connectionForEntity(entityId) == clientId) { if (connectionForEntity(entityId) == clientId) {
@ -442,7 +442,7 @@ void WorldServer::handleIncomingPackets(ConnectionId clientId, List<PacketPtr> c
} else if (auto entityDestroy = as<EntityDestroyPacket>(packet)) { } else if (auto entityDestroy = as<EntityDestroyPacket>(packet)) {
if (auto entity = m_entityMap->entity(entityDestroy->entityId)) { if (auto entity = m_entityMap->entity(entityDestroy->entityId)) {
entity->readNetState(entityDestroy->finalNetState, clientInfo->interpolationTracker.interpolationLeadSteps() * WorldTimestep); entity->readNetState(entityDestroy->finalNetState, clientInfo->interpolationTracker.interpolationLeadSteps() * GlobalTimestep);
// Before destroying the entity, we should make sure that the entity is // Before destroying the entity, we should make sure that the entity is
// using the absolute latest data, so we disable interpolation. // using the absolute latest data, so we disable interpolation.
entity->disableInterpolation(); entity->disableInterpolation();
@ -636,10 +636,10 @@ void WorldServer::update(float dt) {
m_fallingBlocksAgent->update(); m_fallingBlocksAgent->update();
if (auto delta = shouldRunThisStep("blockDamageUpdate")) if (auto delta = shouldRunThisStep("blockDamageUpdate"))
updateDamagedBlocks(*delta * WorldTimestep); updateDamagedBlocks(*delta * GlobalTimestep);
if (auto delta = shouldRunThisStep("worldStorageTick")) if (auto delta = shouldRunThisStep("worldStorageTick"))
m_worldStorage->tick(*delta * WorldTimestep); m_worldStorage->tick(*delta * GlobalTimestep);
if (auto delta = shouldRunThisStep("worldStorageGenerate")) { if (auto delta = shouldRunThisStep("worldStorageGenerate")) {
m_worldStorage->generateQueue(m_fidelityConfig.optUInt("worldStorageGenerationLevelLimit"), [this](WorldStorage::Sector a, WorldStorage::Sector b) { m_worldStorage->generateQueue(m_fidelityConfig.optUInt("worldStorageGenerationLevelLimit"), [this](WorldStorage::Sector a, WorldStorage::Sector b) {

4
source/game/StarWorldServerThread.cpp
View File

@ -207,7 +207,7 @@ void WorldServerThread::run() {
double storageInterval = root.assets()->json("/universe_server.config:worldStorageInterval").toDouble() / 1000.0; double storageInterval = root.assets()->json("/universe_server.config:worldStorageInterval").toDouble() / 1000.0;
Timer storageTimer = Timer::withTime(storageInterval); Timer storageTimer = Timer::withTime(storageInterval);
TickRateApproacher tickApproacher(1.0 / ServerWorldTimestep, updateMeasureWindow); TickRateApproacher tickApproacher(1.0 / ServerGlobalTimestep, updateMeasureWindow);
double fidelityScore = 0.0; double fidelityScore = 0.0;
WorldServerFidelity automaticFidelity = WorldServerFidelity::Medium; WorldServerFidelity automaticFidelity = WorldServerFidelity::Medium;
@ -267,7 +267,7 @@ void WorldServerThread::update(WorldServerFidelity fidelity) {
} }
} }
float dt = ServerWorldTimestep * GlobalTimescale; float dt = ServerGlobalTimestep * GlobalTimescale;
m_worldServer->setFidelity(fidelity); m_worldServer->setFidelity(fidelity);
if (!m_pause || *m_pause == false) if (!m_pause || *m_pause == false)
m_worldServer->update(dt); m_worldServer->update(dt);

2
source/game/objects/StarPhysicsObject.cpp
View File

@ -79,7 +79,7 @@ void PhysicsObject::uninit() {
void PhysicsObject::update(float dt, uint64_t currentStep) { void PhysicsObject::update(float dt, uint64_t currentStep) {
Object::update(dt, currentStep); Object::update(dt, currentStep);
if (isSlave()) if (isSlave())
m_netGroup.tickNetInterpolation(WorldTimestep); m_netGroup.tickNetInterpolation(GlobalTimestep);
} }
RectF PhysicsObject::metaBoundBox() const { RectF PhysicsObject::metaBoundBox() const {

4
source/server/main.cpp
View File

@ -47,10 +47,10 @@ int main(int argc, char** argv) {
{ {
Logger::info("Server Version {} ({}) Source ID: {} Protocol: {}", StarVersionString, StarArchitectureString, StarSourceIdentifierString, StarProtocolVersion); Logger::info("Server Version {} ({}) Source ID: {} Protocol: {}", StarVersionString, StarArchitectureString, StarSourceIdentifierString, StarProtocolVersion);
float updateRate = 1.0f / WorldTimestep; float updateRate = 1.0f / GlobalTimestep;
if (auto jUpdateRate = configuration->get("updateRate")) { if (auto jUpdateRate = configuration->get("updateRate")) {
updateRate = jUpdateRate.toFloat(); updateRate = jUpdateRate.toFloat();
ServerWorldTimestep = WorldTimestep = 1.0f / updateRate; ServerGlobalTimestep = GlobalTimestep = 1.0f / updateRate;
Logger::info("Configured tickrate is {:4.2f}hz", updateRate); Logger::info("Configured tickrate is {:4.2f}hz", updateRate);
} }

2
source/windowing/StarPaneManager.cpp
View File

@ -270,7 +270,7 @@ void PaneManager::render() {
} }
void PaneManager::update(float dt) { void PaneManager::update(float dt) {
m_tooltipShowTimer -= WorldTimestep; m_tooltipShowTimer -= GlobalTimestep;
if (m_tooltipShowTimer < 0 && !m_activeTooltip) { if (m_tooltipShowTimer < 0 && !m_activeTooltip) {
if (auto parentPane = getPaneAt(m_tooltipLastMousePos)) { if (auto parentPane = getPaneAt(m_tooltipLastMousePos)) {
if (auto tooltip = parentPane->createTooltip(m_tooltipLastMousePos)) { if (auto tooltip = parentPane->createTooltip(m_tooltipLastMousePos)) {